package/filesystem/cloop/linux26.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../cloop/linux26.patch
   5 # Copyright (C) 2004 - 2005 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- T2-COPYRIGHT-NOTE-END ---
  16 --- cloop-2.01/Makefile.orig   2004-10-16 16:33:17.765491344 +0200
  17 +++ cloop-2.01/Makefile        2004-10-16 16:33:41.524879368 +0200
  18 @@ -11,7 +11,9 @@
  19  CKERNOPS:=-D__KERNEL__ -DMODULE -fno-builtin -nostdlib -DKBUILD_MODNAME="cloop" -DKBUILD_BASENAME="cloop"
  20
  21  ifdef CONFIG_MODVERSIONS
  22 +ifeq ($(PATCHLEVEL),4)
  23  MODVERSIONS:= -DMODVERSIONS -include $(KERNEL_DIR)/include/linux/modversions.h
  24 +endif
  25  CKERNOPS += $(MODVERSIONS)
  26  endif
  27
  28 --- cloop-2.01/compressed_loop.c.orig   2004-07-28 00:44:11.000000000 +0200
  29 +++ cloop-2.01/compressed_loop.c        2004-10-17 15:00:10.313358216 +0200
  30 @@ -202,7 +202,12 @@
  31                            unsigned long offset, unsigned long size)
  32  {
  33   char *kaddr;
  34 - struct clo_read_data *p = (struct clo_read_data*)desc->buf;
  35 + struct clo_read_data *p =
  36 +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
  37 +  (struct clo_read_data*)desc->arg.data;
  38 +#else
  39 +  (struct clo_read_data*)desc->buf;
  40 +#endif
  41   unsigned long count = desc->count;
  42   if (size > count) size = count;
  43   kaddr = kmap(page);
  44 @@ -228,7 +233,12 @@
  45     read_descriptor_t desc;
  46     desc.written = 0;
  47     desc.count   = size;
  48 -   desc.buf     = (char*)&cd;
  49 +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
  50 +   desc.arg.data =
  51 +#else
  52 +   desc.buf =
  53 +#endif
  54 +      (char*)&cd;
  55     desc.error   = 0;
  56  #ifdef REDHAT_KERNEL /* Greenshoe Linux */
  57     do_generic_file_read(f, &pos, &desc, clo_read_actor, 0);