[kernel] refresh generic 2.6.24 patches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11188 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/generic-2.6/patches-2.6.24/001-squashfs.patch b/target/linux/generic-2.6/patches-2.6.24/001-squashfs.patch
index 6d2cb28..fd3fb2b 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/001-squashfs.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/001-squashfs.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23/fs/Kconfig
+Index: linux-2.6.24.7/fs/Kconfig

 ===================================================================
 ===================================================================

---- linux-2.6.23.orig/fs/Kconfig       2007-10-10 13:52:12.000000000 +0800
-+++ linux-2.6.23/fs/Kconfig    2007-10-10 13:52:14.000000000 +0800
-@@ -1364,6 +1364,71 @@
+--- linux-2.6.24.7.orig/fs/Kconfig
++++ linux-2.6.24.7/fs/Kconfig
+@@ -1405,6 +1405,71 @@ config CRAMFS

  
          If unsure, say N.
  
  
          If unsure, say N.
  


@@ -74,11 +74,11 @@ Index: linux-2.6.23/fs/Kconfig
  config VXFS_FS
        tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)"
        depends on BLOCK
  config VXFS_FS
        tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)"
        depends on BLOCK

-Index: linux-2.6.23/fs/Makefile
+Index: linux-2.6.24.7/fs/Makefile

 ===================================================================
 ===================================================================

---- linux-2.6.23.orig/fs/Makefile      2007-10-10 13:52:12.000000000 +0800
-+++ linux-2.6.23/fs/Makefile   2007-10-10 13:52:14.000000000 +0800
-@@ -72,6 +72,7 @@
+--- linux-2.6.24.7.orig/fs/Makefile
++++ linux-2.6.24.7/fs/Makefile
+@@ -72,6 +72,7 @@ obj-$(CONFIG_JBD)            += jbd/

  obj-$(CONFIG_JBD2)            += jbd2/
  obj-$(CONFIG_EXT2_FS)         += ext2/
  obj-$(CONFIG_CRAMFS)          += cramfs/
  obj-$(CONFIG_JBD2)            += jbd2/
  obj-$(CONFIG_EXT2_FS)         += ext2/
  obj-$(CONFIG_CRAMFS)          += cramfs/


@@ -86,10 +86,10 @@ Index: linux-2.6.23/fs/Makefile
  obj-y                         += ramfs/
  obj-$(CONFIG_HUGETLBFS)               += hugetlbfs/
  obj-$(CONFIG_CODA_FS)         += coda/
  obj-y                         += ramfs/
  obj-$(CONFIG_HUGETLBFS)               += hugetlbfs/
  obj-$(CONFIG_CODA_FS)         += coda/

-Index: linux-2.6.23/fs/squashfs/inode.c
+Index: linux-2.6.24.7/fs/squashfs/inode.c

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/fs/squashfs/inode.c   2007-10-10 13:52:14.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/fs/squashfs/inode.c

 @@ -0,0 +1,2122 @@
 +/*
 + * Squashfs - a compressed read only filesystem for Linux
 @@ -0,0 +1,2122 @@
 +/*
 + * Squashfs - a compressed read only filesystem for Linux


@@ -2213,10 +2213,10 @@ Index: linux-2.6.23/fs/squashfs/inode.c
 +MODULE_DESCRIPTION("squashfs, a compressed read-only filesystem");
 +MODULE_AUTHOR("Phillip Lougher <phillip@lougher.org.uk>");
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("squashfs, a compressed read-only filesystem");
 +MODULE_AUTHOR("Phillip Lougher <phillip@lougher.org.uk>");
 +MODULE_LICENSE("GPL");

-Index: linux-2.6.23/fs/squashfs/Makefile
+Index: linux-2.6.24.7/fs/squashfs/Makefile

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/fs/squashfs/Makefile  2007-10-10 13:52:14.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/fs/squashfs/Makefile

 @@ -0,0 +1,7 @@
 +#
 +# Makefile for the linux squashfs routines.
 @@ -0,0 +1,7 @@
 +#
 +# Makefile for the linux squashfs routines.


@@ -2225,10 +2225,10 @@ Index: linux-2.6.23/fs/squashfs/Makefile
 +obj-$(CONFIG_SQUASHFS) += squashfs.o
 +squashfs-y += inode.o
 +squashfs-y += squashfs2_0.o
 +obj-$(CONFIG_SQUASHFS) += squashfs.o
 +squashfs-y += inode.o
 +squashfs-y += squashfs2_0.o

-Index: linux-2.6.23/fs/squashfs/squashfs2_0.c
+Index: linux-2.6.24.7/fs/squashfs/squashfs2_0.c

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/fs/squashfs/squashfs2_0.c     2007-10-10 13:52:14.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/fs/squashfs/squashfs2_0.c

 @@ -0,0 +1,758 @@
 +/*
 + * Squashfs - a compressed read only filesystem for Linux
 @@ -0,0 +1,758 @@
 +/*
 + * Squashfs - a compressed read only filesystem for Linux


@@ -2988,10 +2988,10 @@ Index: linux-2.6.23/fs/squashfs/squashfs2_0.c
 +
 +      return 1;
 +}
 +
 +      return 1;
 +}

-Index: linux-2.6.23/fs/squashfs/squashfs.h
+Index: linux-2.6.24.7/fs/squashfs/squashfs.h

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/fs/squashfs/squashfs.h        2007-10-10 13:52:14.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/fs/squashfs/squashfs.h

 @@ -0,0 +1,86 @@
 +/*
 + * Squashfs - a compressed read only filesystem for Linux
 @@ -0,0 +1,86 @@
 +/*
 + * Squashfs - a compressed read only filesystem for Linux


@@ -3079,10 +3079,10 @@ Index: linux-2.6.23/fs/squashfs/squashfs.h
 +      return 0;
 +}
 +#endif
 +      return 0;
 +}
 +#endif

-Index: linux-2.6.23/include/linux/magic.h
+Index: linux-2.6.24.7/include/linux/magic.h

 ===================================================================
 ===================================================================

---- linux-2.6.23.orig/include/linux/magic.h    2007-10-10 13:52:12.000000000 +0800
-+++ linux-2.6.23/include/linux/magic.h 2007-10-10 13:52:14.000000000 +0800
+--- linux-2.6.24.7.orig/include/linux/magic.h
++++ linux-2.6.24.7/include/linux/magic.h

 @@ -35,6 +35,9 @@
  #define REISER2FS_SUPER_MAGIC_STRING  "ReIsEr2Fs"
  #define REISER2FS_JR_SUPER_MAGIC_STRING       "ReIsEr3Fs"
 @@ -35,6 +35,9 @@
  #define REISER2FS_SUPER_MAGIC_STRING  "ReIsEr2Fs"
  #define REISER2FS_JR_SUPER_MAGIC_STRING       "ReIsEr3Fs"


@@ -3092,11 +3092,11 @@ Index: linux-2.6.23/include/linux/magic.h
 +
  #define SMB_SUPER_MAGIC               0x517B
  #define USBDEVICE_SUPER_MAGIC 0x9fa2
 +
  #define SMB_SUPER_MAGIC               0x517B
  #define USBDEVICE_SUPER_MAGIC 0x9fa2

- 
-Index: linux-2.6.23/include/linux/squashfs_fs.h
+ #define CGROUP_SUPER_MAGIC    0x27e0eb
+Index: linux-2.6.24.7/include/linux/squashfs_fs.h

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/include/linux/squashfs_fs.h   2007-10-10 13:52:14.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/include/linux/squashfs_fs.h

 @@ -0,0 +1,911 @@
 +#ifndef SQUASHFS_FS
 +#define SQUASHFS_FS
 @@ -0,0 +1,911 @@
 +#ifndef SQUASHFS_FS
 +#define SQUASHFS_FS


@@ -4009,10 +4009,10 @@ Index: linux-2.6.23/include/linux/squashfs_fs.h
 +
 +#endif
 +#endif
 +
 +#endif
 +#endif

-Index: linux-2.6.23/include/linux/squashfs_fs_i.h
+Index: linux-2.6.24.7/include/linux/squashfs_fs_i.h

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/include/linux/squashfs_fs_i.h 2007-10-10 13:52:14.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/include/linux/squashfs_fs_i.h

 @@ -0,0 +1,45 @@
 +#ifndef SQUASHFS_FS_I
 +#define SQUASHFS_FS_I
 @@ -0,0 +1,45 @@
 +#ifndef SQUASHFS_FS_I
 +#define SQUASHFS_FS_I


@@ -4059,10 +4059,10 @@ Index: linux-2.6.23/include/linux/squashfs_fs_i.h
 +      struct inode    vfs_inode;
 +};
 +#endif
 +      struct inode    vfs_inode;
 +};
 +#endif

-Index: linux-2.6.23/include/linux/squashfs_fs_sb.h
+Index: linux-2.6.24.7/include/linux/squashfs_fs_sb.h

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/include/linux/squashfs_fs_sb.h        2007-10-10 13:52:14.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/include/linux/squashfs_fs_sb.h

 @@ -0,0 +1,74 @@
 +#ifndef SQUASHFS_FS_SB
 +#define SQUASHFS_FS_SB
 @@ -0,0 +1,74 @@
 +#ifndef SQUASHFS_FS_SB
 +#define SQUASHFS_FS_SB


@@ -4138,10 +4138,10 @@ Index: linux-2.6.23/include/linux/squashfs_fs_sb.h
 +      int                     (*read_fragment_index_table)(struct super_block *s);
 +};
 +#endif
 +      int                     (*read_fragment_index_table)(struct super_block *s);
 +};
 +#endif

-Index: linux-2.6.23/init/do_mounts_rd.c
+Index: linux-2.6.24.7/init/do_mounts_rd.c

 ===================================================================
 ===================================================================

---- linux-2.6.23.orig/init/do_mounts_rd.c      2007-10-10 13:52:12.000000000 +0800
-+++ linux-2.6.23/init/do_mounts_rd.c   2007-10-10 13:52:14.000000000 +0800
+--- linux-2.6.24.7.orig/init/do_mounts_rd.c
++++ linux-2.6.24.7/init/do_mounts_rd.c

 @@ -5,6 +5,7 @@
  #include <linux/ext2_fs.h>
  #include <linux/romfs_fs.h>
 @@ -5,6 +5,7 @@
  #include <linux/ext2_fs.h>
  #include <linux/romfs_fs.h>


@@ -4150,7 +4150,7 @@ Index: linux-2.6.23/init/do_mounts_rd.c
  #include <linux/initrd.h>
  #include <linux/string.h>
  
  #include <linux/initrd.h>
  #include <linux/string.h>
  

-@@ -39,6 +40,7 @@
+@@ -39,6 +40,7 @@ static int __init crd_load(int in_fd, in

   * numbers could not be found.
   *
   * We currently check for the following magic numbers:
   * numbers could not be found.
   *
   * We currently check for the following magic numbers:


@@ -4158,7 +4158,7 @@ Index: linux-2.6.23/init/do_mounts_rd.c
   *    minix
   *    ext2
   *    romfs
   *    minix
   *    ext2
   *    romfs

-@@ -53,6 +55,7 @@
+@@ -53,6 +55,7 @@ identify_ramdisk_image(int fd, int start

        struct ext2_super_block *ext2sb;
        struct romfs_super_block *romfsb;
        struct cramfs_super *cramfsb;
        struct ext2_super_block *ext2sb;
        struct romfs_super_block *romfsb;
        struct cramfs_super *cramfsb;


@@ -4166,7 +4166,7 @@ Index: linux-2.6.23/init/do_mounts_rd.c
        int nblocks = -1;
        unsigned char *buf;
  
        int nblocks = -1;
        unsigned char *buf;
  

-@@ -64,6 +67,7 @@
+@@ -64,6 +67,7 @@ identify_ramdisk_image(int fd, int start

        ext2sb = (struct ext2_super_block *) buf;
        romfsb = (struct romfs_super_block *) buf;
        cramfsb = (struct cramfs_super *) buf;
        ext2sb = (struct ext2_super_block *) buf;
        romfsb = (struct romfs_super_block *) buf;
        cramfsb = (struct cramfs_super *) buf;


@@ -4174,7 +4174,7 @@ Index: linux-2.6.23/init/do_mounts_rd.c
        memset(buf, 0xe5, size);
  
        /*
        memset(buf, 0xe5, size);
  
        /*

-@@ -101,6 +105,15 @@
+@@ -101,6 +105,15 @@ identify_ramdisk_image(int fd, int start

                goto done;
        }
  
                goto done;
        }
  

diff --git a/target/linux/generic-2.6/patches-2.6.24/002-lzma_decompress.patch b/target/linux/generic-2.6/patches-2.6.24/002-lzma_decompress.patch
index 9e75936..bb41b2d 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/002-lzma_decompress.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/002-lzma_decompress.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.23/include/linux/LzmaDecode.h
+Index: linux-2.6.24.7/include/linux/LzmaDecode.h

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/include/linux/LzmaDecode.h    2007-10-10 13:51:27.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/include/linux/LzmaDecode.h

 @@ -0,0 +1,100 @@
 +/*
 +  LzmaDecode.h
 @@ -0,0 +1,100 @@
 +/*
 +  LzmaDecode.h


@@ -103,10 +103,10 @@ Index: linux-2.6.23/include/linux/LzmaDecode.h
 +    UInt32 *outSizeProcessed);
 +
 +#endif
 +    UInt32 *outSizeProcessed);
 +
 +#endif

-Index: linux-2.6.23/lib/LzmaDecode.c
+Index: linux-2.6.24.7/lib/LzmaDecode.c

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/lib/LzmaDecode.c      2007-10-10 13:51:27.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/lib/LzmaDecode.c

 @@ -0,0 +1,663 @@
 +/*
 +  LzmaDecode.c
 @@ -0,0 +1,663 @@
 +/*
 +  LzmaDecode.c


@@ -771,12 +771,12 @@ Index: linux-2.6.23/lib/LzmaDecode.c
 +  *outSizeProcessed = nowPos;
 +  return LZMA_RESULT_OK;
 +}
 +  *outSizeProcessed = nowPos;
 +  return LZMA_RESULT_OK;
 +}

-Index: linux-2.6.23/lib/Makefile
+Index: linux-2.6.24.7/lib/Makefile

 ===================================================================
 ===================================================================

---- linux-2.6.23.orig/lib/Makefile     2007-10-10 13:50:24.000000000 +0800
-+++ linux-2.6.23/lib/Makefile  2007-10-10 13:51:53.000000000 +0800
-@@ -13,7 +13,7 @@
- lib-y += kobject.o kref.o kobject_uevent.o klist.o
+--- linux-2.6.24.7.orig/lib/Makefile
++++ linux-2.6.24.7/lib/Makefile
+@@ -14,7 +14,7 @@ lib-$(CONFIG_SMP) += cpumask.o
+ lib-y += kobject.o kref.o klist.o

  
  obj-y += div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \
 -       bust_spinlocks.o hexdump.o kasprintf.o bitmap.o
  
  obj-y += div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \
 -       bust_spinlocks.o hexdump.o kasprintf.o bitmap.o


@@ -784,7 +784,7 @@ Index: linux-2.6.23/lib/Makefile
  
  ifeq ($(CONFIG_DEBUG_KOBJECT),y)
  CFLAGS_kobject.o += -DDEBUG
  
  ifeq ($(CONFIG_DEBUG_KOBJECT),y)
  CFLAGS_kobject.o += -DDEBUG

-@@ -62,6 +62,7 @@
+@@ -64,6 +64,7 @@ obj-$(CONFIG_SMP) += percpu_counter.o

  obj-$(CONFIG_AUDIT_GENERIC) += audit.o
  
  obj-$(CONFIG_SWIOTLB) += swiotlb.o
  obj-$(CONFIG_AUDIT_GENERIC) += audit.o
  
  obj-$(CONFIG_SWIOTLB) += swiotlb.o

diff --git a/target/linux/generic-2.6/patches-2.6.24/003-squashfs_lzma.patch b/target/linux/generic-2.6/patches-2.6.24/003-squashfs_lzma.patch
index 06aa001..cfaf0c3 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/003-squashfs_lzma.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/003-squashfs_lzma.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.23-rc6/fs/squashfs/inode.c
+Index: linux-2.6.24.7/fs/squashfs/inode.c

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/fs/squashfs/inode.c  2007-09-21 16:23:55.000000000 +0800
-+++ linux-2.6.23-rc6/fs/squashfs/inode.c       2007-09-21 16:23:56.000000000 +0800
+--- linux-2.6.24.7.orig/fs/squashfs/inode.c
++++ linux-2.6.24.7/fs/squashfs/inode.c

 @@ -4,6 +4,9 @@
   * Copyright (c) 2002, 2003, 2004, 2005, 2006
   * Phillip Lougher <phillip@lougher.org.uk>
 @@ -4,6 +4,9 @@
   * Copyright (c) 2002, 2003, 2004, 2005, 2006
   * Phillip Lougher <phillip@lougher.org.uk>


@@ -40,7 +40,7 @@ Index: linux-2.6.23-rc6/fs/squashfs/inode.c
  static void squashfs_put_super(struct super_block *);
  static int squashfs_statfs(struct dentry *, struct kstatfs *);
  static int squashfs_symlink_readpage(struct file *file, struct page *page);
  static void squashfs_put_super(struct super_block *);
  static int squashfs_statfs(struct dentry *, struct kstatfs *);
  static int squashfs_symlink_readpage(struct file *file, struct page *page);

-@@ -64,7 +81,11 @@
+@@ -64,7 +81,11 @@ static int squashfs_get_sb(struct file_s

                        const char *, void *, struct vfsmount *);
  
  
                        const char *, void *, struct vfsmount *);
  
  


@@ -52,7 +52,7 @@ Index: linux-2.6.23-rc6/fs/squashfs/inode.c
  
  static struct file_system_type squashfs_fs_type = {
        .owner = THIS_MODULE,
  
  static struct file_system_type squashfs_fs_type = {
        .owner = THIS_MODULE,

-@@ -249,6 +270,15 @@
+@@ -249,6 +270,15 @@ SQSH_EXTERN unsigned int squashfs_read_d

        if (compressed) {
                int zlib_err;
  
        if (compressed) {
                int zlib_err;
  


@@ -68,7 +68,7 @@ Index: linux-2.6.23-rc6/fs/squashfs/inode.c
                stream.next_in = c_buffer;
                stream.avail_in = c_byte;
                stream.next_out = buffer;
                stream.next_in = c_buffer;
                stream.avail_in = c_byte;
                stream.next_out = buffer;

-@@ -263,7 +293,7 @@
+@@ -263,7 +293,7 @@ SQSH_EXTERN unsigned int squashfs_read_d

                        bytes = 0;
                } else
                        bytes = stream.total_out;
                        bytes = 0;
                } else
                        bytes = stream.total_out;


@@ -77,7 +77,7 @@ Index: linux-2.6.23-rc6/fs/squashfs/inode.c
                up(&msblk->read_data_mutex);
        }
  
                up(&msblk->read_data_mutex);
        }
  

-@@ -2045,15 +2075,19 @@
+@@ -2045,15 +2075,19 @@ static int __init init_squashfs_fs(void)

        printk(KERN_INFO "squashfs: version 3.0 (2006/03/15) "
                "Phillip Lougher\n");
  
        printk(KERN_INFO "squashfs: version 3.0 (2006/03/15) "
                "Phillip Lougher\n");
  


@@ -97,7 +97,7 @@ Index: linux-2.6.23-rc6/fs/squashfs/inode.c
                destroy_inodecache();
        }
  
                destroy_inodecache();
        }
  

-@@ -2064,7 +2098,9 @@
+@@ -2064,7 +2098,9 @@ out:

  
  static void __exit exit_squashfs_fs(void)
  {
  
  static void __exit exit_squashfs_fs(void)
  {

diff --git a/target/linux/generic-2.6/patches-2.6.24/004-extra_optimization.patch b/target/linux/generic-2.6/patches-2.6.24/004-extra_optimization.patch
index 09248fc..d1a30c3 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/004-extra_optimization.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/004-extra_optimization.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23-rc6/Makefile
+Index: linux-2.6.24.7/Makefile

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/Makefile     2007-09-21 16:23:55.000000000 +0800
-+++ linux-2.6.23-rc6/Makefile  2007-09-21 16:23:56.000000000 +0800
-@@ -508,6 +508,9 @@
+--- linux-2.6.24.7.orig/Makefile
++++ linux-2.6.24.7/Makefile
+@@ -527,6 +527,9 @@ KBUILD_CFLAGS         += $(call cc-optio

  NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
  CHECKFLAGS     += $(NOSTDINC_FLAGS)
  
  NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
  CHECKFLAGS     += $(NOSTDINC_FLAGS)
  


@@ -10,5 +10,5 @@ Index: linux-2.6.23-rc6/Makefile
 +CFLAGS += $(call cc-option,-funit-at-a-time,)
 +
  # warn about C99 declaration after statement
 +CFLAGS += $(call cc-option,-funit-at-a-time,)
 +
  # warn about C99 declaration after statement

- CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
+ KBUILD_CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)

  
  

diff --git a/target/linux/generic-2.6/patches-2.6.24/005-squashfs_fix.patch b/target/linux/generic-2.6/patches-2.6.24/005-squashfs_fix.patch
index 9823726..50803cf 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/005-squashfs_fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/005-squashfs_fix.patch
@@ -1,6 +1,8 @@
---- linux-2.6.24/fs/squashfs/inode.c   2008-01-28 23:38:13.000000000 +0100
-+++ linux-2.6.24-owrt/fs/squashfs/inode.c      2008-01-28 23:43:18.000000000 +0100
-@@ -29,6 +29,7 @@
+Index: linux-2.6.24.7/fs/squashfs/inode.c
+===================================================================
+--- linux-2.6.24.7.orig/fs/squashfs/inode.c
++++ linux-2.6.24.7/fs/squashfs/inode.c
+@@ -33,6 +33,7 @@

  #include <linux/fs.h>
  #include <linux/smp_lock.h>
  #include <linux/slab.h>
  #include <linux/fs.h>
  #include <linux/smp_lock.h>
  #include <linux/slab.h>


@@ -8,7 +10,7 @@
  #include <linux/squashfs_fs_sb.h>
  #include <linux/squashfs_fs_i.h>
  #include <linux/buffer_head.h>
  #include <linux/squashfs_fs_sb.h>
  #include <linux/squashfs_fs_i.h>
  #include <linux/buffer_head.h>

-@@ -2089,7 +2090,7 @@
+@@ -2125,7 +2126,7 @@ static void squashfs_destroy_inode(struc

  }
  
  
  }
  
  

diff --git a/target/linux/generic-2.6/patches-2.6.24/006-gcc4_inline_fix.patch b/target/linux/generic-2.6/patches-2.6.24/006-gcc4_inline_fix.patch
index 704fc75..bc27ac7 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/006-gcc4_inline_fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/006-gcc4_inline_fix.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23/include/asm-mips/system.h
+Index: linux-2.6.24.7/include/asm-mips/system.h

 ===================================================================
 ===================================================================

---- linux-2.6.23.orig/include/asm-mips/system.h        2007-10-10 04:31:38.000000000 +0800
-+++ linux-2.6.23/include/asm-mips/system.h     2007-10-10 13:52:24.000000000 +0800
-@@ -181,7 +181,7 @@
+--- linux-2.6.24.7.orig/include/asm-mips/system.h
++++ linux-2.6.24.7/include/asm-mips/system.h
+@@ -185,7 +185,7 @@ extern __u64 __xchg_u64_unsupported_on_3

     if something tries to do an invalid xchg().  */
  extern void __xchg_called_with_bad_pointer(void);
  
     if something tries to do an invalid xchg().  */
  extern void __xchg_called_with_bad_pointer(void);
  

diff --git a/target/linux/generic-2.6/patches-2.6.24/007-samsung_flash.patch b/target/linux/generic-2.6/patches-2.6.24/007-samsung_flash.patch
index 1be698c..9685a7b 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/007-samsung_flash.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/007-samsung_flash.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0002.c
+Index: linux-2.6.24.7/drivers/mtd/chips/cfi_cmdset_0002.c

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/drivers/mtd/chips/cfi_cmdset_0002.c  2007-09-21 16:23:54.000000000 +0800
-+++ linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0002.c       2007-09-21 16:23:57.000000000 +0800
+--- linux-2.6.24.7.orig/drivers/mtd/chips/cfi_cmdset_0002.c
++++ linux-2.6.24.7/drivers/mtd/chips/cfi_cmdset_0002.c

 @@ -51,6 +51,7 @@
  #define SST49LF040B           0x0050
  #define SST49LF008A           0x005a
 @@ -51,6 +51,7 @@
  #define SST49LF040B           0x0050
  #define SST49LF008A           0x005a


@@ -10,7 +10,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0002.c
  
  static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
  static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
  
  static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
  static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);

-@@ -294,12 +295,19 @@
+@@ -294,12 +295,19 @@ struct mtd_info *cfi_cmdset_0002(struct 

  
                if (extp->MajorVersion != '1' ||
                    (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
  
                if (extp->MajorVersion != '1' ||
                    (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {

diff --git a/target/linux/generic-2.6/patches-2.6.24/009-revert_intel_flash_breakage.patch b/target/linux/generic-2.6/patches-2.6.24/009-revert_intel_flash_breakage.patch
index 80fb4d4..63fc8ff 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/009-revert_intel_flash_breakage.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/009-revert_intel_flash_breakage.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
+Index: linux-2.6.24.7/drivers/mtd/chips/cfi_cmdset_0001.c

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/drivers/mtd/chips/cfi_cmdset_0001.c  2007-09-21 16:23:54.000000000 +0800
-+++ linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c       2007-09-21 16:23:57.000000000 +0800
-@@ -933,7 +933,7 @@
+--- linux-2.6.24.7.orig/drivers/mtd/chips/cfi_cmdset_0001.c
++++ linux-2.6.24.7/drivers/mtd/chips/cfi_cmdset_0001.c
+@@ -944,7 +944,7 @@ static void __xipram xip_enable(struct m

  
  static int __xipram xip_wait_for_operation(
                struct map_info *map, struct flchip *chip,
  
  static int __xipram xip_wait_for_operation(
                struct map_info *map, struct flchip *chip,


@@ -11,7 +11,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
  {
        struct cfi_private *cfi = map->fldrv_priv;
        struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
  {
        struct cfi_private *cfi = map->fldrv_priv;
        struct cfi_pri_intelext *cfip = cfi->cmdset_priv;

-@@ -942,7 +942,7 @@
+@@ -953,7 +953,7 @@ static int __xipram xip_wait_for_operati

        flstate_t oldstate, newstate;
  
                start = xip_currtime();
        flstate_t oldstate, newstate;
  
                start = xip_currtime();


@@ -20,7 +20,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
        if (usec == 0)
                usec = 500000;
        done = 0;
        if (usec == 0)
                usec = 500000;
        done = 0;

-@@ -1052,8 +1052,8 @@
+@@ -1063,8 +1063,8 @@ static int __xipram xip_wait_for_operati

  #define XIP_INVAL_CACHED_RANGE(map, from, size)  \
        INVALIDATE_CACHED_RANGE(map, from, size)
  
  #define XIP_INVAL_CACHED_RANGE(map, from, size)  \
        INVALIDATE_CACHED_RANGE(map, from, size)
  


@@ -31,7 +31,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
  
  #else
  
  
  #else
  

-@@ -1065,65 +1065,65 @@
+@@ -1076,65 +1076,65 @@ static int __xipram xip_wait_for_operati

  static int inval_cache_and_wait_for_operation(
                struct map_info *map, struct flchip *chip,
                unsigned long cmd_adr, unsigned long inval_adr, int inval_len,
  static int inval_cache_and_wait_for_operation(
                struct map_info *map, struct flchip *chip,
                unsigned long cmd_adr, unsigned long inval_adr, int inval_len,


@@ -132,7 +132,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
        /* Done and happy. */
        chip->state = FL_STATUS;
        return 0;
        /* Done and happy. */
        chip->state = FL_STATUS;
        return 0;

-@@ -1132,7 +1132,8 @@
+@@ -1143,7 +1143,8 @@ static int inval_cache_and_wait_for_oper

  #endif
  
  #define WAIT_TIMEOUT(map, chip, adr, udelay) \
  #endif
  
  #define WAIT_TIMEOUT(map, chip, adr, udelay) \


@@ -142,7 +142,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
  
  
  static int do_point_onechip (struct map_info *map, struct flchip *chip, loff_t adr, size_t len)
  
  
  static int do_point_onechip (struct map_info *map, struct flchip *chip, loff_t adr, size_t len)

-@@ -1356,7 +1357,7 @@
+@@ -1374,7 +1375,7 @@ static int __xipram do_write_oneword(str

  
        ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
                                   adr, map_bankwidth(map),
  
        ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
                                   adr, map_bankwidth(map),


@@ -151,7 +151,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
        if (ret) {
                xip_enable(map, chip, adr);
                printk(KERN_ERR "%s: word write error (status timeout)\n", map->name);
        if (ret) {
                xip_enable(map, chip, adr);
                printk(KERN_ERR "%s: word write error (status timeout)\n", map->name);

-@@ -1593,7 +1594,7 @@
+@@ -1614,7 +1615,7 @@ static int __xipram do_write_buffer(stru

  
        ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr,
                                   initial_adr, initial_len,
  
        ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr,
                                   initial_adr, initial_len,


@@ -160,7 +160,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
        if (ret) {
                map_write(map, CMD(0x70), cmd_adr);
                chip->state = FL_STATUS;
        if (ret) {
                map_write(map, CMD(0x70), cmd_adr);
                chip->state = FL_STATUS;

-@@ -1728,7 +1729,7 @@
+@@ -1749,7 +1750,7 @@ static int __xipram do_erase_oneblock(st

  
        ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
                                   adr, len,
  
        ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
                                   adr, len,

diff --git a/target/linux/generic-2.6/patches-2.6.24/010-disable_old_squashfs_compatibility.patch b/target/linux/generic-2.6/patches-2.6.24/010-disable_old_squashfs_compatibility.patch
index 99c5e2e..5a77d9e 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/010-disable_old_squashfs_compatibility.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/010-disable_old_squashfs_compatibility.patch
@@ -1,16 +1,16 @@
-Index: linux-2.6.23-rc6/fs/squashfs/Makefile
+Index: linux-2.6.24.7/fs/squashfs/Makefile

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/fs/squashfs/Makefile 2007-09-21 16:23:55.000000000 +0800
-+++ linux-2.6.23-rc6/fs/squashfs/Makefile      2007-09-21 16:23:58.000000000 +0800
+--- linux-2.6.24.7.orig/fs/squashfs/Makefile
++++ linux-2.6.24.7/fs/squashfs/Makefile

 @@ -4,4 +4,3 @@
  
  obj-$(CONFIG_SQUASHFS) += squashfs.o
  squashfs-y += inode.o
 -squashfs-y += squashfs2_0.o
 @@ -4,4 +4,3 @@
  
  obj-$(CONFIG_SQUASHFS) += squashfs.o
  squashfs-y += inode.o
 -squashfs-y += squashfs2_0.o

-Index: linux-2.6.23-rc6/fs/squashfs/squashfs.h
+Index: linux-2.6.24.7/fs/squashfs/squashfs.h

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/fs/squashfs/squashfs.h       2007-09-21 16:23:55.000000000 +0800
-+++ linux-2.6.23-rc6/fs/squashfs/squashfs.h    2007-09-21 16:23:58.000000000 +0800
+--- linux-2.6.24.7.orig/fs/squashfs/squashfs.h
++++ linux-2.6.24.7/fs/squashfs/squashfs.h

 @@ -24,6 +24,9 @@
  #ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY
  #undef CONFIG_SQUASHFS_1_0_COMPATIBILITY
 @@ -24,6 +24,9 @@
  #ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY
  #undef CONFIG_SQUASHFS_1_0_COMPATIBILITY

diff --git a/target/linux/generic-2.6/patches-2.6.24/011-mips_boot.patch b/target/linux/generic-2.6/patches-2.6.24/011-mips_boot.patch
index 08c83d5..b918353 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/011-mips_boot.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/011-mips_boot.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23-rc6/arch/mips/kernel/head.S
+Index: linux-2.6.24.7/arch/mips/kernel/head.S

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/arch/mips/kernel/head.S      2007-09-21 16:23:54.000000000 +0800
-+++ linux-2.6.23-rc6/arch/mips/kernel/head.S   2007-09-21 16:23:58.000000000 +0800
-@@ -130,6 +130,8 @@
+--- linux-2.6.24.7.orig/arch/mips/kernel/head.S
++++ linux-2.6.24.7/arch/mips/kernel/head.S
+@@ -120,6 +120,8 @@

  #endif
        .endm
  
  #endif
        .endm
  

diff --git a/target/linux/generic-2.6/patches-2.6.24/012-mips_cpu_tlb.patch b/target/linux/generic-2.6/patches-2.6.24/012-mips_cpu_tlb.patch
index eea10c1..98a0744 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/012-mips_cpu_tlb.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/012-mips_cpu_tlb.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23/arch/mips/mm/tlbex.c
+Index: linux-2.6.24.7/arch/mips/mm/tlbex.c

 ===================================================================
 ===================================================================

---- linux-2.6.23.orig/arch/mips/mm/tlbex.c     2007-10-10 04:31:38.000000000 +0800
-+++ linux-2.6.23/arch/mips/mm/tlbex.c  2007-10-10 13:52:34.000000000 +0800
-@@ -902,7 +902,6 @@
+--- linux-2.6.24.7.orig/arch/mips/mm/tlbex.c
++++ linux-2.6.24.7/arch/mips/mm/tlbex.c
+@@ -902,7 +902,6 @@ static __init void build_tlb_write_entry

        case CPU_R10000:
        case CPU_R12000:
        case CPU_R14000:
        case CPU_R10000:
        case CPU_R12000:
        case CPU_R14000:


@@ -10,7 +10,7 @@ Index: linux-2.6.23/arch/mips/mm/tlbex.c
        case CPU_SB1:
        case CPU_SB1A:
        case CPU_4KSC:
        case CPU_SB1:
        case CPU_SB1A:
        case CPU_4KSC:

-@@ -933,6 +932,7 @@
+@@ -935,6 +934,7 @@ static __init void build_tlb_write_entry

                tlbw(p);
                break;
  
                tlbw(p);
                break;
  

diff --git a/target/linux/generic-2.6/patches-2.6.24/013-mips_gdb_stub.patch b/target/linux/generic-2.6/patches-2.6.24/013-mips_gdb_stub.patch
index 000b748..8df6cc6 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/013-mips_gdb_stub.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/013-mips_gdb_stub.patch
@@ -1,20 +1,20 @@
-Index: linux-2.6.23/arch/mips/kernel/gdb-stub.c
+Index: linux-2.6.24.7/arch/mips/kernel/gdb-stub.c

 ===================================================================
 ===================================================================

---- linux-2.6.23.orig/arch/mips/kernel/gdb-stubc.c     2007-10-12 18:43:44.000000000 +0200
-+++ linux-2.6.23/arch/mips/kernel/gdb-stub.c   2007-11-16 08:35:51.000000000 +0100
-@@ -656,6 +656,7 @@
-        *epc = (unsigned long)async_breakpoint;
+--- linux-2.6.24.7.orig/arch/mips/kernel/gdb-stub.c
++++ linux-2.6.24.7/arch/mips/kernel/gdb-stub.c
+@@ -656,6 +656,7 @@ void set_async_breakpoint(unsigned long 
+       *epc = (unsigned long)async_breakpoint;

  }
  }

-
+ 

 +#ifdef CONFIG_SMP
  static void kgdb_wait(void *arg)
  {
 +#ifdef CONFIG_SMP
  static void kgdb_wait(void *arg)
  {

-        unsigned flags;
-@@ -668,6 +669,7 @@
-
-        local_irq_restore(flags);
+       unsigned flags;
+@@ -668,6 +669,7 @@ static void kgdb_wait(void *arg)
+ 
+       local_irq_restore(flags);

  }
 +#endif
  }
 +#endif

-
+ 

  /*
   * GDB stub needs to call kgdb_wait on all processor with interrupts
  /*
   * GDB stub needs to call kgdb_wait on all processor with interrupts

diff --git a/target/linux/generic-2.6/patches-2.6.24/060-block2mtd_init.patch b/target/linux/generic-2.6/patches-2.6.24/060-block2mtd_init.patch
index b331f73..80ff918 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/060-block2mtd_init.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/060-block2mtd_init.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
+Index: linux-2.6.24.7/drivers/mtd/devices/block2mtd.c

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/drivers/mtd/devices/block2mtd.c      2007-09-21 16:23:54.000000000 +0800
-+++ linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c   2007-09-21 16:23:59.000000000 +0800
+--- linux-2.6.24.7.orig/drivers/mtd/devices/block2mtd.c
++++ linux-2.6.24.7/drivers/mtd/devices/block2mtd.c

 @@ -16,6 +16,7 @@
  #include <linux/list.h>
  #include <linux/init.h>
 @@ -16,6 +16,7 @@
  #include <linux/list.h>
  #include <linux/init.h>


@@ -10,7 +10,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
  #include <linux/buffer_head.h>
  #include <linux/mutex.h>
  #include <linux/mount.h>
  #include <linux/buffer_head.h>
  #include <linux/mutex.h>
  #include <linux/mount.h>

-@@ -237,10 +238,11 @@
+@@ -237,10 +238,11 @@ static void block2mtd_free_device(struct

  
  
  /* FIXME: ensure that mtd->size % erase_size == 0 */
  
  
  /* FIXME: ensure that mtd->size % erase_size == 0 */


@@ -23,7 +23,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
  
        if (!devname)
                return NULL;
  
        if (!devname)
                return NULL;

-@@ -279,14 +281,18 @@
+@@ -279,14 +281,18 @@ static struct block2mtd_dev *add_device(

  
        /* Setup the MTD structure */
        /* make the name contain the block device in */
  
        /* Setup the MTD structure */
        /* make the name contain the block device in */


@@ -47,7 +47,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
        dev->mtd.erasesize = erase_size;
        dev->mtd.writesize = 1;
        dev->mtd.type = MTD_RAM;
        dev->mtd.erasesize = erase_size;
        dev->mtd.writesize = 1;
        dev->mtd.type = MTD_RAM;

-@@ -298,15 +304,18 @@
+@@ -298,15 +304,18 @@ static struct block2mtd_dev *add_device(

        dev->mtd.read = block2mtd_read;
        dev->mtd.priv = dev;
        dev->mtd.owner = THIS_MODULE;
        dev->mtd.read = block2mtd_read;
        dev->mtd.priv = dev;
        dev->mtd.owner = THIS_MODULE;


@@ -70,7 +70,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
        return dev;
  
  devinit_err:
        return dev;
  
  devinit_err:

-@@ -379,9 +388,9 @@
+@@ -379,9 +388,9 @@ static char block2mtd_paramline[80 + 12]

  
  static int block2mtd_setup2(const char *val)
  {
  
  static int block2mtd_setup2(const char *val)
  {


@@ -82,7 +82,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
        char *name;
        size_t erase_size = PAGE_SIZE;
        int i, ret;
        char *name;
        size_t erase_size = PAGE_SIZE;
        int i, ret;

-@@ -392,7 +401,7 @@
+@@ -392,7 +401,7 @@ static int block2mtd_setup2(const char *

        strcpy(str, val);
        kill_final_newline(str);
  
        strcpy(str, val);
        kill_final_newline(str);
  


@@ -91,7 +91,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
                token[i] = strsep(&str, ",");
  
        if (str)
                token[i] = strsep(&str, ",");
  
        if (str)

-@@ -412,8 +421,10 @@
+@@ -411,8 +420,10 @@ static int block2mtd_setup2(const char *

                        parse_err("illegal erase size");
                }
        }
                        parse_err("illegal erase size");
                }
        }


@@ -103,7 +103,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
  
        return 0;
  }
  
        return 0;
  }

-@@ -447,7 +458,7 @@
+@@ -446,7 +457,7 @@ static int block2mtd_setup(const char *v

  
  
  module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
  
  
  module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);

diff --git a/target/linux/generic-2.6/patches-2.6.24/065-rootfs_split.patch b/target/linux/generic-2.6/patches-2.6.24/065-rootfs_split.patch
index 8680f19..09f03db 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/065-rootfs_split.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/065-rootfs_split.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23-rc6/drivers/mtd/Kconfig
+Index: linux-2.6.24.7/drivers/mtd/Kconfig

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/drivers/mtd/Kconfig  2007-09-21 16:23:54.000000000 +0800
-+++ linux-2.6.23-rc6/drivers/mtd/Kconfig       2007-09-21 16:23:59.000000000 +0800
-@@ -47,6 +47,16 @@
+--- linux-2.6.24.7.orig/drivers/mtd/Kconfig
++++ linux-2.6.24.7/drivers/mtd/Kconfig
+@@ -47,6 +47,16 @@ config MTD_PARTITIONS

          devices. Partitioning on NFTL 'devices' is a different - that's the
          'normal' form of partitioning used on a block device.
  
          devices. Partitioning on NFTL 'devices' is a different - that's the
          'normal' form of partitioning used on a block device.
  


@@ -19,10 +19,10 @@ Index: linux-2.6.23-rc6/drivers/mtd/Kconfig
  config MTD_REDBOOT_PARTS
        tristate "RedBoot partition table parsing"
        depends on MTD_PARTITIONS
  config MTD_REDBOOT_PARTS
        tristate "RedBoot partition table parsing"
        depends on MTD_PARTITIONS

-Index: linux-2.6.23-rc6/drivers/mtd/mtdpart.c
+Index: linux-2.6.24.7/drivers/mtd/mtdpart.c

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/drivers/mtd/mtdpart.c        2007-09-21 16:23:54.000000000 +0800
-+++ linux-2.6.23-rc6/drivers/mtd/mtdpart.c     2007-09-21 16:23:59.000000000 +0800
+--- linux-2.6.24.7.orig/drivers/mtd/mtdpart.c
++++ linux-2.6.24.7/drivers/mtd/mtdpart.c

 @@ -20,6 +20,8 @@
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/partitions.h>
 @@ -20,6 +20,8 @@
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/partitions.h>


@@ -32,7 +32,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/mtdpart.c
  
  /* Our partition linked list */
  static LIST_HEAD(mtd_partitions);
  
  /* Our partition linked list */
  static LIST_HEAD(mtd_partitions);

-@@ -39,7 +41,7 @@
+@@ -39,7 +41,7 @@ struct mtd_part {

   * the pointer to that structure with this macro.
   */
  #define PART(x)  ((struct mtd_part *)(x))
   * the pointer to that structure with this macro.
   */
  #define PART(x)  ((struct mtd_part *)(x))


@@ -41,7 +41,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/mtdpart.c
  
  /*
   * MTD methods which simply translate the effective address and pass through
  
  /*
   * MTD methods which simply translate the effective address and pass through

-@@ -308,6 +310,312 @@
+@@ -308,6 +310,312 @@ int del_mtd_partitions(struct mtd_info *

        return 0;
  }
  
        return 0;
  }
  


@@ -354,7 +354,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/mtdpart.c
  /*
   * This function, given a master MTD object and a partition table, creates
   * and registers slave MTD objects which are bound to the master according to
  /*
   * This function, given a master MTD object and a partition table, creates
   * and registers slave MTD objects which are bound to the master according to

-@@ -320,168 +628,31 @@
+@@ -320,168 +628,31 @@ int add_mtd_partitions(struct mtd_info *

                       int nbparts)
  {
        struct mtd_part *slave;
                       int nbparts)
  {
        struct mtd_part *slave;


@@ -544,7 +544,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/mtdpart.c
                }
        }
  
                }
        }
  

-@@ -557,6 +728,32 @@
+@@ -557,6 +728,32 @@ int parse_mtd_partitions(struct mtd_info

        return ret;
  }
  
        return ret;
  }
  


@@ -577,11 +577,11 @@ Index: linux-2.6.23-rc6/drivers/mtd/mtdpart.c
 +EXPORT_SYMBOL_GPL(refresh_mtd_partitions);
  EXPORT_SYMBOL_GPL(register_mtd_parser);
  EXPORT_SYMBOL_GPL(deregister_mtd_parser);
 +EXPORT_SYMBOL_GPL(refresh_mtd_partitions);
  EXPORT_SYMBOL_GPL(register_mtd_parser);
  EXPORT_SYMBOL_GPL(deregister_mtd_parser);

-Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
+Index: linux-2.6.24.7/drivers/mtd/devices/block2mtd.c

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/drivers/mtd/devices/block2mtd.c      2007-09-21 16:23:59.000000000 +0800
-+++ linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c   2007-09-21 16:23:59.000000000 +0800
-@@ -34,6 +34,8 @@
+--- linux-2.6.24.7.orig/drivers/mtd/devices/block2mtd.c
++++ linux-2.6.24.7/drivers/mtd/devices/block2mtd.c
+@@ -34,6 +34,8 @@ struct block2mtd_dev {

        struct block_device *blkdev;
        struct mtd_info mtd;
        struct mutex write_mutex;
        struct block_device *blkdev;
        struct mtd_info mtd;
        struct mutex write_mutex;


@@ -590,7 +590,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
  };
  
  
  };
  
  

-@@ -86,6 +88,12 @@
+@@ -86,6 +88,12 @@ static int block2mtd_erase(struct mtd_in

        size_t len = instr->len;
        int err;
  
        size_t len = instr->len;
        int err;
  


@@ -603,7 +603,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
        instr->state = MTD_ERASING;
        mutex_lock(&dev->write_mutex);
        err = _block2mtd_erase(dev, from, len);
        instr->state = MTD_ERASING;
        mutex_lock(&dev->write_mutex);
        err = _block2mtd_erase(dev, from, len);

-@@ -98,6 +106,10 @@
+@@ -98,6 +106,10 @@ static int block2mtd_erase(struct mtd_in

  
        instr->state = MTD_ERASE_DONE;
        mtd_erase_callback(instr);
  
        instr->state = MTD_ERASE_DONE;
        mtd_erase_callback(instr);


@@ -614,7 +614,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
        return err;
  }
  
        return err;
  }
  

-@@ -109,10 +121,14 @@
+@@ -109,10 +121,14 @@ static int block2mtd_read(struct mtd_inf

        struct page *page;
        int index = from >> PAGE_SHIFT;
        int offset = from & (PAGE_SIZE-1);
        struct page *page;
        int index = from >> PAGE_SHIFT;
        int offset = from & (PAGE_SIZE-1);


@@ -632,7 +632,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
        if (from + len > mtd->size)
                len = mtd->size - from;
  
        if (from + len > mtd->size)
                len = mtd->size - from;
  

-@@ -127,10 +143,14 @@
+@@ -127,10 +143,14 @@ static int block2mtd_read(struct mtd_inf

                len = len - cpylen;
  
                page = page_read(dev->blkdev->bd_inode->i_mapping, index);
                len = len - cpylen;
  
                page = page_read(dev->blkdev->bd_inode->i_mapping, index);


@@ -651,7 +651,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
  
                memcpy(buf, page_address(page) + offset, cpylen);
                page_cache_release(page);
  
                memcpy(buf, page_address(page) + offset, cpylen);
                page_cache_release(page);

-@@ -141,7 +161,10 @@
+@@ -141,7 +161,10 @@ static int block2mtd_read(struct mtd_inf

                offset = 0;
                index++;
        }
                offset = 0;
                index++;
        }


@@ -663,7 +663,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
  }
  
  
  }
  
  

-@@ -193,12 +216,22 @@
+@@ -193,12 +216,22 @@ static int block2mtd_write(struct mtd_in

                size_t *retlen, const u_char *buf)
  {
        struct block2mtd_dev *dev = mtd->priv;
                size_t *retlen, const u_char *buf)
  {
        struct block2mtd_dev *dev = mtd->priv;


@@ -690,7 +690,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
        if (to + len > mtd->size)
                len = mtd->size - to;
  
        if (to + len > mtd->size)
                len = mtd->size - to;
  

-@@ -207,6 +240,9 @@
+@@ -207,6 +240,9 @@ static int block2mtd_write(struct mtd_in

        mutex_unlock(&dev->write_mutex);
        if (err > 0)
                err = 0;
        mutex_unlock(&dev->write_mutex);
        if (err > 0)
                err = 0;


@@ -700,7 +700,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
        return err;
  }
  
        return err;
  }
  

-@@ -215,51 +251,29 @@
+@@ -215,51 +251,29 @@ static int block2mtd_write(struct mtd_in

  static void block2mtd_sync(struct mtd_info *mtd)
  {
        struct block2mtd_dev *dev = mtd->priv;
  static void block2mtd_sync(struct mtd_info *mtd)
  {
        struct block2mtd_dev *dev = mtd->priv;


@@ -760,7 +760,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
                if (devt) {
                        bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
                }
                if (devt) {
                        bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
                }

-@@ -267,17 +281,96 @@
+@@ -267,17 +281,96 @@ static struct block2mtd_dev *add_device(

  #endif
  
        if (IS_ERR(bdev)) {
  #endif
  
        if (IS_ERR(bdev)) {


@@ -860,7 +860,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
  
        /* Setup the MTD structure */
        /* make the name contain the block device in */
  
        /* Setup the MTD structure */
        /* make the name contain the block device in */

-@@ -304,6 +397,7 @@
+@@ -304,6 +397,7 @@ static struct block2mtd_dev *add_device(

        dev->mtd.read = block2mtd_read;
        dev->mtd.priv = dev;
        dev->mtd.owner = THIS_MODULE;
        dev->mtd.read = block2mtd_read;
        dev->mtd.priv = dev;
        dev->mtd.owner = THIS_MODULE;


@@ -868,10 +868,10 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
        
        part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
        part->name = dev->mtd.name;
        
        part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
        part->name = dev->mtd.name;

-Index: linux-2.6.23-rc6/drivers/mtd/mtdchar.c
+Index: linux-2.6.24.7/drivers/mtd/mtdchar.c

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/drivers/mtd/mtdchar.c        2007-09-21 16:23:54.000000000 +0800
-+++ linux-2.6.23-rc6/drivers/mtd/mtdchar.c     2007-09-21 16:23:59.000000000 +0800
+--- linux-2.6.24.7.orig/drivers/mtd/mtdchar.c
++++ linux-2.6.24.7/drivers/mtd/mtdchar.c

 @@ -17,6 +17,7 @@
  
  #include <linux/mtd/mtd.h>
 @@ -17,6 +17,7 @@
  
  #include <linux/mtd/mtd.h>


@@ -880,7 +880,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/mtdchar.c
  
  #include <asm/uaccess.h>
  
  
  #include <asm/uaccess.h>
  

-@@ -753,6 +754,13 @@
+@@ -754,6 +755,13 @@ static int mtd_ioctl(struct inode *inode

                file->f_pos = 0;
                break;
        }
                file->f_pos = 0;
                break;
        }


@@ -894,11 +894,11 @@ Index: linux-2.6.23-rc6/drivers/mtd/mtdchar.c
  
        default:
                ret = -ENOTTY;
  
        default:
                ret = -ENOTTY;

-Index: linux-2.6.23-rc6/include/linux/mtd/mtd.h
+Index: linux-2.6.24.7/include/linux/mtd/mtd.h

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/include/linux/mtd/mtd.h      2007-09-21 16:23:54.000000000 +0800
-+++ linux-2.6.23-rc6/include/linux/mtd/mtd.h   2007-09-21 16:23:59.000000000 +0800
-@@ -98,6 +98,7 @@
+--- linux-2.6.24.7.orig/include/linux/mtd/mtd.h
++++ linux-2.6.24.7/include/linux/mtd/mtd.h
+@@ -98,6 +98,7 @@ struct mtd_oob_ops {

        uint8_t         *oobbuf;
  };
  
        uint8_t         *oobbuf;
  };
  


@@ -906,7 +906,7 @@ Index: linux-2.6.23-rc6/include/linux/mtd/mtd.h
  struct mtd_info {
        u_char type;
        u_int32_t flags;
  struct mtd_info {
        u_char type;
        u_int32_t flags;

-@@ -195,6 +196,9 @@
+@@ -202,6 +203,9 @@ struct mtd_info {

        struct module *owner;
        int usecount;
  
        struct module *owner;
        int usecount;
  


@@ -916,10 +916,10 @@ Index: linux-2.6.23-rc6/include/linux/mtd/mtd.h
        /* If the driver is something smart, like UBI, it may need to maintain
         * its own reference counting. The below functions are only for driver.
         * The driver may register its callbacks. These callbacks are not
        /* If the driver is something smart, like UBI, it may need to maintain
         * its own reference counting. The below functions are only for driver.
         * The driver may register its callbacks. These callbacks are not

-Index: linux-2.6.23-rc6/include/linux/mtd/partitions.h
+Index: linux-2.6.24.7/include/linux/mtd/partitions.h

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/include/linux/mtd/partitions.h       2007-09-21 16:23:54.000000000 +0800
-+++ linux-2.6.23-rc6/include/linux/mtd/partitions.h    2007-09-21 16:23:59.000000000 +0800
+--- linux-2.6.24.7.orig/include/linux/mtd/partitions.h
++++ linux-2.6.24.7/include/linux/mtd/partitions.h

 @@ -36,6 +36,7 @@
   * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
   */
 @@ -36,6 +36,7 @@
   * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
   */


@@ -928,7 +928,7 @@ Index: linux-2.6.23-rc6/include/linux/mtd/partitions.h
  struct mtd_partition {
        char *name;                     /* identifier string */
        u_int32_t size;                 /* partition size */
  struct mtd_partition {
        char *name;                     /* identifier string */
        u_int32_t size;                 /* partition size */

-@@ -43,6 +44,7 @@
+@@ -43,6 +44,7 @@ struct mtd_partition {

        u_int32_t mask_flags;           /* master MTD flags to mask out for this partition */
        struct nand_ecclayout *ecclayout;       /* out of band layout for this partition (NAND only)*/
        struct mtd_info **mtdp;         /* pointer to store the MTD object */
        u_int32_t mask_flags;           /* master MTD flags to mask out for this partition */
        struct nand_ecclayout *ecclayout;       /* out of band layout for this partition (NAND only)*/
        struct mtd_info **mtdp;         /* pointer to store the MTD object */


@@ -936,7 +936,7 @@ Index: linux-2.6.23-rc6/include/linux/mtd/partitions.h
  };
  
  #define MTDPART_OFS_NXTBLK    (-2)
  };
  
  #define MTDPART_OFS_NXTBLK    (-2)

-@@ -52,6 +54,7 @@
+@@ -52,6 +54,7 @@ struct mtd_partition {

  
  int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
  int del_mtd_partitions(struct mtd_info *);
  
  int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
  int del_mtd_partitions(struct mtd_info *);


@@ -944,11 +944,11 @@ Index: linux-2.6.23-rc6/include/linux/mtd/partitions.h
  
  /*
   * Functions dealing with the various ways of partitioning the space
  
  /*
   * Functions dealing with the various ways of partitioning the space

-Index: linux-2.6.23-rc6/include/mtd/mtd-abi.h
+Index: linux-2.6.24.7/include/mtd/mtd-abi.h

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/include/mtd/mtd-abi.h        2007-09-21 16:23:54.000000000 +0800
-+++ linux-2.6.23-rc6/include/mtd/mtd-abi.h     2007-09-21 16:23:59.000000000 +0800
-@@ -95,6 +95,7 @@
+--- linux-2.6.24.7.orig/include/mtd/mtd-abi.h
++++ linux-2.6.24.7/include/mtd/mtd-abi.h
+@@ -95,6 +95,7 @@ struct otp_info {

  #define ECCGETLAYOUT          _IOR('M', 17, struct nand_ecclayout)
  #define ECCGETSTATS           _IOR('M', 18, struct mtd_ecc_stats)
  #define MTDFILEMODE           _IO('M', 19)
  #define ECCGETLAYOUT          _IOR('M', 17, struct nand_ecclayout)
  #define ECCGETSTATS           _IOR('M', 18, struct mtd_ecc_stats)
  #define MTDFILEMODE           _IO('M', 19)

diff --git a/target/linux/generic-2.6/patches-2.6.24/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.24/070-redboot_space.patch
index 272a51f..a91c849 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/070-redboot_space.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/070-redboot_space.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23.1/drivers/mtd/redboot.c
+Index: linux-2.6.24.7/drivers/mtd/redboot.c

 ===================================================================
 ===================================================================

---- linux-2.6.23.1.orig/drivers/mtd/redboot.c  2008-01-26 01:43:10.742362738 +0100
-+++ linux-2.6.23.1/drivers/mtd/redboot.c       2008-01-26 01:47:24.432819736 +0100
-@@ -236,14 +236,21 @@
+--- linux-2.6.24.7.orig/drivers/mtd/redboot.c
++++ linux-2.6.24.7/drivers/mtd/redboot.c
+@@ -236,14 +236,21 @@ static int parse_redboot_partitions(stru

  #endif
                names += strlen(names)+1;
  
  #endif
                names += strlen(names)+1;
  

diff --git a/target/linux/generic-2.6/patches-2.6.24/100-netfilter_layer7_2.17.patch b/target/linux/generic-2.6/patches-2.6.24/100-netfilter_layer7_2.17.patch
index fb43810..4c42cc0 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/100-netfilter_layer7_2.17.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/100-netfilter_layer7_2.17.patch
@@ -1,5 +1,7 @@
---- linux-2.6.24-rc5/net/netfilter/Kconfig     2007-12-11 23:43:21.000000000 -0600
-+++ linux-2.6.24-rc5-layer7/net/netfilter/Kconfig      2007-12-11 23:35:12.000000000 -0600
+Index: linux-2.6.24.7/net/netfilter/Kconfig
+===================================================================
+--- linux-2.6.24.7.orig/net/netfilter/Kconfig
++++ linux-2.6.24.7/net/netfilter/Kconfig

 @@ -633,6 +633,27 @@ config NETFILTER_XT_MATCH_STATE
  
          To compile it as a module, choose M here.  If unsure, say N.
 @@ -633,6 +633,27 @@ config NETFILTER_XT_MATCH_STATE
  
          To compile it as a module, choose M here.  If unsure, say N.


@@ -28,8 +30,10 @@
  config NETFILTER_XT_MATCH_STATISTIC
        tristate '"statistic" match support'
        depends on NETFILTER_XTABLES
  config NETFILTER_XT_MATCH_STATISTIC
        tristate '"statistic" match support'
        depends on NETFILTER_XTABLES

---- linux-2.6.24-rc5/net/netfilter/Makefile    2007-12-11 23:43:21.000000000 -0600
-+++ linux-2.6.24-rc5-layer7/net/netfilter/Makefile     2007-12-11 23:35:12.000000000 -0600
+Index: linux-2.6.24.7/net/netfilter/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/net/netfilter/Makefile
++++ linux-2.6.24.7/net/netfilter/Makefile

 @@ -73,6 +73,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_QUOTA) +
  obj-$(CONFIG_NETFILTER_XT_MATCH_REALM) += xt_realm.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
 @@ -73,6 +73,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_QUOTA) +
  obj-$(CONFIG_NETFILTER_XT_MATCH_REALM) += xt_realm.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o


@@ -38,8 +42,10 @@
  obj-$(CONFIG_NETFILTER_XT_MATCH_STATISTIC) += xt_statistic.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_STATISTIC) += xt_statistic.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o

---- linux-2.6.24-rc5/net/netfilter/xt_layer7.c 1969-12-31 18:00:00.000000000 -0600
-+++ linux-2.6.24-rc5-layer7/net/netfilter/xt_layer7.c  2007-12-11 23:55:46.000000000 -0600
+Index: linux-2.6.24.7/net/netfilter/xt_layer7.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/net/netfilter/xt_layer7.c

 @@ -0,0 +1,634 @@
 +/*
 +  Kernel module to match application layer (OSI layer 7) data in connections.
 @@ -0,0 +1,634 @@
 +/*
 +  Kernel module to match application layer (OSI layer 7) data in connections.


@@ -675,8 +681,10 @@
 +
 +module_init(xt_layer7_init);
 +module_exit(xt_layer7_fini);
 +
 +module_init(xt_layer7_init);
 +module_exit(xt_layer7_fini);

---- linux-2.6.24-rc5/net/netfilter/regexp/regexp.c     1969-12-31 18:00:00.000000000 -0600
-+++ linux-2.6.24-rc5-layer7/net/netfilter/regexp/regexp.c      2007-12-11 23:35:12.000000000 -0600
+Index: linux-2.6.24.7/net/netfilter/regexp/regexp.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/net/netfilter/regexp/regexp.c

 @@ -0,0 +1,1197 @@
 +/*
 + * regcomp and regexec -- regsub and regerror are elsewhere
 @@ -0,0 +1,1197 @@
 +/*
 + * regcomp and regexec -- regsub and regerror are elsewhere


@@ -1875,8 +1883,10 @@
 +#endif
 +
 +
 +#endif
 +
 +

---- linux-2.6.24-rc5/net/netfilter/regexp/regexp.h     1969-12-31 18:00:00.000000000 -0600
-+++ linux-2.6.24-rc5-layer7/net/netfilter/regexp/regexp.h      2007-12-11 23:35:12.000000000 -0600
+Index: linux-2.6.24.7/net/netfilter/regexp/regexp.h
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/net/netfilter/regexp/regexp.h

 @@ -0,0 +1,41 @@
 +/*
 + * Definitions etc. for regexp(3) routines.
 @@ -0,0 +1,41 @@
 +/*
 + * Definitions etc. for regexp(3) routines.


@@ -1919,16 +1929,20 @@
 +void regerror(char *s);
 +
 +#endif
 +void regerror(char *s);
 +
 +#endif

---- linux-2.6.24-rc5/net/netfilter/regexp/regmagic.h   1969-12-31 18:00:00.000000000 -0600
-+++ linux-2.6.24-rc5-layer7/net/netfilter/regexp/regmagic.h    2007-12-11 23:35:12.000000000 -0600
+Index: linux-2.6.24.7/net/netfilter/regexp/regmagic.h
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/net/netfilter/regexp/regmagic.h

 @@ -0,0 +1,5 @@
 +/*
 + * The first byte of the regexp internal "program" is actually this magic
 + * number; the start node begins in the second byte.
 + */
 +#define       MAGIC   0234
 @@ -0,0 +1,5 @@
 +/*
 + * The first byte of the regexp internal "program" is actually this magic
 + * number; the start node begins in the second byte.
 + */
 +#define       MAGIC   0234

---- linux-2.6.24-rc5/net/netfilter/regexp/regsub.c     1969-12-31 18:00:00.000000000 -0600
-+++ linux-2.6.24-rc5-layer7/net/netfilter/regexp/regsub.c      2007-12-11 23:35:12.000000000 -0600
+Index: linux-2.6.24.7/net/netfilter/regexp/regsub.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/net/netfilter/regexp/regsub.c

 @@ -0,0 +1,95 @@
 +/*
 + * regsub
 @@ -0,0 +1,95 @@
 +/*
 + * regsub


@@ -2025,8 +2039,10 @@
 +      }
 +      *dst++ = '\0';
 +}
 +      }
 +      *dst++ = '\0';
 +}

---- linux-2.6.24-rc5/net/netfilter/nf_conntrack_core.c 2007-12-11 23:43:21.000000000 -0600
-+++ linux-2.6.24-rc5-layer7/net/netfilter/nf_conntrack_core.c  2007-12-11 23:35:12.000000000 -0600
+Index: linux-2.6.24.7/net/netfilter/nf_conntrack_core.c
+===================================================================
+--- linux-2.6.24.7.orig/net/netfilter/nf_conntrack_core.c
++++ linux-2.6.24.7/net/netfilter/nf_conntrack_core.c

 @@ -206,6 +206,14 @@ destroy_conntrack(struct nf_conntrack *n
         * too. */
        nf_ct_remove_expectations(ct);
 @@ -206,6 +206,14 @@ destroy_conntrack(struct nf_conntrack *n
         * too. */
        nf_ct_remove_expectations(ct);


@@ -2042,8 +2058,10 @@
        /* We overload first tuple to link into unconfirmed list. */
        if (!nf_ct_is_confirmed(ct)) {
                BUG_ON(hlist_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnode));
        /* We overload first tuple to link into unconfirmed list. */
        if (!nf_ct_is_confirmed(ct)) {
                BUG_ON(hlist_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnode));

---- linux-2.6.24-rc5/net/netfilter/nf_conntrack_standalone.c   2007-12-11 23:43:22.000000000 -0600
-+++ linux-2.6.24-rc5-layer7/net/netfilter/nf_conntrack_standalone.c    2007-12-11 23:35:12.000000000 -0600
+Index: linux-2.6.24.7/net/netfilter/nf_conntrack_standalone.c
+===================================================================
+--- linux-2.6.24.7.orig/net/netfilter/nf_conntrack_standalone.c
++++ linux-2.6.24.7/net/netfilter/nf_conntrack_standalone.c

 @@ -180,7 +180,12 @@ static int ct_seq_show(struct seq_file *
                return -ENOSPC;
  #endif
 @@ -180,7 +180,12 @@ static int ct_seq_show(struct seq_file *
                return -ENOSPC;
  #endif


@@ -2058,8 +2076,10 @@
                return -ENOSPC;
  
        return 0;
                return -ENOSPC;
  
        return 0;

---- linux-2.6.24-rc5/include/net/netfilter/nf_conntrack.h      2007-12-11 23:43:16.000000000 -0600
-+++ linux-2.6.24-rc5-layer7/include/net/netfilter/nf_conntrack.h       2007-12-11 23:35:12.000000000 -0600
+Index: linux-2.6.24.7/include/net/netfilter/nf_conntrack.h
+===================================================================
+--- linux-2.6.24.7.orig/include/net/netfilter/nf_conntrack.h
++++ linux-2.6.24.7/include/net/netfilter/nf_conntrack.h

 @@ -124,6 +124,22 @@ struct nf_conn
        u_int32_t secmark;
  #endif
 @@ -124,6 +124,22 @@ struct nf_conn
        u_int32_t secmark;
  #endif


@@ -2083,8 +2103,10 @@
        /* Storage reserved for other modules: */
        union nf_conntrack_proto proto;
  
        /* Storage reserved for other modules: */
        union nf_conntrack_proto proto;
  

---- linux-2.6.24-rc5/include/linux/netfilter/xt_layer7.h       1969-12-31 18:00:00.000000000 -0600
-+++ linux-2.6.24-rc5-layer7/include/linux/netfilter/xt_layer7.h        2007-12-11 23:35:12.000000000 -0600
+Index: linux-2.6.24.7/include/linux/netfilter/xt_layer7.h
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/include/linux/netfilter/xt_layer7.h

 @@ -0,0 +1,13 @@
 +#ifndef _XT_LAYER7_H
 +#define _XT_LAYER7_H
 @@ -0,0 +1,13 @@
 +#ifndef _XT_LAYER7_H
 +#define _XT_LAYER7_H

diff --git a/target/linux/generic-2.6/patches-2.6.24/101-netfilter_layer7_pktmatch.patch b/target/linux/generic-2.6/patches-2.6.24/101-netfilter_layer7_pktmatch.patch
index 9605e4f..fd59355 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/101-netfilter_layer7_pktmatch.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/101-netfilter_layer7_pktmatch.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.24/include/linux/netfilter/xt_layer7.h
+Index: linux-2.6.24.7/include/linux/netfilter/xt_layer7.h

 ===================================================================
 ===================================================================

---- linux-2.6.24.orig/include/linux/netfilter/xt_layer7.h
-+++ linux-2.6.24/include/linux/netfilter/xt_layer7.h
+--- linux-2.6.24.7.orig/include/linux/netfilter/xt_layer7.h
++++ linux-2.6.24.7/include/linux/netfilter/xt_layer7.h

 @@ -8,6 +8,7 @@ struct xt_layer7_info {
      char protocol[MAX_PROTOCOL_LEN];
      char pattern[MAX_PATTERN_LEN];
 @@ -8,6 +8,7 @@ struct xt_layer7_info {
      char protocol[MAX_PROTOCOL_LEN];
      char pattern[MAX_PATTERN_LEN];


@@ -10,10 +10,10 @@ Index: linux-2.6.24/include/linux/netfilter/xt_layer7.h
  };
  
  #endif /* _XT_LAYER7_H */
  };
  
  #endif /* _XT_LAYER7_H */

-Index: linux-2.6.24/net/netfilter/xt_layer7.c
+Index: linux-2.6.24.7/net/netfilter/xt_layer7.c

 ===================================================================
 ===================================================================

---- linux-2.6.24.orig/net/netfilter/xt_layer7.c
-+++ linux-2.6.24/net/netfilter/xt_layer7.c
+--- linux-2.6.24.7.orig/net/netfilter/xt_layer7.c
++++ linux-2.6.24.7/net/netfilter/xt_layer7.c

 @@ -297,34 +297,36 @@ static int match_no_append(struct nf_con
  }
  
 @@ -297,34 +297,36 @@ static int match_no_append(struct nf_con
  }
  

diff --git a/target/linux/generic-2.6/patches-2.6.24/110-ipp2p_0.8.1rc1.patch b/target/linux/generic-2.6/patches-2.6.24/110-ipp2p_0.8.1rc1.patch
index b86d494..9b603da 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/110-ipp2p_0.8.1rc1.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/110-ipp2p_0.8.1rc1.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.23.1/include/linux/netfilter_ipv4/ipt_ipp2p.h
+Index: linux-2.6.24.7/include/linux/netfilter_ipv4/ipt_ipp2p.h

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23.1/include/linux/netfilter_ipv4/ipt_ipp2p.h    2007-11-19 18:22:19.000000000 -0600
+--- /dev/null
++++ linux-2.6.24.7/include/linux/netfilter_ipv4/ipt_ipp2p.h

 @@ -0,0 +1,31 @@
 +#ifndef __IPT_IPP2P_H
 +#define __IPT_IPP2P_H
 @@ -0,0 +1,31 @@
 +#ifndef __IPT_IPP2P_H
 +#define __IPT_IPP2P_H


@@ -34,10 +34,10 @@ Index: linux-2.6.23.1/include/linux/netfilter_ipv4/ipt_ipp2p.h
 +#define IPP2P_MUTE            (1 << 14)
 +#define IPP2P_WASTE           (1 << 15)
 +#define IPP2P_XDCC            (1 << 16)
 +#define IPP2P_MUTE            (1 << 14)
 +#define IPP2P_WASTE           (1 << 15)
 +#define IPP2P_XDCC            (1 << 16)

-Index: linux-2.6.23.1/net/ipv4/netfilter/ipt_ipp2p.c
+Index: linux-2.6.24.7/net/ipv4/netfilter/ipt_ipp2p.c

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23.1/net/ipv4/netfilter/ipt_ipp2p.c      2007-11-19 18:22:19.000000000 -0600
+--- /dev/null
++++ linux-2.6.24.7/net/ipv4/netfilter/ipt_ipp2p.c

 @@ -0,0 +1,856 @@
 +#if defined(MODVERSIONS)
 +#include <linux/modversions.h>
 @@ -0,0 +1,856 @@
 +#if defined(MODVERSIONS)
 +#include <linux/modversions.h>


@@ -895,11 +895,11 @@ Index: linux-2.6.23.1/net/ipv4/netfilter/ipt_ipp2p.c
 +module_exit(fini);
 +
 +
 +module_exit(fini);
 +
 +

-Index: linux-2.6.23.1/net/ipv4/netfilter/Kconfig
+Index: linux-2.6.24.7/net/ipv4/netfilter/Kconfig

 ===================================================================
 ===================================================================

---- linux-2.6.23.1.orig/net/ipv4/netfilter/Kconfig     2007-11-19 18:21:55.000000000 -0600
-+++ linux-2.6.23.1/net/ipv4/netfilter/Kconfig  2007-11-19 18:22:19.000000000 -0600
-@@ -63,6 +63,12 @@
+--- linux-2.6.24.7.orig/net/ipv4/netfilter/Kconfig
++++ linux-2.6.24.7/net/ipv4/netfilter/Kconfig
+@@ -63,6 +63,12 @@ config IP_NF_MATCH_IPRANGE

  
          To compile it as a module, choose M here.  If unsure, say N.
  
  
          To compile it as a module, choose M here.  If unsure, say N.
  


@@ -912,16 +912,16 @@ Index: linux-2.6.23.1/net/ipv4/netfilter/Kconfig
  config IP_NF_MATCH_TOS
        tristate "TOS match support"
        depends on IP_NF_IPTABLES
  config IP_NF_MATCH_TOS
        tristate "TOS match support"
        depends on IP_NF_IPTABLES

-Index: linux-2.6.23.1/net/ipv4/netfilter/Makefile
+Index: linux-2.6.24.7/net/ipv4/netfilter/Makefile

 ===================================================================
 ===================================================================

---- linux-2.6.23.1.orig/net/ipv4/netfilter/Makefile    2007-11-19 18:21:55.000000000 -0600
-+++ linux-2.6.23.1/net/ipv4/netfilter/Makefile 2007-11-19 18:23:45.000000000 -0600
-@@ -50,6 +50,8 @@
+--- linux-2.6.24.7.orig/net/ipv4/netfilter/Makefile
++++ linux-2.6.24.7/net/ipv4/netfilter/Makefile
+@@ -50,6 +50,8 @@ obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_
+ obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o

  obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
  obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o

- obj-$(CONFIG_IP_NF_MATCH_ADDRTYPE) += ipt_addrtype.o

  
 +obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o
 +
  # targets
  
 +obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o
 +
  # targets

- obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
- obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TOS.o
+ obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o
+ obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o

diff --git a/target/linux/generic-2.6/patches-2.6.24/130-netfilter_ipset.patch b/target/linux/generic-2.6/patches-2.6.24/130-netfilter_ipset.patch
index 1828d89..90155d1 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/130-netfilter_ipset.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/130-netfilter_ipset.patch
@@ -1,6 +1,7 @@
-diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set.h
---- linux-2.6.23/include/linux/netfilter_ipv4/ip_set.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set.h   2007-10-12 11:52:37.000000000 +0200
+Index: linux-2.6.24.7/include/linux/netfilter_ipv4/ip_set.h
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/include/linux/netfilter_ipv4/ip_set.h

 @@ -0,0 +1,498 @@
 +#ifndef _IP_SET_H
 +#define _IP_SET_H
 @@ -0,0 +1,498 @@
 +#ifndef _IP_SET_H
 +#define _IP_SET_H


@@ -500,9 +501,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set.h linux-2.6.23.pom2pa
 +#endif                                /* __KERNEL__ */
 +
 +#endif /*_IP_SET_H*/
 +#endif                                /* __KERNEL__ */
 +
 +#endif /*_IP_SET_H*/

-diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_iphash.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_iphash.h
---- linux-2.6.23/include/linux/netfilter_ipv4/ip_set_iphash.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_iphash.h    2007-10-12 11:52:37.000000000 +0200
+Index: linux-2.6.24.7/include/linux/netfilter_ipv4/ip_set_iphash.h
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/include/linux/netfilter_ipv4/ip_set_iphash.h

 @@ -0,0 +1,30 @@
 +#ifndef __IP_SET_IPHASH_H
 +#define __IP_SET_IPHASH_H
 @@ -0,0 +1,30 @@
 +#ifndef __IP_SET_IPHASH_H
 +#define __IP_SET_IPHASH_H


@@ -534,9 +536,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_iphash.h linux-2.6.23
 +};
 +
 +#endif        /* __IP_SET_IPHASH_H */
 +};
 +
 +#endif        /* __IP_SET_IPHASH_H */

-diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_ipmap.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_ipmap.h
---- linux-2.6.23/include/linux/netfilter_ipv4/ip_set_ipmap.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_ipmap.h     2007-10-12 11:52:37.000000000 +0200
+Index: linux-2.6.24.7/include/linux/netfilter_ipv4/ip_set_ipmap.h
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/include/linux/netfilter_ipv4/ip_set_ipmap.h

 @@ -0,0 +1,56 @@
 +#ifndef __IP_SET_IPMAP_H
 +#define __IP_SET_IPMAP_H
 @@ -0,0 +1,56 @@
 +#ifndef __IP_SET_IPMAP_H
 +#define __IP_SET_IPMAP_H


@@ -594,9 +597,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_ipmap.h linux-2.6.23.
 +}
 +      
 +#endif /* __IP_SET_IPMAP_H */
 +}
 +      
 +#endif /* __IP_SET_IPMAP_H */

-diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_ipporthash.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_ipporthash.h
---- linux-2.6.23/include/linux/netfilter_ipv4/ip_set_ipporthash.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_ipporthash.h        2007-10-12 11:52:37.000000000 +0200
+Index: linux-2.6.24.7/include/linux/netfilter_ipv4/ip_set_ipporthash.h
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/include/linux/netfilter_ipv4/ip_set_ipporthash.h

 @@ -0,0 +1,34 @@
 +#ifndef __IP_SET_IPPORTHASH_H
 +#define __IP_SET_IPPORTHASH_H
 @@ -0,0 +1,34 @@
 +#ifndef __IP_SET_IPPORTHASH_H
 +#define __IP_SET_IPPORTHASH_H


@@ -632,9 +636,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_ipporthash.h linux-2.
 +};
 +
 +#endif        /* __IP_SET_IPPORTHASH_H */
 +};
 +
 +#endif        /* __IP_SET_IPPORTHASH_H */

-diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_iptree.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_iptree.h
---- linux-2.6.23/include/linux/netfilter_ipv4/ip_set_iptree.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_iptree.h    2007-10-12 11:52:37.000000000 +0200
+Index: linux-2.6.24.7/include/linux/netfilter_ipv4/ip_set_iptree.h
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/include/linux/netfilter_ipv4/ip_set_iptree.h

 @@ -0,0 +1,40 @@
 +#ifndef __IP_SET_IPTREE_H
 +#define __IP_SET_IPTREE_H
 @@ -0,0 +1,40 @@
 +#ifndef __IP_SET_IPTREE_H
 +#define __IP_SET_IPTREE_H


@@ -676,9 +681,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_iptree.h linux-2.6.23
 +};
 +
 +#endif        /* __IP_SET_IPTREE_H */
 +};
 +
 +#endif        /* __IP_SET_IPTREE_H */

-diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_iptreemap.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_iptreemap.h
---- linux-2.6.23/include/linux/netfilter_ipv4/ip_set_iptreemap.h       1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_iptreemap.h 2007-10-12 11:52:37.000000000 +0200
+Index: linux-2.6.24.7/include/linux/netfilter_ipv4/ip_set_iptreemap.h
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/include/linux/netfilter_ipv4/ip_set_iptreemap.h

 @@ -0,0 +1,40 @@
 +#ifndef __IP_SET_IPTREEMAP_H
 +#define __IP_SET_IPTREEMAP_H
 @@ -0,0 +1,40 @@
 +#ifndef __IP_SET_IPTREEMAP_H
 +#define __IP_SET_IPTREEMAP_H


@@ -720,9 +726,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_iptreemap.h linux-2.6
 +};
 +
 +#endif /* __IP_SET_IPTREEMAP_H */
 +};
 +
 +#endif /* __IP_SET_IPTREEMAP_H */

-diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_jhash.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_jhash.h
---- linux-2.6.23/include/linux/netfilter_ipv4/ip_set_jhash.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_jhash.h     2007-10-12 11:52:37.000000000 +0200
+Index: linux-2.6.24.7/include/linux/netfilter_ipv4/ip_set_jhash.h
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/include/linux/netfilter_ipv4/ip_set_jhash.h

 @@ -0,0 +1,148 @@
 +#ifndef _LINUX_IPSET_JHASH_H
 +#define _LINUX_IPSET_JHASH_H
 @@ -0,0 +1,148 @@
 +#ifndef _LINUX_IPSET_JHASH_H
 +#define _LINUX_IPSET_JHASH_H


@@ -872,9 +879,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_jhash.h linux-2.6.23.
 +}
 +
 +#endif /* _LINUX_IPSET_JHASH_H */
 +}
 +
 +#endif /* _LINUX_IPSET_JHASH_H */

-diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_macipmap.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_macipmap.h
---- linux-2.6.23/include/linux/netfilter_ipv4/ip_set_macipmap.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_macipmap.h  2007-10-12 11:52:37.000000000 +0200
+Index: linux-2.6.24.7/include/linux/netfilter_ipv4/ip_set_macipmap.h
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/include/linux/netfilter_ipv4/ip_set_macipmap.h

 @@ -0,0 +1,38 @@
 +#ifndef __IP_SET_MACIPMAP_H
 +#define __IP_SET_MACIPMAP_H
 @@ -0,0 +1,38 @@
 +#ifndef __IP_SET_MACIPMAP_H
 +#define __IP_SET_MACIPMAP_H


@@ -914,9 +922,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_macipmap.h linux-2.6.
 +};
 +
 +#endif        /* __IP_SET_MACIPMAP_H */
 +};
 +
 +#endif        /* __IP_SET_MACIPMAP_H */

-diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_malloc.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_malloc.h
---- linux-2.6.23/include/linux/netfilter_ipv4/ip_set_malloc.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_malloc.h    2007-10-12 11:52:37.000000000 +0200
+Index: linux-2.6.24.7/include/linux/netfilter_ipv4/ip_set_malloc.h
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/include/linux/netfilter_ipv4/ip_set_malloc.h

 @@ -0,0 +1,116 @@
 +#ifndef _IP_SET_MALLOC_H
 +#define _IP_SET_MALLOC_H
 @@ -0,0 +1,116 @@
 +#ifndef _IP_SET_MALLOC_H
 +#define _IP_SET_MALLOC_H


@@ -1034,9 +1043,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_malloc.h linux-2.6.23
 +#endif                                /* __KERNEL__ */
 +
 +#endif /*_IP_SET_MALLOC_H*/
 +#endif                                /* __KERNEL__ */
 +
 +#endif /*_IP_SET_MALLOC_H*/

-diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_nethash.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_nethash.h
---- linux-2.6.23/include/linux/netfilter_ipv4/ip_set_nethash.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_nethash.h   2007-10-12 11:52:37.000000000 +0200
+Index: linux-2.6.24.7/include/linux/netfilter_ipv4/ip_set_nethash.h
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/include/linux/netfilter_ipv4/ip_set_nethash.h

 @@ -0,0 +1,55 @@
 +#ifndef __IP_SET_NETHASH_H
 +#define __IP_SET_NETHASH_H
 @@ -0,0 +1,55 @@
 +#ifndef __IP_SET_NETHASH_H
 +#define __IP_SET_NETHASH_H


@@ -1093,9 +1103,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_nethash.h linux-2.6.2
 +}
 +
 +#endif        /* __IP_SET_NETHASH_H */
 +}
 +
 +#endif        /* __IP_SET_NETHASH_H */

-diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_portmap.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_portmap.h
---- linux-2.6.23/include/linux/netfilter_ipv4/ip_set_portmap.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ip_set_portmap.h   2007-10-12 11:52:37.000000000 +0200
+Index: linux-2.6.24.7/include/linux/netfilter_ipv4/ip_set_portmap.h
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/include/linux/netfilter_ipv4/ip_set_portmap.h

 @@ -0,0 +1,25 @@
 +#ifndef __IP_SET_PORTMAP_H
 +#define __IP_SET_PORTMAP_H
 @@ -0,0 +1,25 @@
 +#ifndef __IP_SET_PORTMAP_H
 +#define __IP_SET_PORTMAP_H


@@ -1122,9 +1133,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ip_set_portmap.h linux-2.6.2
 +};
 +
 +#endif /* __IP_SET_PORTMAP_H */
 +};
 +
 +#endif /* __IP_SET_PORTMAP_H */

-diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ipt_set.h linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ipt_set.h
---- linux-2.6.23/include/linux/netfilter_ipv4/ipt_set.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.pom2patch.set/include/linux/netfilter_ipv4/ipt_set.h  2007-10-12 11:52:37.000000000 +0200
+Index: linux-2.6.24.7/include/linux/netfilter_ipv4/ipt_set.h
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/include/linux/netfilter_ipv4/ipt_set.h

 @@ -0,0 +1,21 @@
 +#ifndef _IPT_SET_H
 +#define _IPT_SET_H
 @@ -0,0 +1,21 @@
 +#ifndef _IPT_SET_H
 +#define _IPT_SET_H


@@ -1147,9 +1159,10 @@ diff -Nru linux-2.6.23/include/linux/netfilter_ipv4/ipt_set.h linux-2.6.23.pom2p
 +};
 +
 +#endif /*_IPT_SET_H*/
 +};
 +
 +#endif /*_IPT_SET_H*/

-diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set.c
---- linux-2.6.23/net/ipv4/netfilter/ip_set.c   1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set.c     2007-10-12 11:52:37.000000000 +0200
+Index: linux-2.6.24.7/net/ipv4/netfilter/ip_set.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/net/ipv4/netfilter/ip_set.c

 @@ -0,0 +1,2003 @@
 +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
 + *                         Patrick Schaaf <bof@bof.de>
 @@ -0,0 +1,2003 @@
 +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
 + *                         Patrick Schaaf <bof@bof.de>


@@ -3154,9 +3167,10 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set.c linux-2.6.23.pom2patch.set/ne
 +
 +module_init(ip_set_init);
 +module_exit(ip_set_fini);
 +
 +module_init(ip_set_init);
 +module_exit(ip_set_fini);

-diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_iphash.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_iphash.c
---- linux-2.6.23/net/ipv4/netfilter/ip_set_iphash.c    1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_iphash.c      2007-10-12 11:52:37.000000000 +0200
+Index: linux-2.6.24.7/net/ipv4/netfilter/ip_set_iphash.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/net/ipv4/netfilter/ip_set_iphash.c

 @@ -0,0 +1,429 @@
 +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 + *
 @@ -0,0 +1,429 @@
 +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 + *


@@ -3587,9 +3601,10 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_iphash.c linux-2.6.23.pom2patch
 +
 +module_init(ip_set_iphash_init);
 +module_exit(ip_set_iphash_fini);
 +
 +module_init(ip_set_iphash_init);
 +module_exit(ip_set_iphash_fini);

-diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_ipmap.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_ipmap.c
---- linux-2.6.23/net/ipv4/netfilter/ip_set_ipmap.c     1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_ipmap.c       2007-10-12 11:52:37.000000000 +0200
+Index: linux-2.6.24.7/net/ipv4/netfilter/ip_set_ipmap.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/net/ipv4/netfilter/ip_set_ipmap.c

 @@ -0,0 +1,336 @@
 +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
 + *                         Patrick Schaaf <bof@bof.de>
 @@ -0,0 +1,336 @@
 +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
 + *                         Patrick Schaaf <bof@bof.de>


@@ -3927,9 +3942,10 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_ipmap.c linux-2.6.23.pom2patch.
 +
 +module_init(ip_set_ipmap_init);
 +module_exit(ip_set_ipmap_fini);
 +
 +module_init(ip_set_ipmap_init);
 +module_exit(ip_set_ipmap_fini);

-diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_ipporthash.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_ipporthash.c
---- linux-2.6.23/net/ipv4/netfilter/ip_set_ipporthash.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_ipporthash.c  2007-10-12 11:52:37.000000000 +0200
+Index: linux-2.6.24.7/net/ipv4/netfilter/ip_set_ipporthash.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/net/ipv4/netfilter/ip_set_ipporthash.c

 @@ -0,0 +1,581 @@
 +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 + *
 @@ -0,0 +1,581 @@
 +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 + *


@@ -4512,9 +4528,10 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_ipporthash.c linux-2.6.23.pom2p
 +
 +module_init(ip_set_ipporthash_init);
 +module_exit(ip_set_ipporthash_fini);
 +
 +module_init(ip_set_ipporthash_init);
 +module_exit(ip_set_ipporthash_fini);

-diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_iptree.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_iptree.c
---- linux-2.6.23/net/ipv4/netfilter/ip_set_iptree.c    1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_iptree.c      2007-10-12 11:52:37.000000000 +0200
+Index: linux-2.6.24.7/net/ipv4/netfilter/ip_set_iptree.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/net/ipv4/netfilter/ip_set_iptree.c

 @@ -0,0 +1,612 @@
 +/* Copyright (C) 2005 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 + *
 @@ -0,0 +1,612 @@
 +/* Copyright (C) 2005 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 + *


@@ -5128,9 +5145,10 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_iptree.c linux-2.6.23.pom2patch
 +
 +module_init(ip_set_iptree_init);
 +module_exit(ip_set_iptree_fini);
 +
 +module_init(ip_set_iptree_init);
 +module_exit(ip_set_iptree_fini);

-diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_iptreemap.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_iptreemap.c
---- linux-2.6.23/net/ipv4/netfilter/ip_set_iptreemap.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_iptreemap.c   2007-10-12 11:52:37.000000000 +0200
+Index: linux-2.6.24.7/net/ipv4/netfilter/ip_set_iptreemap.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/net/ipv4/netfilter/ip_set_iptreemap.c

 @@ -0,0 +1,829 @@
 +/* Copyright (C) 2007 Sven Wegener <sven.wegener@stealer.net>
 + *
 @@ -0,0 +1,829 @@
 +/* Copyright (C) 2007 Sven Wegener <sven.wegener@stealer.net>
 + *


@@ -5961,9 +5979,10 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_iptreemap.c linux-2.6.23.pom2pa
 +
 +module_init(ip_set_iptreemap_init);
 +module_exit(ip_set_iptreemap_fini);
 +
 +module_init(ip_set_iptreemap_init);
 +module_exit(ip_set_iptreemap_fini);

-diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_macipmap.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_macipmap.c
---- linux-2.6.23/net/ipv4/netfilter/ip_set_macipmap.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_macipmap.c    2007-10-12 11:52:37.000000000 +0200
+Index: linux-2.6.24.7/net/ipv4/netfilter/ip_set_macipmap.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/net/ipv4/netfilter/ip_set_macipmap.c

 @@ -0,0 +1,375 @@
 +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
 + *                         Patrick Schaaf <bof@bof.de>
 @@ -0,0 +1,375 @@
 +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
 + *                         Patrick Schaaf <bof@bof.de>


@@ -6340,9 +6359,10 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_macipmap.c linux-2.6.23.pom2pat
 +
 +module_init(ip_set_macipmap_init);
 +module_exit(ip_set_macipmap_fini);
 +
 +module_init(ip_set_macipmap_init);
 +module_exit(ip_set_macipmap_fini);

-diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_nethash.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_nethash.c
---- linux-2.6.23/net/ipv4/netfilter/ip_set_nethash.c   1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_nethash.c     2007-10-12 11:52:37.000000000 +0200
+Index: linux-2.6.24.7/net/ipv4/netfilter/ip_set_nethash.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/net/ipv4/netfilter/ip_set_nethash.c

 @@ -0,0 +1,497 @@
 +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 + *
 @@ -0,0 +1,497 @@
 +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 + *


@@ -6841,9 +6861,10 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_nethash.c linux-2.6.23.pom2patc
 +
 +module_init(ip_set_nethash_init);
 +module_exit(ip_set_nethash_fini);
 +
 +module_init(ip_set_nethash_init);
 +module_exit(ip_set_nethash_fini);

-diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_portmap.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_portmap.c
---- linux-2.6.23/net/ipv4/netfilter/ip_set_portmap.c   1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ip_set_portmap.c     2007-10-12 11:52:37.000000000 +0200
+Index: linux-2.6.24.7/net/ipv4/netfilter/ip_set_portmap.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/net/ipv4/netfilter/ip_set_portmap.c

 @@ -0,0 +1,346 @@
 +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 + *
 @@ -0,0 +1,346 @@
 +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 + *


@@ -7191,9 +7212,10 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ip_set_portmap.c linux-2.6.23.pom2patc
 +
 +module_init(ip_set_portmap_init);
 +module_exit(ip_set_portmap_fini);
 +
 +module_init(ip_set_portmap_init);
 +module_exit(ip_set_portmap_fini);

-diff -Nru linux-2.6.23/net/ipv4/netfilter/ipt_set.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ipt_set.c
---- linux-2.6.23/net/ipv4/netfilter/ipt_set.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ipt_set.c    2007-10-12 11:52:38.000000000 +0200
+Index: linux-2.6.24.7/net/ipv4/netfilter/ipt_set.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/net/ipv4/netfilter/ipt_set.c

 @@ -0,0 +1,160 @@
 +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
 + *                         Patrick Schaaf <bof@bof.de>
 @@ -0,0 +1,160 @@
 +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
 + *                         Patrick Schaaf <bof@bof.de>


@@ -7355,9 +7377,10 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ipt_set.c linux-2.6.23.pom2patch.set/n
 +
 +module_init(ipt_ipset_init);
 +module_exit(ipt_ipset_fini);
 +
 +module_init(ipt_ipset_init);
 +module_exit(ipt_ipset_fini);

-diff -Nru linux-2.6.23/net/ipv4/netfilter/ipt_SET.c linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ipt_SET.c
---- linux-2.6.23/net/ipv4/netfilter/ipt_SET.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/ipt_SET.c    2007-10-12 11:52:37.000000000 +0200
+Index: linux-2.6.24.7/net/ipv4/netfilter/ipt_SET.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/net/ipv4/netfilter/ipt_SET.c

 @@ -0,0 +1,179 @@
 +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
 + *                         Patrick Schaaf <bof@bof.de>
 @@ -0,0 +1,179 @@
 +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
 + *                         Patrick Schaaf <bof@bof.de>


@@ -7538,10 +7561,11 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/ipt_SET.c linux-2.6.23.pom2patch.set/n
 +
 +module_init(ipt_SET_init);
 +module_exit(ipt_SET_fini);
 +
 +module_init(ipt_SET_init);
 +module_exit(ipt_SET_fini);

-diff -Nru linux-2.6.23/net/ipv4/netfilter/Kconfig linux-2.6.23.pom2patch.set/net/ipv4/netfilter/Kconfig
---- linux-2.6.23/net/ipv4/netfilter/Kconfig    2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/Kconfig      2007-10-12 11:52:38.000000000 +0200
-@@ -402,5 +402,122 @@
+Index: linux-2.6.24.7/net/ipv4/netfilter/Kconfig
+===================================================================
+--- linux-2.6.24.7.orig/net/ipv4/netfilter/Kconfig
++++ linux-2.6.24.7/net/ipv4/netfilter/Kconfig
+@@ -408,5 +408,122 @@ config IP_NF_ARP_MANGLE

          Allows altering the ARP packet payload: source and destination
          hardware and network addresses.
  
          Allows altering the ARP packet payload: source and destination
          hardware and network addresses.
  


@@ -7664,10 +7688,11 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/Kconfig linux-2.6.23.pom2patch.set/net
 +
  endmenu
  
 +
  endmenu
  

-diff -Nru linux-2.6.23/net/ipv4/netfilter/Makefile linux-2.6.23.pom2patch.set/net/ipv4/netfilter/Makefile
---- linux-2.6.23/net/ipv4/netfilter/Makefile   2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6.23.pom2patch.set/net/ipv4/netfilter/Makefile     2007-10-12 11:52:38.000000000 +0200
-@@ -49,6 +49,7 @@
+Index: linux-2.6.24.7/net/ipv4/netfilter/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/net/ipv4/netfilter/Makefile
++++ linux-2.6.24.7/net/ipv4/netfilter/Makefile
+@@ -49,6 +49,7 @@ obj-$(CONFIG_IP_NF_MATCH_OWNER) += ipt_o

  obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
  obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o
  obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
  obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
  obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o
  obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o


@@ -7675,7 +7700,7 @@ diff -Nru linux-2.6.23/net/ipv4/netfilter/Makefile linux-2.6.23.pom2patch.set/ne
  
  obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o
  
  
  obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o
  

-@@ -64,6 +65,18 @@
+@@ -64,6 +65,18 @@ obj-$(CONFIG_IP_NF_TARGET_SAME) += ipt_S

  obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TOS.o
  obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o
  obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o
  obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TOS.o
  obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o
  obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o

diff --git a/target/linux/generic-2.6/patches-2.6.24/140-netfilter_time.patch b/target/linux/generic-2.6/patches-2.6.24/140-netfilter_time.patch
index a77f04c..0f8d4cd 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/140-netfilter_time.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/140-netfilter_time.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.23-rc6/include/linux/netfilter_ipv4/ipt_time.h
+Index: linux-2.6.24.7/include/linux/netfilter_ipv4/ipt_time.h

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23-rc6/include/linux/netfilter_ipv4/ipt_time.h   2007-09-21 16:24:02.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/include/linux/netfilter_ipv4/ipt_time.h

 @@ -0,0 +1,18 @@
 +#ifndef __ipt_time_h_included__
 +#define __ipt_time_h_included__
 @@ -0,0 +1,18 @@
 +#ifndef __ipt_time_h_included__
 +#define __ipt_time_h_included__


@@ -21,10 +21,10 @@ Index: linux-2.6.23-rc6/include/linux/netfilter_ipv4/ipt_time.h
 +
 +
 +#endif /* __ipt_time_h_included__ */
 +
 +
 +#endif /* __ipt_time_h_included__ */

-Index: linux-2.6.23-rc6/net/ipv4/netfilter/ipt_time.c
+Index: linux-2.6.24.7/net/ipv4/netfilter/ipt_time.c

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23-rc6/net/ipv4/netfilter/ipt_time.c     2007-09-21 16:24:02.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/net/ipv4/netfilter/ipt_time.c

 @@ -0,0 +1,180 @@
 +/*
 +  This is a module which is used for time matching
 @@ -0,0 +1,180 @@
 +/*
 +  This is a module which is used for time matching


@@ -206,11 +206,11 @@ Index: linux-2.6.23-rc6/net/ipv4/netfilter/ipt_time.c
 +      r->tm_mon=i;
 +      r->tm_mday=work-__spm[i]+1;
 +}
 +      r->tm_mon=i;
 +      r->tm_mday=work-__spm[i]+1;
 +}

-Index: linux-2.6.23-rc6/net/ipv4/netfilter/Kconfig
+Index: linux-2.6.24.7/net/ipv4/netfilter/Kconfig

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/net/ipv4/netfilter/Kconfig   2007-09-21 16:24:01.000000000 +0800
-+++ linux-2.6.23-rc6/net/ipv4/netfilter/Kconfig        2007-09-21 16:24:02.000000000 +0800
-@@ -96,6 +96,22 @@
+--- linux-2.6.24.7.orig/net/ipv4/netfilter/Kconfig
++++ linux-2.6.24.7/net/ipv4/netfilter/Kconfig
+@@ -78,6 +78,22 @@ config IP_NF_MATCH_TOS

  
          To compile it as a module, choose M here.  If unsure, say N.
  
  
          To compile it as a module, choose M here.  If unsure, say N.
  


@@ -233,11 +233,11 @@ Index: linux-2.6.23-rc6/net/ipv4/netfilter/Kconfig
  config IP_NF_MATCH_RECENT
        tristate "recent match support"
        depends on IP_NF_IPTABLES
  config IP_NF_MATCH_RECENT
        tristate "recent match support"
        depends on IP_NF_IPTABLES

-Index: linux-2.6.23-rc6/net/ipv4/netfilter/Makefile
+Index: linux-2.6.24.7/net/ipv4/netfilter/Makefile

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/net/ipv4/netfilter/Makefile  2007-09-21 16:24:01.000000000 +0800
-+++ linux-2.6.23-rc6/net/ipv4/netfilter/Makefile       2007-09-21 16:24:02.000000000 +0800
-@@ -50,6 +50,7 @@
+--- linux-2.6.24.7.orig/net/ipv4/netfilter/Makefile
++++ linux-2.6.24.7/net/ipv4/netfilter/Makefile
+@@ -50,6 +50,7 @@ obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_

  obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o
  obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
  obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o
  obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o
  obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
  obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o

diff --git a/target/linux/generic-2.6/patches-2.6.24/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.24/150-netfilter_imq.patch
index 4740eaf..f4b00b1 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/150-netfilter_imq.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/150-netfilter_imq.patch
@@ -1,6 +1,7 @@
-diff -Naurw 2.6.24/drivers/net/imq.c 2.6.24.imq/drivers/net/imq.c
---- 2.6.24/drivers/net/imq.c   1969-12-31 21:00:00.000000000 -0300
-+++ 2.6.24.imq/drivers/net/imq.c       2008-01-26 14:52:43.000000000 -0300
+Index: linux-2.6.24.7/drivers/net/imq.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/drivers/net/imq.c

 @@ -0,0 +1,409 @@
 +/*
 + *             Pseudo-driver for the intermediate queue device.
 @@ -0,0 +1,409 @@
 +/*
 + *             Pseudo-driver for the intermediate queue device.


@@ -411,10 +412,11 @@ diff -Naurw 2.6.24/drivers/net/imq.c 2.6.24.imq/drivers/net/imq.c
 +MODULE_AUTHOR("http://www.linuximq.net");
 +MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("http://www.linuximq.net");
 +MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
 +MODULE_LICENSE("GPL");

-diff -Naurw 2.6.24/drivers/net/Kconfig 2.6.24.imq/drivers/net/Kconfig
---- 2.6.24/drivers/net/Kconfig 2008-01-24 19:58:37.000000000 -0300
-+++ 2.6.24.imq/drivers/net/Kconfig     2008-01-26 15:00:11.000000000 -0300
-@@ -112,6 +112,129 @@
+Index: linux-2.6.24.7/drivers/net/Kconfig
+===================================================================
+--- linux-2.6.24.7.orig/drivers/net/Kconfig
++++ linux-2.6.24.7/drivers/net/Kconfig
+@@ -112,6 +112,129 @@ config EQUALIZER

          To compile this driver as a module, choose M here: the module
          will be called eql.  If unsure, say N.
  
          To compile this driver as a module, choose M here: the module
          will be called eql.  If unsure, say N.
  


@@ -544,10 +546,11 @@ diff -Naurw 2.6.24/drivers/net/Kconfig 2.6.24.imq/drivers/net/Kconfig
  config TUN
        tristate "Universal TUN/TAP device driver support"
        select CRC32
  config TUN
        tristate "Universal TUN/TAP device driver support"
        select CRC32

-diff -Naurw 2.6.24/drivers/net/Makefile 2.6.24.imq/drivers/net/Makefile
---- 2.6.24/drivers/net/Makefile        2008-01-24 19:58:37.000000000 -0300
-+++ 2.6.24.imq/drivers/net/Makefile    2008-01-26 15:00:11.000000000 -0300
-@@ -139,6 +139,7 @@
+Index: linux-2.6.24.7/drivers/net/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/drivers/net/Makefile
++++ linux-2.6.24.7/drivers/net/Makefile
+@@ -139,6 +139,7 @@ obj-$(CONFIG_SLHC) += slhc.o

  obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
  
  obj-$(CONFIG_DUMMY) += dummy.o
  obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
  
  obj-$(CONFIG_DUMMY) += dummy.o


@@ -555,9 +558,10 @@ diff -Naurw 2.6.24/drivers/net/Makefile 2.6.24.imq/drivers/net/Makefile
  obj-$(CONFIG_IFB) += ifb.o
  obj-$(CONFIG_MACVLAN) += macvlan.o
  obj-$(CONFIG_DE600) += de600.o
  obj-$(CONFIG_IFB) += ifb.o
  obj-$(CONFIG_MACVLAN) += macvlan.o
  obj-$(CONFIG_DE600) += de600.o

-diff -Naurw 2.6.24/include/linux/imq.h 2.6.24.imq/include/linux/imq.h
---- 2.6.24/include/linux/imq.h 1969-12-31 21:00:00.000000000 -0300
-+++ 2.6.24.imq/include/linux/imq.h     2008-01-26 15:00:11.000000000 -0300
+Index: linux-2.6.24.7/include/linux/imq.h
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/include/linux/imq.h

 @@ -0,0 +1,9 @@
 +#ifndef _IMQ_H
 +#define _IMQ_H
 @@ -0,0 +1,9 @@
 +#ifndef _IMQ_H
 +#define _IMQ_H


@@ -568,9 +572,10 @@ diff -Naurw 2.6.24/include/linux/imq.h 2.6.24.imq/include/linux/imq.h
 +#define IMQ_F_ENQUEUE  0x80
 +
 +#endif /* _IMQ_H */
 +#define IMQ_F_ENQUEUE  0x80
 +
 +#endif /* _IMQ_H */

-diff -Naurw 2.6.24/include/linux/netfilter_ipv4/ipt_IMQ.h 2.6.24.imq/include/linux/netfilter_ipv4/ipt_IMQ.h
---- 2.6.24/include/linux/netfilter_ipv4/ipt_IMQ.h      1969-12-31 21:00:00.000000000 -0300
-+++ 2.6.24.imq/include/linux/netfilter_ipv4/ipt_IMQ.h  2008-01-26 15:00:11.000000000 -0300
+Index: linux-2.6.24.7/include/linux/netfilter_ipv4/ipt_IMQ.h
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/include/linux/netfilter_ipv4/ipt_IMQ.h

 @@ -0,0 +1,8 @@
 +#ifndef _IPT_IMQ_H
 +#define _IPT_IMQ_H
 @@ -0,0 +1,8 @@
 +#ifndef _IPT_IMQ_H
 +#define _IPT_IMQ_H


@@ -580,9 +585,10 @@ diff -Naurw 2.6.24/include/linux/netfilter_ipv4/ipt_IMQ.h 2.6.24.imq/include/lin
 +};
 +
 +#endif /* _IPT_IMQ_H */
 +};
 +
 +#endif /* _IPT_IMQ_H */

-diff -Naurw 2.6.24/include/linux/netfilter_ipv6/ip6t_IMQ.h 2.6.24.imq/include/linux/netfilter_ipv6/ip6t_IMQ.h
---- 2.6.24/include/linux/netfilter_ipv6/ip6t_IMQ.h     1969-12-31 21:00:00.000000000 -0300
-+++ 2.6.24.imq/include/linux/netfilter_ipv6/ip6t_IMQ.h 2008-01-26 15:00:11.000000000 -0300
+Index: linux-2.6.24.7/include/linux/netfilter_ipv6/ip6t_IMQ.h
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/include/linux/netfilter_ipv6/ip6t_IMQ.h

 @@ -0,0 +1,8 @@
 +#ifndef _IP6T_IMQ_H
 +#define _IP6T_IMQ_H
 @@ -0,0 +1,8 @@
 +#ifndef _IP6T_IMQ_H
 +#define _IP6T_IMQ_H


@@ -592,10 +598,11 @@ diff -Naurw 2.6.24/include/linux/netfilter_ipv6/ip6t_IMQ.h 2.6.24.imq/include/li
 +};
 +
 +#endif /* _IP6T_IMQ_H */
 +};
 +
 +#endif /* _IP6T_IMQ_H */

-diff -Naurw 2.6.24/include/linux/skbuff.h 2.6.24.imq/include/linux/skbuff.h
---- 2.6.24/include/linux/skbuff.h      2008-01-24 19:58:37.000000000 -0300
-+++ 2.6.24.imq/include/linux/skbuff.h  2008-01-26 15:00:11.000000000 -0300
-@@ -295,6 +295,10 @@
+Index: linux-2.6.24.7/include/linux/skbuff.h
+===================================================================
+--- linux-2.6.24.7.orig/include/linux/skbuff.h
++++ linux-2.6.24.7/include/linux/skbuff.h
+@@ -295,6 +295,10 @@ struct sk_buff {

        struct nf_conntrack     *nfct;
        struct sk_buff          *nfct_reasm;
  #endif
        struct nf_conntrack     *nfct;
        struct sk_buff          *nfct_reasm;
  #endif


@@ -606,7 +613,7 @@ diff -Naurw 2.6.24/include/linux/skbuff.h 2.6.24.imq/include/linux/skbuff.h
  #ifdef CONFIG_BRIDGE_NETFILTER
        struct nf_bridge_info   *nf_bridge;
  #endif
  #ifdef CONFIG_BRIDGE_NETFILTER
        struct nf_bridge_info   *nf_bridge;
  #endif

-@@ -1728,6 +1732,10 @@
+@@ -1728,6 +1732,10 @@ static inline void __nf_copy(struct sk_b

        dst->nfct_reasm = src->nfct_reasm;
        nf_conntrack_get_reasm(src->nfct_reasm);
  #endif
        dst->nfct_reasm = src->nfct_reasm;
        nf_conntrack_get_reasm(src->nfct_reasm);
  #endif


@@ -617,9 +624,10 @@ diff -Naurw 2.6.24/include/linux/skbuff.h 2.6.24.imq/include/linux/skbuff.h
  #ifdef CONFIG_BRIDGE_NETFILTER
        dst->nf_bridge  = src->nf_bridge;
        nf_bridge_get(src->nf_bridge);
  #ifdef CONFIG_BRIDGE_NETFILTER
        dst->nf_bridge  = src->nf_bridge;
        nf_bridge_get(src->nf_bridge);

-diff -Naurw 2.6.24/net/core/dev.c 2.6.24.imq/net/core/dev.c
---- 2.6.24/net/core/dev.c      2008-01-24 19:58:37.000000000 -0300
-+++ 2.6.24.imq/net/core/dev.c  2008-01-26 15:00:11.000000000 -0300
+Index: linux-2.6.24.7/net/core/dev.c
+===================================================================
+--- linux-2.6.24.7.orig/net/core/dev.c
++++ linux-2.6.24.7/net/core/dev.c

 @@ -95,6 +95,9 @@
  #include <net/net_namespace.h>
  #include <net/sock.h>
 @@ -95,6 +95,9 @@
  #include <net/net_namespace.h>
  #include <net/sock.h>


@@ -630,7 +638,7 @@ diff -Naurw 2.6.24/net/core/dev.c 2.6.24.imq/net/core/dev.c
  #include <linux/proc_fs.h>
  #include <linux/seq_file.h>
  #include <linux/stat.h>
  #include <linux/proc_fs.h>
  #include <linux/seq_file.h>
  #include <linux/stat.h>

-@@ -1533,7 +1536,11 @@
+@@ -1533,7 +1536,11 @@ static int dev_gso_segment(struct sk_buf

  int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
  {
        if (likely(!skb->next)) {
  int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
  {
        if (likely(!skb->next)) {


@@ -643,9 +651,10 @@ diff -Naurw 2.6.24/net/core/dev.c 2.6.24.imq/net/core/dev.c
                        dev_queue_xmit_nit(skb, dev);
  
                if (netif_needs_gso(dev, skb)) {
                        dev_queue_xmit_nit(skb, dev);
  
                if (netif_needs_gso(dev, skb)) {

-diff -Naurw 2.6.24/net/ipv4/netfilter/ipt_IMQ.c 2.6.24.imq/net/ipv4/netfilter/ipt_IMQ.c
---- 2.6.24/net/ipv4/netfilter/ipt_IMQ.c        1969-12-31 21:00:00.000000000 -0300
-+++ 2.6.24.imq/net/ipv4/netfilter/ipt_IMQ.c    2008-01-26 15:00:11.000000000 -0300
+Index: linux-2.6.24.7/net/ipv4/netfilter/ipt_IMQ.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/net/ipv4/netfilter/ipt_IMQ.c

 @@ -0,0 +1,69 @@
 +/*
 + * This target marks packets to be enqueued to an imq device
 @@ -0,0 +1,69 @@
 +/*
 + * This target marks packets to be enqueued to an imq device


@@ -716,10 +725,11 @@ diff -Naurw 2.6.24/net/ipv4/netfilter/ipt_IMQ.c 2.6.24.imq/net/ipv4/netfilter/ip
 +MODULE_AUTHOR("http://www.linuximq.net");
 +MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("http://www.linuximq.net");
 +MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
 +MODULE_LICENSE("GPL");

-diff -Naurw 2.6.24/net/ipv4/netfilter/Kconfig 2.6.24.imq/net/ipv4/netfilter/Kconfig
---- 2.6.24/net/ipv4/netfilter/Kconfig  2008-01-24 19:58:37.000000000 -0300
-+++ 2.6.24.imq/net/ipv4/netfilter/Kconfig      2008-01-26 15:00:11.000000000 -0300
-@@ -311,6 +311,17 @@
+Index: linux-2.6.24.7/net/ipv4/netfilter/Kconfig
+===================================================================
+--- linux-2.6.24.7.orig/net/ipv4/netfilter/Kconfig
++++ linux-2.6.24.7/net/ipv4/netfilter/Kconfig
+@@ -333,6 +333,17 @@ config IP_NF_MANGLE

  
          To compile it as a module, choose M here.  If unsure, say N.
  
  
          To compile it as a module, choose M here.  If unsure, say N.
  


@@ -737,10 +747,11 @@ diff -Naurw 2.6.24/net/ipv4/netfilter/Kconfig 2.6.24.imq/net/ipv4/netfilter/Kcon
  config IP_NF_TARGET_TOS
        tristate "TOS target support"
        depends on IP_NF_MANGLE
  config IP_NF_TARGET_TOS
        tristate "TOS target support"
        depends on IP_NF_MANGLE

-diff -Naurw 2.6.24/net/ipv4/netfilter/Makefile 2.6.24.imq/net/ipv4/netfilter/Makefile
---- 2.6.24/net/ipv4/netfilter/Makefile 2008-01-24 19:58:37.000000000 -0300
-+++ 2.6.24.imq/net/ipv4/netfilter/Makefile     2008-01-26 15:00:11.000000000 -0300
-@@ -54,6 +54,7 @@
+Index: linux-2.6.24.7/net/ipv4/netfilter/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/net/ipv4/netfilter/Makefile
++++ linux-2.6.24.7/net/ipv4/netfilter/Makefile
+@@ -58,6 +58,7 @@ obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_i

  obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o
  obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
  obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o
  obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o
  obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
  obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o


@@ -748,9 +759,10 @@ diff -Naurw 2.6.24/net/ipv4/netfilter/Makefile 2.6.24.imq/net/ipv4/netfilter/Mak
  obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
  obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
  obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
  obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
  obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
  obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o

-diff -Naurw 2.6.24/net/ipv6/netfilter/ip6t_IMQ.c 2.6.24.imq/net/ipv6/netfilter/ip6t_IMQ.c
---- 2.6.24/net/ipv6/netfilter/ip6t_IMQ.c       1969-12-31 21:00:00.000000000 -0300
-+++ 2.6.24.imq/net/ipv6/netfilter/ip6t_IMQ.c   2008-01-26 15:00:11.000000000 -0300
+Index: linux-2.6.24.7/net/ipv6/netfilter/ip6t_IMQ.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/net/ipv6/netfilter/ip6t_IMQ.c

 @@ -0,0 +1,69 @@
 +/*
 + * This target marks packets to be enqueued to an imq device
 @@ -0,0 +1,69 @@
 +/*
 + * This target marks packets to be enqueued to an imq device


@@ -821,10 +833,11 @@ diff -Naurw 2.6.24/net/ipv6/netfilter/ip6t_IMQ.c 2.6.24.imq/net/ipv6/netfilter/i
 +MODULE_AUTHOR("http://www.linuximq.net");
 +MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("http://www.linuximq.net");
 +MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
 +MODULE_LICENSE("GPL");

-diff -Naurw 2.6.24/net/ipv6/netfilter/Kconfig 2.6.24.imq/net/ipv6/netfilter/Kconfig
---- 2.6.24/net/ipv6/netfilter/Kconfig  2008-01-24 19:58:37.000000000 -0300
-+++ 2.6.24.imq/net/ipv6/netfilter/Kconfig      2008-01-26 15:00:11.000000000 -0300
-@@ -173,6 +173,15 @@
+Index: linux-2.6.24.7/net/ipv6/netfilter/Kconfig
+===================================================================
+--- linux-2.6.24.7.orig/net/ipv6/netfilter/Kconfig
++++ linux-2.6.24.7/net/ipv6/netfilter/Kconfig
+@@ -173,6 +173,15 @@ config IP6_NF_MANGLE

  
          To compile it as a module, choose M here.  If unsure, say N.
  
  
          To compile it as a module, choose M here.  If unsure, say N.
  


@@ -840,9 +853,10 @@ diff -Naurw 2.6.24/net/ipv6/netfilter/Kconfig 2.6.24.imq/net/ipv6/netfilter/Kcon
  config IP6_NF_TARGET_HL
        tristate  'HL (hoplimit) target support'
        depends on IP6_NF_MANGLE
  config IP6_NF_TARGET_HL
        tristate  'HL (hoplimit) target support'
        depends on IP6_NF_MANGLE

-diff -Naurw 2.6.24/net/ipv6/netfilter/Makefile 2.6.24.imq/net/ipv6/netfilter/Makefile
---- 2.6.24/net/ipv6/netfilter/Makefile 2008-01-24 19:58:37.000000000 -0300
-+++ 2.6.24.imq/net/ipv6/netfilter/Makefile     2008-01-26 15:00:11.000000000 -0300
+Index: linux-2.6.24.7/net/ipv6/netfilter/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/net/ipv6/netfilter/Makefile
++++ linux-2.6.24.7/net/ipv6/netfilter/Makefile

 @@ -6,6 +6,7 @@
  obj-$(CONFIG_IP6_NF_IPTABLES) += ip6_tables.o
  obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o
 @@ -6,6 +6,7 @@
  obj-$(CONFIG_IP6_NF_IPTABLES) += ip6_tables.o
  obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o


@@ -851,10 +865,11 @@ diff -Naurw 2.6.24/net/ipv6/netfilter/Makefile 2.6.24.imq/net/ipv6/netfilter/Mak
  obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o
  obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o
  
  obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o
  obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o
  

-diff -Naurw 2.6.24/net/sched/sch_generic.c 2.6.24.imq/net/sched/sch_generic.c
---- 2.6.24/net/sched/sch_generic.c     2008-01-24 19:58:37.000000000 -0300
-+++ 2.6.24.imq/net/sched/sch_generic.c 2008-01-26 15:00:11.000000000 -0300
-@@ -176,6 +176,11 @@
+Index: linux-2.6.24.7/net/sched/sch_generic.c
+===================================================================
+--- linux-2.6.24.7.orig/net/sched/sch_generic.c
++++ linux-2.6.24.7/net/sched/sch_generic.c
+@@ -176,6 +176,11 @@ static inline int qdisc_restart(struct n

        return ret;
  }
  
        return ret;
  }
  


@@ -865,8 +880,8 @@ diff -Naurw 2.6.24/net/sched/sch_generic.c 2.6.24.imq/net/sched/sch_generic.c
 +
  void __qdisc_run(struct net_device *dev)
  {
 +
  void __qdisc_run(struct net_device *dev)
  {

-       do {
-@@ -638,3 +643,4 @@
+       unsigned long start_time = jiffies;
+@@ -650,3 +655,4 @@ EXPORT_SYMBOL(qdisc_destroy);

  EXPORT_SYMBOL(qdisc_reset);
  EXPORT_SYMBOL(qdisc_lock_tree);
  EXPORT_SYMBOL(qdisc_unlock_tree);
  EXPORT_SYMBOL(qdisc_reset);
  EXPORT_SYMBOL(qdisc_lock_tree);
  EXPORT_SYMBOL(qdisc_unlock_tree);

diff --git a/target/linux/generic-2.6/patches-2.6.24/170-netfilter_chaostables_0.8.patch b/target/linux/generic-2.6/patches-2.6.24/170-netfilter_chaostables_0.8.patch
index 38b5000..b73a6af 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/170-netfilter_chaostables_0.8.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/170-netfilter_chaostables_0.8.patch
@@ -1,17 +1,17 @@
-Index: linux-2.6.24/include/linux/netfilter/oot_conntrack.h
+Index: linux-2.6.24.7/include/linux/netfilter/oot_conntrack.h

 ===================================================================
 --- /dev/null
 ===================================================================
 --- /dev/null

-+++ linux-2.6.24/include/linux/netfilter/oot_conntrack.h
++++ linux-2.6.24.7/include/linux/netfilter/oot_conntrack.h

 @@ -0,0 +1,5 @@
 +#if defined(CONFIG_IP_NF_CONNTRACK) || defined(CONFIG_IP_NF_CONNTRACK_MODULE)
 +#     include <linux/netfilter_ipv4/ip_conntrack.h>
 +#else /* linux-2.6.20+ */
 +#     include <net/netfilter/nf_nat_rule.h>
 +#endif
 @@ -0,0 +1,5 @@
 +#if defined(CONFIG_IP_NF_CONNTRACK) || defined(CONFIG_IP_NF_CONNTRACK_MODULE)
 +#     include <linux/netfilter_ipv4/ip_conntrack.h>
 +#else /* linux-2.6.20+ */
 +#     include <net/netfilter/nf_nat_rule.h>
 +#endif

-Index: linux-2.6.24/include/linux/netfilter/oot_trans.h
+Index: linux-2.6.24.7/include/linux/netfilter/oot_trans.h

 ===================================================================
 --- /dev/null
 ===================================================================
 --- /dev/null

-+++ linux-2.6.24/include/linux/netfilter/oot_trans.h
++++ linux-2.6.24.7/include/linux/netfilter/oot_trans.h

 @@ -0,0 +1,14 @@
 +/* Out of tree workarounds */
 +#include <linux/version.h>
 @@ -0,0 +1,14 @@
 +/* Out of tree workarounds */
 +#include <linux/version.h>


@@ -27,10 +27,10 @@ Index: linux-2.6.24/include/linux/netfilter/oot_trans.h
 +#     define tcp_v4_check(tcph, tcph_sz, s, d, csp) \
 +              tcp_v4_check((tcph_sz), (s), (d), (csp))
 +#endif
 +#     define tcp_v4_check(tcph, tcph_sz, s, d, csp) \
 +              tcp_v4_check((tcph_sz), (s), (d), (csp))
 +#endif

-Index: linux-2.6.24/include/linux/netfilter/xt_CHAOS.h
+Index: linux-2.6.24.7/include/linux/netfilter/xt_CHAOS.h

 ===================================================================
 --- /dev/null
 ===================================================================
 --- /dev/null

-+++ linux-2.6.24/include/linux/netfilter/xt_CHAOS.h
++++ linux-2.6.24.7/include/linux/netfilter/xt_CHAOS.h

 @@ -0,0 +1,14 @@
 +#ifndef _LINUX_NETFILTER_XT_CHAOS_H
 +#define _LINUX_NETFILTER_XT_CHAOS_H 1
 @@ -0,0 +1,14 @@
 +#ifndef _LINUX_NETFILTER_XT_CHAOS_H
 +#define _LINUX_NETFILTER_XT_CHAOS_H 1


@@ -46,10 +46,10 @@ Index: linux-2.6.24/include/linux/netfilter/xt_CHAOS.h
 +};
 +
 +#endif /* _LINUX_NETFILTER_XT_CHAOS_H */
 +};
 +
 +#endif /* _LINUX_NETFILTER_XT_CHAOS_H */

-Index: linux-2.6.24/include/linux/netfilter/xt_portscan.h
+Index: linux-2.6.24.7/include/linux/netfilter/xt_portscan.h

 ===================================================================
 --- /dev/null
 ===================================================================
 --- /dev/null

-+++ linux-2.6.24/include/linux/netfilter/xt_portscan.h
++++ linux-2.6.24.7/include/linux/netfilter/xt_portscan.h

 @@ -0,0 +1,8 @@
 +#ifndef _LINUX_NETFILTER_XT_PORTSCAN_H
 +#define _LINUX_NETFILTER_XT_PORTSCAN_H 1
 @@ -0,0 +1,8 @@
 +#ifndef _LINUX_NETFILTER_XT_PORTSCAN_H
 +#define _LINUX_NETFILTER_XT_PORTSCAN_H 1


@@ -59,10 +59,10 @@ Index: linux-2.6.24/include/linux/netfilter/xt_portscan.h
 +};
 +
 +#endif /* _LINUX_NETFILTER_XT_PORTSCAN_H */
 +};
 +
 +#endif /* _LINUX_NETFILTER_XT_PORTSCAN_H */

-Index: linux-2.6.24/net/netfilter/find_match.c
+Index: linux-2.6.24.7/net/netfilter/find_match.c

 ===================================================================
 --- /dev/null
 ===================================================================
 --- /dev/null

-+++ linux-2.6.24/net/netfilter/find_match.c
++++ linux-2.6.24.7/net/netfilter/find_match.c

 @@ -0,0 +1,39 @@
 +/*
 +    xt_request_find_match
 @@ -0,0 +1,39 @@
 +/*
 +    xt_request_find_match


@@ -103,10 +103,10 @@ Index: linux-2.6.24/net/netfilter/find_match.c
 +
 +/* In case it goes into mainline, let this out-of-tree package compile */
 +#define xt_request_find_match xt_request_find_match_lo
 +
 +/* In case it goes into mainline, let this out-of-tree package compile */
 +#define xt_request_find_match xt_request_find_match_lo

-Index: linux-2.6.24/net/netfilter/Kconfig
+Index: linux-2.6.24.7/net/netfilter/Kconfig

 ===================================================================
 ===================================================================

---- linux-2.6.24.orig/net/netfilter/Kconfig
-+++ linux-2.6.24/net/netfilter/Kconfig
+--- linux-2.6.24.7.orig/net/netfilter/Kconfig
++++ linux-2.6.24.7/net/netfilter/Kconfig

 @@ -265,6 +265,14 @@ config NETFILTER_XTABLES
  
  # alphabetically ordered list of targets
 @@ -265,6 +265,14 @@ config NETFILTER_XTABLES
  
  # alphabetically ordered list of targets


@@ -152,10 +152,10 @@ Index: linux-2.6.24/net/netfilter/Kconfig
  config NETFILTER_XT_MATCH_MULTIPORT
        tristate "Multiple port match support"
        depends on NETFILTER_XTABLES
  config NETFILTER_XT_MATCH_MULTIPORT
        tristate "Multiple port match support"
        depends on NETFILTER_XTABLES

-Index: linux-2.6.24/net/netfilter/Makefile
+Index: linux-2.6.24.7/net/netfilter/Makefile

 ===================================================================
 ===================================================================

---- linux-2.6.24.orig/net/netfilter/Makefile
-+++ linux-2.6.24/net/netfilter/Makefile
+--- linux-2.6.24.7.orig/net/netfilter/Makefile
++++ linux-2.6.24.7/net/netfilter/Makefile

 @@ -49,6 +49,8 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK
  obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK) += xt_SECMARK.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o
 @@ -49,6 +49,8 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK
  obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK) += xt_SECMARK.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o


@@ -170,10 +170,10 @@ Index: linux-2.6.24/net/netfilter/Makefile
  obj-$(CONFIG_NETFILTER_XT_MATCH_TIME) += xt_time.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_U32) += xt_u32.o
 +obj-$(CONFIG_NETFILTER_XT_MATCH_PORTSCAN) += xt_portscan.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_TIME) += xt_time.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_U32) += xt_u32.o
 +obj-$(CONFIG_NETFILTER_XT_MATCH_PORTSCAN) += xt_portscan.o

-Index: linux-2.6.24/net/netfilter/xt_CHAOS.c
+Index: linux-2.6.24.7/net/netfilter/xt_CHAOS.c

 ===================================================================
 --- /dev/null
 ===================================================================
 --- /dev/null

-+++ linux-2.6.24/net/netfilter/xt_CHAOS.c
++++ linux-2.6.24.7/net/netfilter/xt_CHAOS.c

 @@ -0,0 +1,200 @@
 +/*
 + *    CHAOS target for netfilter
 @@ -0,0 +1,200 @@
 +/*
 + *    CHAOS target for netfilter


@@ -375,10 +375,10 @@ Index: linux-2.6.24/net/netfilter/xt_CHAOS.c
 +MODULE_DESCRIPTION("netfilter \"CHAOS\" target");
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("ipt_CHAOS");
 +MODULE_DESCRIPTION("netfilter \"CHAOS\" target");
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("ipt_CHAOS");

-Index: linux-2.6.24/net/netfilter/xt_DELUDE.c
+Index: linux-2.6.24.7/net/netfilter/xt_DELUDE.c

 ===================================================================
 --- /dev/null
 ===================================================================
 --- /dev/null

-+++ linux-2.6.24/net/netfilter/xt_DELUDE.c
++++ linux-2.6.24.7/net/netfilter/xt_DELUDE.c

 @@ -0,0 +1,197 @@
 +/*
 + *    DELUDE target
 @@ -0,0 +1,197 @@
 +/*
 + *    DELUDE target


@@ -577,10 +577,10 @@ Index: linux-2.6.24/net/netfilter/xt_DELUDE.c
 +MODULE_DESCRIPTION("netfilter \"DELUDE\" target");
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("ipt_DELUDE");
 +MODULE_DESCRIPTION("netfilter \"DELUDE\" target");
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("ipt_DELUDE");

-Index: linux-2.6.24/net/netfilter/xt_portscan.c
+Index: linux-2.6.24.7/net/netfilter/xt_portscan.c

 ===================================================================
 --- /dev/null
 ===================================================================
 --- /dev/null

-+++ linux-2.6.24/net/netfilter/xt_portscan.c
++++ linux-2.6.24.7/net/netfilter/xt_portscan.c

 @@ -0,0 +1,269 @@
 +/*
 + *    portscan match for netfilter
 @@ -0,0 +1,269 @@
 +/*
 + *    portscan match for netfilter


@@ -851,10 +851,10 @@ Index: linux-2.6.24/net/netfilter/xt_portscan.c
 +MODULE_DESCRIPTION("netfilter \"portscan\" match");
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("ipt_portscan");
 +MODULE_DESCRIPTION("netfilter \"portscan\" match");
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("ipt_portscan");

-Index: linux-2.6.24/drivers/char/random.c
+Index: linux-2.6.24.7/drivers/char/random.c

 ===================================================================
 ===================================================================

---- linux-2.6.24.orig/drivers/char/random.c
-+++ linux-2.6.24/drivers/char/random.c
+--- linux-2.6.24.7.orig/drivers/char/random.c
++++ linux-2.6.24.7/drivers/char/random.c

 @@ -1564,6 +1564,8 @@ __u32 secure_tcp_sequence_number(__be32 
        return seq;
  }
 @@ -1564,6 +1564,8 @@ __u32 secure_tcp_sequence_number(__be32 
        return seq;
  }

diff --git a/target/linux/generic-2.6/patches-2.6.24/171-netfilter_tarpit.patch b/target/linux/generic-2.6/patches-2.6.24/171-netfilter_tarpit.patch
index f5f5589..690d18c 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/171-netfilter_tarpit.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/171-netfilter_tarpit.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.23/net/netfilter/Kconfig
+Index: linux-2.6.24.7/net/netfilter/Kconfig

 ===================================================================
 ===================================================================

---- linux-2.6.23.orig/net/netfilter/Kconfig
-+++ linux-2.6.23/net/netfilter/Kconfig
+--- linux-2.6.24.7.orig/net/netfilter/Kconfig
++++ linux-2.6.24.7/net/netfilter/Kconfig

 @@ -401,6 +401,23 @@ config NETFILTER_XT_TARGET_CONNSECMARK
  
          To compile it as a module, choose M here.  If unsure, say N.
 @@ -401,6 +401,23 @@ config NETFILTER_XT_TARGET_CONNSECMARK
  
          To compile it as a module, choose M here.  If unsure, say N.


@@ -26,22 +26,22 @@ Index: linux-2.6.23/net/netfilter/Kconfig
  config NETFILTER_XT_TARGET_TCPMSS
        tristate '"TCPMSS" target support'
        depends on NETFILTER_XTABLES && (IPV6 || IPV6=n)
  config NETFILTER_XT_TARGET_TCPMSS
        tristate '"TCPMSS" target support'
        depends on NETFILTER_XTABLES && (IPV6 || IPV6=n)

-Index: linux-2.6.23/net/netfilter/Makefile
+Index: linux-2.6.24.7/net/netfilter/Makefile

 ===================================================================
 ===================================================================

---- linux-2.6.23.orig/net/netfilter/Makefile
-+++ linux-2.6.23/net/netfilter/Makefile
-@@ -49,6 +49,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG) 
+--- linux-2.6.24.7.orig/net/netfilter/Makefile
++++ linux-2.6.24.7/net/netfilter/Makefile
+@@ -47,6 +47,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG) 
+ obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE) += xt_NFQUEUE.o

  obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK) += xt_NOTRACK.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK) += xt_NOTRACK.o

- obj-$(CONFIG_NETFILTER_XT_TARGET_TRACE) += xt_TRACE.o

  obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK) += xt_SECMARK.o
 +obj-$(CONFIG_NETFILTER_XT_TARGET_TARPIT) += xt_TARPIT.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK) += xt_SECMARK.o
 +obj-$(CONFIG_NETFILTER_XT_TARGET_TARPIT) += xt_TARPIT.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o

- obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSECMARK) += xt_CONNSECMARK.o
- 
-Index: linux-2.6.23/net/netfilter/xt_TARPIT.c
+ obj-$(CONFIG_NETFILTER_XT_TARGET_TRACE) += xt_TRACE.o
+ obj-$(CONFIG_NETFILTER_XT_TARGET_CHAOS) += xt_CHAOS.o
+Index: linux-2.6.24.7/net/netfilter/xt_TARPIT.c

 ===================================================================
 --- /dev/null
 ===================================================================
 --- /dev/null

-+++ linux-2.6.23/net/netfilter/xt_TARPIT.c
++++ linux-2.6.24.7/net/netfilter/xt_TARPIT.c

 @@ -0,0 +1,279 @@
 +/*
 + * Kernel module to capture and hold incoming TCP connections using
 @@ -0,0 +1,279 @@
 +/*
 + * Kernel module to capture and hold incoming TCP connections using

diff --git a/target/linux/generic-2.6/patches-2.6.24/180-netfilter_depends.patch b/target/linux/generic-2.6/patches-2.6.24/180-netfilter_depends.patch
index 671a53c..122515d 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/180-netfilter_depends.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/180-netfilter_depends.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23-rc6/net/netfilter/Kconfig
+Index: linux-2.6.24.7/net/netfilter/Kconfig

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/net/netfilter/Kconfig        2007-09-21 16:24:03.000000000 +0800
-+++ linux-2.6.23-rc6/net/netfilter/Kconfig     2007-09-21 16:24:04.000000000 +0800
-@@ -143,7 +143,7 @@
+--- linux-2.6.24.7.orig/net/netfilter/Kconfig
++++ linux-2.6.24.7/net/netfilter/Kconfig
+@@ -143,7 +143,7 @@ config NF_CONNTRACK_FTP

  
  config NF_CONNTRACK_H323
        tristate "H.323 protocol support (EXPERIMENTAL)"
  
  config NF_CONNTRACK_H323
        tristate "H.323 protocol support (EXPERIMENTAL)"


@@ -11,7 +11,7 @@ Index: linux-2.6.23-rc6/net/netfilter/Kconfig
        help
          H.323 is a VoIP signalling protocol from ITU-T. As one of the most
          important VoIP protocols, it is widely used by voice hardware and
        help
          H.323 is a VoIP signalling protocol from ITU-T. As one of the most
          important VoIP protocols, it is widely used by voice hardware and

-@@ -403,7 +403,7 @@
+@@ -420,7 +420,7 @@ config NETFILTER_XT_TARGET_TARPIT

  
  config NETFILTER_XT_TARGET_TCPMSS
        tristate '"TCPMSS" target support'
  
  config NETFILTER_XT_TARGET_TCPMSS
        tristate '"TCPMSS" target support'

diff --git a/target/linux/generic-2.6/patches-2.6.24/190-netfilter_rtsp.patch b/target/linux/generic-2.6/patches-2.6.24/190-netfilter_rtsp.patch
index 56d0b7d..e44dc9c 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/190-netfilter_rtsp.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/190-netfilter_rtsp.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.23-rc9/include/linux/netfilter/nf_conntrack_rtsp.h
+Index: linux-2.6.24.7/include/linux/netfilter/nf_conntrack_rtsp.h

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23-rc9/include/linux/netfilter/nf_conntrack_rtsp.h       2007-10-05 21:26:39.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/include/linux/netfilter/nf_conntrack_rtsp.h

 @@ -0,0 +1,63 @@
 +/*
 + * RTSP extension for IP connection tracking.
 @@ -0,0 +1,63 @@
 +/*
 + * RTSP extension for IP connection tracking.


@@ -66,10 +66,10 @@ Index: linux-2.6.23-rc9/include/linux/netfilter/nf_conntrack_rtsp.h
 +#endif /* __KERNEL__ */
 +
 +#endif /* _IP_CONNTRACK_RTSP_H */
 +#endif /* __KERNEL__ */
 +
 +#endif /* _IP_CONNTRACK_RTSP_H */

-Index: linux-2.6.23-rc9/include/linux/netfilter_helpers.h
+Index: linux-2.6.24.7/include/linux/netfilter_helpers.h

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23-rc9/include/linux/netfilter_helpers.h 2007-10-05 21:26:39.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/include/linux/netfilter_helpers.h

 @@ -0,0 +1,133 @@
 +/*
 + * Helpers for netfiler modules.  This file provides implementations for basic
 @@ -0,0 +1,133 @@
 +/*
 + * Helpers for netfiler modules.  This file provides implementations for basic


@@ -204,10 +204,10 @@ Index: linux-2.6.23-rc9/include/linux/netfilter_helpers.h
 +#endif /* __KERNEL__ */
 +
 +#endif /* _NETFILTER_HELPERS_H */
 +#endif /* __KERNEL__ */
 +
 +#endif /* _NETFILTER_HELPERS_H */

-Index: linux-2.6.23-rc9/include/linux/netfilter_mime.h
+Index: linux-2.6.24.7/include/linux/netfilter_mime.h

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23-rc9/include/linux/netfilter_mime.h    2007-10-05 21:26:39.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/include/linux/netfilter_mime.h

 @@ -0,0 +1,89 @@
 +/*
 + * MIME functions for netfilter modules.  This file provides implementations
 @@ -0,0 +1,89 @@
 +/*
 + * MIME functions for netfilter modules.  This file provides implementations


@@ -298,11 +298,11 @@ Index: linux-2.6.23-rc9/include/linux/netfilter_mime.h
 +#endif /* __KERNEL__ */
 +
 +#endif /* _NETFILTER_MIME_H */
 +#endif /* __KERNEL__ */
 +
 +#endif /* _NETFILTER_MIME_H */

-Index: linux-2.6.23-rc9/net/ipv4/netfilter/Makefile
+Index: linux-2.6.24.7/net/ipv4/netfilter/Makefile

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc9.orig/net/ipv4/netfilter/Makefile  2007-10-05 21:26:39.000000000 +0800
-+++ linux-2.6.23-rc9/net/ipv4/netfilter/Makefile       2007-10-05 21:26:39.000000000 +0800
-@@ -23,6 +23,7 @@
+--- linux-2.6.24.7.orig/net/ipv4/netfilter/Makefile
++++ linux-2.6.24.7/net/ipv4/netfilter/Makefile
+@@ -23,6 +23,7 @@ obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_am

  obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o
  obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o
  obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o
  obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o
  obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o
  obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o


@@ -310,11 +310,11 @@ Index: linux-2.6.23-rc9/net/ipv4/netfilter/Makefile
  obj-$(CONFIG_NF_NAT_PPTP) += nf_nat_pptp.o
  obj-$(CONFIG_NF_NAT_SIP) += nf_nat_sip.o
  obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
  obj-$(CONFIG_NF_NAT_PPTP) += nf_nat_pptp.o
  obj-$(CONFIG_NF_NAT_SIP) += nf_nat_sip.o
  obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o

-Index: linux-2.6.23-rc9/net/netfilter/Kconfig
+Index: linux-2.6.24.7/net/netfilter/Kconfig

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc9.orig/net/netfilter/Kconfig        2007-10-05 21:26:39.000000000 +0800
-+++ linux-2.6.23-rc9/net/netfilter/Kconfig     2007-10-05 21:26:39.000000000 +0800
-@@ -249,6 +249,16 @@
+--- linux-2.6.24.7.orig/net/netfilter/Kconfig
++++ linux-2.6.24.7/net/netfilter/Kconfig
+@@ -249,6 +249,16 @@ config NF_CONNTRACK_TFTP

  
          To compile it as a module, choose M here.  If unsure, say N.
  
  
          To compile it as a module, choose M here.  If unsure, say N.
  


@@ -331,11 +331,11 @@ Index: linux-2.6.23-rc9/net/netfilter/Kconfig
  config NF_CT_NETLINK
        tristate 'Connection tracking netlink interface (EXPERIMENTAL)'
        depends on EXPERIMENTAL && NF_CONNTRACK && NETFILTER_NETLINK
  config NF_CT_NETLINK
        tristate 'Connection tracking netlink interface (EXPERIMENTAL)'
        depends on EXPERIMENTAL && NF_CONNTRACK && NETFILTER_NETLINK

-Index: linux-2.6.23-rc9/net/netfilter/Makefile
+Index: linux-2.6.24.7/net/netfilter/Makefile

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc9.orig/net/netfilter/Makefile       2007-10-05 21:26:39.000000000 +0800
-+++ linux-2.6.23-rc9/net/netfilter/Makefile    2007-10-05 21:26:39.000000000 +0800
-@@ -33,6 +33,7 @@
+--- linux-2.6.24.7.orig/net/netfilter/Makefile
++++ linux-2.6.24.7/net/netfilter/Makefile
+@@ -33,6 +33,7 @@ obj-$(CONFIG_NF_CONNTRACK_PPTP) += nf_co

  obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o
  obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
  obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o
  obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o
  obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
  obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o


@@ -343,11 +343,11 @@ Index: linux-2.6.23-rc9/net/netfilter/Makefile
  
  # generic X tables 
  obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o
  
  # generic X tables 
  obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o

-Index: linux-2.6.23-rc9/net/ipv4/netfilter/Kconfig
+Index: linux-2.6.24.7/net/ipv4/netfilter/Kconfig

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc9.orig/net/ipv4/netfilter/Kconfig   2007-10-05 21:26:39.000000000 +0800
-+++ linux-2.6.23-rc9/net/ipv4/netfilter/Kconfig        2007-10-05 21:26:39.000000000 +0800
-@@ -314,6 +314,11 @@
+--- linux-2.6.24.7.orig/net/ipv4/netfilter/Kconfig
++++ linux-2.6.24.7/net/ipv4/netfilter/Kconfig
+@@ -296,6 +296,11 @@ config NF_NAT_IRC

        depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
        default NF_NAT && NF_CONNTRACK_IRC
  
        depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
        default NF_NAT && NF_CONNTRACK_IRC
  


@@ -359,10 +359,10 @@ Index: linux-2.6.23-rc9/net/ipv4/netfilter/Kconfig
  config NF_NAT_TFTP
        tristate
        depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
  config NF_NAT_TFTP
        tristate
        depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT

-Index: linux-2.6.23-rc9/net/netfilter/nf_conntrack_rtsp.c
+Index: linux-2.6.24.7/net/netfilter/nf_conntrack_rtsp.c

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23-rc9/net/netfilter/nf_conntrack_rtsp.c 2007-10-05 21:46:43.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/net/netfilter/nf_conntrack_rtsp.c

 @@ -0,0 +1,513 @@
 +/*
 + * RTSP extension for IP connection tracking
 @@ -0,0 +1,513 @@
 +/*
 + * RTSP extension for IP connection tracking


@@ -877,10 +877,10 @@ Index: linux-2.6.23-rc9/net/netfilter/nf_conntrack_rtsp.c
 +
 +EXPORT_SYMBOL(nf_nat_rtsp_hook_expectfn);
 +
 +
 +EXPORT_SYMBOL(nf_nat_rtsp_hook_expectfn);
 +

-Index: linux-2.6.23-rc9/net/ipv4/netfilter/nf_nat_rtsp.c
+Index: linux-2.6.24.7/net/ipv4/netfilter/nf_nat_rtsp.c

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23-rc9/net/ipv4/netfilter/nf_nat_rtsp.c  2007-10-05 21:41:16.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/net/ipv4/netfilter/nf_nat_rtsp.c

 @@ -0,0 +1,496 @@
 +/*
 + * RTSP extension for TCP NAT alteration
 @@ -0,0 +1,496 @@
 +/*
 + * RTSP extension for TCP NAT alteration

diff --git a/target/linux/generic-2.6/patches-2.6.24/200-sched_esfq.patch b/target/linux/generic-2.6/patches-2.6.24/200-sched_esfq.patch
index ac5eeee..ebf7810 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/200-sched_esfq.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/200-sched_esfq.patch
@@ -1,7 +1,8 @@
-diff -Naur linux-2.6.21.5.orig/include/linux/pkt_sched.h linux-2.6.21.5/include/linux/pkt_sched.h
---- linux-2.6.21.5.orig/include/linux/pkt_sched.h      2007-06-11 11:37:06.000000000 -0700
-+++ linux-2.6.21.5/include/linux/pkt_sched.h   2007-06-22 22:53:46.000000000 -0700
-@@ -146,8 +146,37 @@
+Index: linux-2.6.24.7/include/linux/pkt_sched.h
+===================================================================
+--- linux-2.6.24.7.orig/include/linux/pkt_sched.h
++++ linux-2.6.24.7/include/linux/pkt_sched.h
+@@ -155,8 +155,37 @@ struct tc_sfq_qopt

   *
   *    The only reason for this is efficiency, it is possible
   *    to change these parameters in compile time.
   *
   *    The only reason for this is efficiency, it is possible
   *    to change these parameters in compile time.


@@ -39,10 +40,11 @@ diff -Naur linux-2.6.21.5.orig/include/linux/pkt_sched.h linux-2.6.21.5/include/
  /* RED section */
  
  enum
  /* RED section */
  
  enum

-diff -Naur linux-2.6.21.5.orig/net/sched/Kconfig linux-2.6.21.5/net/sched/Kconfig
---- linux-2.6.21.5.orig/net/sched/Kconfig      2007-06-11 11:37:06.000000000 -0700
-+++ linux-2.6.21.5/net/sched/Kconfig   2007-06-23 14:11:02.000000000 -0700
-@@ -189,6 +189,37 @@
+Index: linux-2.6.24.7/net/sched/Kconfig
+===================================================================
+--- linux-2.6.24.7.orig/net/sched/Kconfig
++++ linux-2.6.24.7/net/sched/Kconfig
+@@ -139,6 +139,37 @@ config NET_SCH_SFQ

          To compile this code as a module, choose M here: the
          module will be called sch_sfq.
  
          To compile this code as a module, choose M here: the
          module will be called sch_sfq.
  


@@ -80,10 +82,11 @@ diff -Naur linux-2.6.21.5.orig/net/sched/Kconfig linux-2.6.21.5/net/sched/Kconfi
  config NET_SCH_TEQL
        tristate "True Link Equalizer (TEQL)"
        ---help---
  config NET_SCH_TEQL
        tristate "True Link Equalizer (TEQL)"
        ---help---

-diff -Naur linux-2.6.21.5.orig/net/sched/Makefile linux-2.6.21.5/net/sched/Makefile
---- linux-2.6.21.5.orig/net/sched/Makefile     2007-06-11 11:37:06.000000000 -0700
-+++ linux-2.6.21.5/net/sched/Makefile  2007-06-22 22:53:46.000000000 -0700
-@@ -23,6 +23,7 @@
+Index: linux-2.6.24.7/net/sched/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/net/sched/Makefile
++++ linux-2.6.24.7/net/sched/Makefile
+@@ -23,6 +23,7 @@ obj-$(CONFIG_NET_SCH_GRED)   += sch_gred.o

  obj-$(CONFIG_NET_SCH_INGRESS) += sch_ingress.o 
  obj-$(CONFIG_NET_SCH_DSMARK)  += sch_dsmark.o
  obj-$(CONFIG_NET_SCH_SFQ)     += sch_sfq.o
  obj-$(CONFIG_NET_SCH_INGRESS) += sch_ingress.o 
  obj-$(CONFIG_NET_SCH_DSMARK)  += sch_dsmark.o
  obj-$(CONFIG_NET_SCH_SFQ)     += sch_sfq.o


@@ -91,9 +94,10 @@ diff -Naur linux-2.6.21.5.orig/net/sched/Makefile linux-2.6.21.5/net/sched/Makef
  obj-$(CONFIG_NET_SCH_TBF)     += sch_tbf.o
  obj-$(CONFIG_NET_SCH_TEQL)    += sch_teql.o
  obj-$(CONFIG_NET_SCH_PRIO)    += sch_prio.o
  obj-$(CONFIG_NET_SCH_TBF)     += sch_tbf.o
  obj-$(CONFIG_NET_SCH_TEQL)    += sch_teql.o
  obj-$(CONFIG_NET_SCH_PRIO)    += sch_prio.o

-diff -Naur linux-2.6.21.5.orig/net/sched/sch_esfq.c linux-2.6.21.5/net/sched/sch_esfq.c
---- linux-2.6.21.5.orig/net/sched/sch_esfq.c   1969-12-31 16:00:00.000000000 -0800
-+++ linux-2.6.21.5/net/sched/sch_esfq.c        2007-06-23 19:18:00.000000000 -0700
+Index: linux-2.6.24.7/net/sched/sch_esfq.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/net/sched/sch_esfq.c

 @@ -0,0 +1,702 @@
 +/*
 + * net/sched/sch_esfq.c       Extended Stochastic Fairness Queueing discipline.
 @@ -0,0 +1,702 @@
 +/*
 + * net/sched/sch_esfq.c       Extended Stochastic Fairness Queueing discipline.

diff --git a/target/linux/generic-2.6/patches-2.6.24/202-mips-freestanding.patch b/target/linux/generic-2.6/patches-2.6.24/202-mips-freestanding.patch
index 994c03e..64c7e4e 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/202-mips-freestanding.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/202-mips-freestanding.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23-rc6/arch/mips/Makefile
+Index: linux-2.6.24.7/arch/mips/Makefile

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/arch/mips/Makefile   2007-09-21 16:23:53.000000000 +0800
-+++ linux-2.6.23-rc6/arch/mips/Makefile        2007-09-21 16:24:05.000000000 +0800
-@@ -565,6 +565,9 @@
+--- linux-2.6.24.7.orig/arch/mips/Makefile
++++ linux-2.6.24.7/arch/mips/Makefile
+@@ -576,6 +576,9 @@ core-$(CONFIG_TOSHIBA_RBTX4938) += arch/

  cflags-$(CONFIG_TOSHIBA_RBTX4938) += -Iinclude/asm-mips/mach-tx49xx
  load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000
  
  cflags-$(CONFIG_TOSHIBA_RBTX4938) += -Iinclude/asm-mips/mach-tx49xx
  load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000
  

diff --git a/target/linux/generic-2.6/patches-2.6.24/204-jffs2_eofdetect.patch b/target/linux/generic-2.6/patches-2.6.24/204-jffs2_eofdetect.patch
index f1ffac6..defb535 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/204-jffs2_eofdetect.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/204-jffs2_eofdetect.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23-rc6/fs/jffs2/build.c
+Index: linux-2.6.24.7/fs/jffs2/build.c

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/fs/jffs2/build.c     2007-09-21 16:23:53.000000000 +0800
-+++ linux-2.6.23-rc6/fs/jffs2/build.c  2007-09-21 16:24:05.000000000 +0800
-@@ -105,6 +105,17 @@
+--- linux-2.6.24.7.orig/fs/jffs2/build.c
++++ linux-2.6.24.7/fs/jffs2/build.c
+@@ -105,6 +105,17 @@ static int jffs2_build_filesystem(struct

        dbg_fsbuild("scanned flash completely\n");
        jffs2_dbg_dump_block_lists_nolock(c);
  
        dbg_fsbuild("scanned flash completely\n");
        jffs2_dbg_dump_block_lists_nolock(c);
  


@@ -20,11 +20,11 @@ Index: linux-2.6.23-rc6/fs/jffs2/build.c
        dbg_fsbuild("pass 1 starting\n");
        c->flags |= JFFS2_SB_FLAG_BUILDING;
        /* Now scan the directory tree, increasing nlink according to every dirent found. */
        dbg_fsbuild("pass 1 starting\n");
        c->flags |= JFFS2_SB_FLAG_BUILDING;
        /* Now scan the directory tree, increasing nlink according to every dirent found. */

-Index: linux-2.6.23-rc6/fs/jffs2/scan.c
+Index: linux-2.6.24.7/fs/jffs2/scan.c

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/fs/jffs2/scan.c      2007-09-21 16:23:52.000000000 +0800
-+++ linux-2.6.23-rc6/fs/jffs2/scan.c   2007-09-21 16:24:05.000000000 +0800
-@@ -142,9 +142,12 @@
+--- linux-2.6.24.7.orig/fs/jffs2/scan.c
++++ linux-2.6.24.7/fs/jffs2/scan.c
+@@ -142,9 +142,12 @@ int jffs2_scan_medium(struct jffs2_sb_in

  
                /* reset summary info for next eraseblock scan */
                jffs2_sum_reset_collected(s);
  
                /* reset summary info for next eraseblock scan */
                jffs2_sum_reset_collected(s);


@@ -40,7 +40,7 @@ Index: linux-2.6.23-rc6/fs/jffs2/scan.c
  
                if (ret < 0)
                        goto out;
  
                if (ret < 0)
                        goto out;

-@@ -545,6 +548,17 @@
+@@ -545,6 +548,17 @@ static int jffs2_scan_eraseblock (struct

                        return err;
        }
  
                        return err;
        }
  

diff --git a/target/linux/generic-2.6/patches-2.6.24/207-powerpc_asm_segment_h.patch b/target/linux/generic-2.6/patches-2.6.24/207-powerpc_asm_segment_h.patch
index 5006286..2837c16 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/207-powerpc_asm_segment_h.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/207-powerpc_asm_segment_h.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.23-rc6/include/asm-powerpc/segment.h
+Index: linux-2.6.24.7/include/asm-powerpc/segment.h

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23-rc6/include/asm-powerpc/segment.h     2007-09-21 16:24:05.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/include/asm-powerpc/segment.h

 @@ -0,0 +1,6 @@
 +#ifndef _ASM_SEGMENT_H
 +#define _ASM_SEGMENT_H
 @@ -0,0 +1,6 @@
 +#ifndef _ASM_SEGMENT_H
 +#define _ASM_SEGMENT_H

diff --git a/target/linux/generic-2.6/patches-2.6.24/208-rtl8110sb_fix.patch b/target/linux/generic-2.6/patches-2.6.24/208-rtl8110sb_fix.patch
index 9bb3f2c..c298dc7 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/208-rtl8110sb_fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/208-rtl8110sb_fix.patch
@@ -1,35 +1,35 @@
-Index: linux-2.6.23/drivers/net/r8169.c
+Index: linux-2.6.24.7/drivers/net/r8169.c

 ===================================================================
 ===================================================================

---- linux-2.6.23.orig/drivers/net/r8169.c      2007-10-10 04:31:38.000000000 +0800
-+++ linux-2.6.23/drivers/net/r8169.c   2007-10-10 13:53:17.000000000 +0800
-@@ -1459,7 +1459,7 @@
+--- linux-2.6.24.7.orig/drivers/net/r8169.c
++++ linux-2.6.24.7/drivers/net/r8169.c
+@@ -1537,7 +1537,7 @@ static const struct rtl_cfg_info {

                .hw_start       = rtl_hw_start_8169,
                .region         = 1,
                .align          = 0,
 -              .intr_event     = SYSErr | LinkChg | RxOverflow |
 +              .intr_event     = LinkChg | RxOverflow |
                                  RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
                .hw_start       = rtl_hw_start_8169,
                .region         = 1,
                .align          = 0,
 -              .intr_event     = SYSErr | LinkChg | RxOverflow |
 +              .intr_event     = LinkChg | RxOverflow |
                                  RxFIFOOver | TxErr | TxOK | RxOK | RxErr,

-               .napi_event     = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow
-       },
-@@ -1467,7 +1467,7 @@
+               .napi_event     = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
+               .msi            = 0
+@@ -1546,7 +1546,7 @@ static const struct rtl_cfg_info {

                .hw_start       = rtl_hw_start_8168,
                .region         = 2,
                .align          = 8,
 -              .intr_event     = SYSErr | LinkChg | RxOverflow |
 +              .intr_event     = LinkChg | RxOverflow |
                                  TxErr | TxOK | RxOK | RxErr,
                .hw_start       = rtl_hw_start_8168,
                .region         = 2,
                .align          = 8,
 -              .intr_event     = SYSErr | LinkChg | RxOverflow |
 +              .intr_event     = LinkChg | RxOverflow |
                                  TxErr | TxOK | RxOK | RxErr,

-               .napi_event     = TxErr | TxOK | RxOK | RxOverflow
-       },
-@@ -1475,7 +1475,7 @@
+               .napi_event     = TxErr | TxOK | RxOK | RxOverflow,
+               .msi            = RTL_FEATURE_MSI
+@@ -1555,7 +1555,7 @@ static const struct rtl_cfg_info {

                .hw_start       = rtl_hw_start_8101,
                .region         = 2,
                .align          = 8,
 -              .intr_event     = SYSErr | LinkChg | RxOverflow | PCSTimeout |
 +              .intr_event     = LinkChg | RxOverflow | PCSTimeout |
                                  RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
                .hw_start       = rtl_hw_start_8101,
                .region         = 2,
                .align          = 8,
 -              .intr_event     = SYSErr | LinkChg | RxOverflow | PCSTimeout |
 +              .intr_event     = LinkChg | RxOverflow | PCSTimeout |
                                  RxFIFOOver | TxErr | TxOK | RxOK | RxErr,

-               .napi_event     = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow
-       }
-@@ -2779,10 +2779,12 @@
+               .napi_event     = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
+               .msi            = RTL_FEATURE_MSI
+@@ -2903,10 +2903,12 @@ static irqreturn_t rtl8169_interrupt(int

                        break;
                }
  
                        break;
                }
  

diff --git a/target/linux/generic-2.6/patches-2.6.24/209-mini_fo.patch b/target/linux/generic-2.6/patches-2.6.24/209-mini_fo.patch
index e99e845..b427f6e 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/209-mini_fo.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/209-mini_fo.patch
@@ -1,10 +1,10 @@
-Index: linux-2.6.23/fs/Kconfig
+Index: linux-2.6.24.7/fs/Kconfig

 ===================================================================
 ===================================================================

---- linux-2.6.23.orig/fs/Kconfig       2007-10-10 13:52:14.000000000 +0800
-+++ linux-2.6.23/fs/Kconfig    2007-10-10 13:53:23.000000000 +0800
-@@ -458,6 +458,9 @@
-         This option will enlarge your kernel, but it allows debugging of
-         ocfs2 filesystem issues.
+--- linux-2.6.24.7.orig/fs/Kconfig
++++ linux-2.6.24.7/fs/Kconfig
+@@ -468,6 +468,9 @@ config OCFS2_DEBUG_FS
+         this option for debugging only as it is likely to decrease
+         performance of the filesystem.

  
 +config MINI_FO
 +      tristate "Mini fanout overlay filesystem"
  
 +config MINI_FO
 +      tristate "Mini fanout overlay filesystem"


@@ -12,22 +12,22 @@ Index: linux-2.6.23/fs/Kconfig
  config MINIX_FS
        tristate "Minix fs support"
        help
  config MINIX_FS
        tristate "Minix fs support"
        help

-Index: linux-2.6.23/fs/Makefile
+Index: linux-2.6.24.7/fs/Makefile

 ===================================================================
 ===================================================================

---- linux-2.6.23.orig/fs/Makefile      2007-10-10 13:52:14.000000000 +0800
-+++ linux-2.6.23/fs/Makefile   2007-10-10 13:53:23.000000000 +0800
-@@ -76,6 +76,7 @@
- obj-$(CONFIG_RAMFS)           += ramfs/
+--- linux-2.6.24.7.orig/fs/Makefile
++++ linux-2.6.24.7/fs/Makefile
+@@ -76,6 +76,7 @@ obj-$(CONFIG_SQUASHFS)               += squashfs/
+ obj-y                         += ramfs/

  obj-$(CONFIG_HUGETLBFS)               += hugetlbfs/
  obj-$(CONFIG_CODA_FS)         += coda/
 +obj-$(CONFIG_MINI_FO)         += mini_fo/
  obj-$(CONFIG_MINIX_FS)                += minix/
  obj-$(CONFIG_FAT_FS)          += fat/
  obj-$(CONFIG_MSDOS_FS)                += msdos/
  obj-$(CONFIG_HUGETLBFS)               += hugetlbfs/
  obj-$(CONFIG_CODA_FS)         += coda/
 +obj-$(CONFIG_MINI_FO)         += mini_fo/
  obj-$(CONFIG_MINIX_FS)                += minix/
  obj-$(CONFIG_FAT_FS)          += fat/
  obj-$(CONFIG_MSDOS_FS)                += msdos/

-Index: linux-2.6.23/fs/mini_fo/aux.c
+Index: linux-2.6.24.7/fs/mini_fo/aux.c

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/fs/mini_fo/aux.c      2007-10-10 13:53:23.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/fs/mini_fo/aux.c

 @@ -0,0 +1,577 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok
 @@ -0,0 +1,577 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok


@@ -606,10 +606,10 @@ Index: linux-2.6.23/fs/mini_fo/aux.c
 +
 +#endif /* unused */
 +
 +
 +#endif /* unused */
 +

-Index: linux-2.6.23/fs/mini_fo/ChangeLog
+Index: linux-2.6.24.7/fs/mini_fo/ChangeLog

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/fs/mini_fo/ChangeLog  2007-10-10 13:53:23.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/fs/mini_fo/ChangeLog

 @@ -0,0 +1,281 @@
 +2006-01-24  Markus Klotzbuecher  <mk@mary.denx.de>
 +
 @@ -0,0 +1,281 @@
 +2006-01-24  Markus Klotzbuecher  <mk@mary.denx.de>
 +


@@ -892,10 +892,10 @@ Index: linux-2.6.23/fs/mini_fo/ChangeLog
 +      * Implementation of mini_fo_mknod and mini_fo_rename, support
 +          for device files.
 +      
 +      * Implementation of mini_fo_mknod and mini_fo_rename, support
 +          for device files.
 +      

-Index: linux-2.6.23/fs/mini_fo/dentry.c
+Index: linux-2.6.24.7/fs/mini_fo/dentry.c

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/fs/mini_fo/dentry.c   2007-10-10 13:53:23.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/fs/mini_fo/dentry.c

 @@ -0,0 +1,244 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok
 @@ -0,0 +1,244 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok


@@ -1141,10 +1141,10 @@ Index: linux-2.6.23/fs/mini_fo/dentry.c
 +      d_delete:               mini_fo_d_delete,
 +      d_iput:         mini_fo_d_iput,
 +};
 +      d_delete:               mini_fo_d_delete,
 +      d_iput:         mini_fo_d_iput,
 +};

-Index: linux-2.6.23/fs/mini_fo/file.c
+Index: linux-2.6.24.7/fs/mini_fo/file.c

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/fs/mini_fo/file.c     2007-10-10 13:53:23.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/fs/mini_fo/file.c

 @@ -0,0 +1,713 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok
 @@ -0,0 +1,713 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok


@@ -1859,10 +1859,10 @@ Index: linux-2.6.23/fs/mini_fo/file.c
 +              /* not implemented: sendpage */
 +              /* not implemented: get_unmapped_area */
 +      };
 +              /* not implemented: sendpage */
 +              /* not implemented: get_unmapped_area */
 +      };

-Index: linux-2.6.23/fs/mini_fo/fist.h
+Index: linux-2.6.24.7/fs/mini_fo/fist.h

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/fs/mini_fo/fist.h     2007-10-10 13:53:23.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/fs/mini_fo/fist.h

 @@ -0,0 +1,252 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok
 @@ -0,0 +1,252 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok


@@ -2116,10 +2116,10 @@ Index: linux-2.6.23/fs/mini_fo/fist.h
 +# define FIST_IOCTL_SET_DEBUG_VALUE   _IOW(0x15, 2, int)
 +
 +#endif /* not __FIST_H_ */
 +# define FIST_IOCTL_SET_DEBUG_VALUE   _IOW(0x15, 2, int)
 +
 +#endif /* not __FIST_H_ */

-Index: linux-2.6.23/fs/mini_fo/inode.c
+Index: linux-2.6.24.7/fs/mini_fo/inode.c

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/fs/mini_fo/inode.c    2007-10-10 13:53:23.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/fs/mini_fo/inode.c

 @@ -0,0 +1,1564 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok
 @@ -0,0 +1,1564 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok


@@ -3685,10 +3685,10 @@ Index: linux-2.6.23/fs/mini_fo/inode.c
 +              removexattr:    mini_fo_removexattr
 +# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
 +      };
 +              removexattr:    mini_fo_removexattr
 +# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
 +      };

-Index: linux-2.6.23/fs/mini_fo/main.c
+Index: linux-2.6.24.7/fs/mini_fo/main.c

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/fs/mini_fo/main.c     2007-10-10 13:53:23.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/fs/mini_fo/main.c

 @@ -0,0 +1,423 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok
 @@ -0,0 +1,423 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok


@@ -4113,10 +4113,10 @@ Index: linux-2.6.23/fs/mini_fo/main.c
 +
 +module_init(init_mini_fo_fs)
 +module_exit(exit_mini_fo_fs)
 +
 +module_init(init_mini_fo_fs)
 +module_exit(exit_mini_fo_fs)

-Index: linux-2.6.23/fs/mini_fo/Makefile
+Index: linux-2.6.24.7/fs/mini_fo/Makefile

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/fs/mini_fo/Makefile   2007-10-10 13:53:23.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/fs/mini_fo/Makefile

 @@ -0,0 +1,17 @@
 +#
 +# Makefile for mini_fo 2.4 and 2.6 Linux kernels
 @@ -0,0 +1,17 @@
 +#
 +# Makefile for mini_fo 2.4 and 2.6 Linux kernels


@@ -4135,10 +4135,10 @@ Index: linux-2.6.23/fs/mini_fo/Makefile
 +# dependencies
 +${mini_fo-objs}: mini_fo.h fist.h
 +
 +# dependencies
 +${mini_fo-objs}: mini_fo.h fist.h
 +

-Index: linux-2.6.23/fs/mini_fo/meta.c
+Index: linux-2.6.24.7/fs/mini_fo/meta.c

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/fs/mini_fo/meta.c     2007-10-10 13:53:23.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/fs/mini_fo/meta.c

 @@ -0,0 +1,1000 @@
 +/*
 + * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
 @@ -0,0 +1,1000 @@
 +/*
 + * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>


@@ -5140,10 +5140,10 @@ Index: linux-2.6.23/fs/mini_fo/meta.c
 +      return 0;
 +}
 +
 +      return 0;
 +}
 +

-Index: linux-2.6.23/fs/mini_fo/mini_fo.h
+Index: linux-2.6.24.7/fs/mini_fo/mini_fo.h

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/fs/mini_fo/mini_fo.h  2007-10-10 13:53:23.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/fs/mini_fo/mini_fo.h

 @@ -0,0 +1,510 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok
 @@ -0,0 +1,510 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok


@@ -5655,10 +5655,10 @@ Index: linux-2.6.23/fs/mini_fo/mini_fo.h
 +/* ioctls */
 +
 +#endif        /* not __MINI_FO_H_ */
 +/* ioctls */
 +
 +#endif        /* not __MINI_FO_H_ */

-Index: linux-2.6.23/fs/mini_fo/mini_fo-merge
+Index: linux-2.6.24.7/fs/mini_fo/mini_fo-merge

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/fs/mini_fo/mini_fo-merge      2007-10-10 13:53:23.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/fs/mini_fo/mini_fo-merge

 @@ -0,0 +1,180 @@
 +#!/bin/bash
 +#
 @@ -0,0 +1,180 @@
 +#!/bin/bash
 +#


@@ -5840,10 +5840,10 @@ Index: linux-2.6.23/fs/mini_fo/mini_fo-merge
 +#rm $TMP/$SKIP_DEL_LIST 
 +
 +echo "Done!"
 +#rm $TMP/$SKIP_DEL_LIST 
 +
 +echo "Done!"

-Index: linux-2.6.23/fs/mini_fo/mini_fo-overlay
+Index: linux-2.6.24.7/fs/mini_fo/mini_fo-overlay

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/fs/mini_fo/mini_fo-overlay    2007-10-10 13:53:23.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/fs/mini_fo/mini_fo-overlay

 @@ -0,0 +1,130 @@
 +#!/bin/bash
 +#
 @@ -0,0 +1,130 @@
 +#!/bin/bash
 +#


@@ -5975,10 +5975,10 @@ Index: linux-2.6.23/fs/mini_fo/mini_fo-overlay
 +if [ $? -ne 0 ]; then
 +    echo "Error, mounting failed, maybe no permisson to mount?"
 +fi
 +if [ $? -ne 0 ]; then
 +    echo "Error, mounting failed, maybe no permisson to mount?"
 +fi

-Index: linux-2.6.23/fs/mini_fo/mmap.c
+Index: linux-2.6.24.7/fs/mini_fo/mmap.c

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/fs/mini_fo/mmap.c     2007-10-10 13:53:23.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/fs/mini_fo/mmap.c

 @@ -0,0 +1,637 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok
 @@ -0,0 +1,637 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok


@@ -6617,10 +6617,10 @@ Index: linux-2.6.23/fs/mini_fo/mmap.c
 +      print_exit_status(err);
 +      return err;
 +}
 +      print_exit_status(err);
 +      return err;
 +}

-Index: linux-2.6.23/fs/mini_fo/README
+Index: linux-2.6.24.7/fs/mini_fo/README

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/fs/mini_fo/README     2007-10-10 13:53:23.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/fs/mini_fo/README

 @@ -0,0 +1,163 @@
 +README for the mini_fo overlay file system
 +=========================================
 @@ -0,0 +1,163 @@
 +README for the mini_fo overlay file system
 +=========================================


@@ -6785,10 +6785,10 @@ Index: linux-2.6.23/fs/mini_fo/README
 +2 of the License, or (at your option) any later version.
 +
 +
 +2 of the License, or (at your option) any later version.
 +
 +

-Index: linux-2.6.23/fs/mini_fo/RELEASE_NOTES
+Index: linux-2.6.24.7/fs/mini_fo/RELEASE_NOTES

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/fs/mini_fo/RELEASE_NOTES      2007-10-10 13:53:23.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/fs/mini_fo/RELEASE_NOTES

 @@ -0,0 +1,111 @@
 +Release:      mini_fo-0.6.1 (v0-6-1)
 +Date:         21.09.2005
 @@ -0,0 +1,111 @@
 +Release:      mini_fo-0.6.1 (v0-6-1)
 +Date:         21.09.2005


@@ -6901,10 +6901,10 @@ Index: linux-2.6.23/fs/mini_fo/RELEASE_NOTES
 +original state. I hope to fix this someday. Please note that this does
 +not effect the special hard links '.' and '..', that are handled
 +seperately by the lower fs.
 +original state. I hope to fix this someday. Please note that this does
 +not effect the special hard links '.' and '..', that are handled
 +seperately by the lower fs.

-Index: linux-2.6.23/fs/mini_fo/state.c
+Index: linux-2.6.24.7/fs/mini_fo/state.c

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/fs/mini_fo/state.c    2007-10-10 13:53:23.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/fs/mini_fo/state.c

 @@ -0,0 +1,620 @@
 +/*
 + * Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
 @@ -0,0 +1,620 @@
 +/*
 + * Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>


@@ -7526,10 +7526,10 @@ Index: linux-2.6.23/fs/mini_fo/state.c
 +      return err;
 +}
 +
 +      return err;
 +}
 +

-Index: linux-2.6.23/fs/mini_fo/super.c
+Index: linux-2.6.24.7/fs/mini_fo/super.c

 ===================================================================
 ===================================================================

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/fs/mini_fo/super.c    2007-10-10 13:53:23.000000000 +0800
+--- /dev/null
++++ linux-2.6.24.7/fs/mini_fo/super.c

 @@ -0,0 +1,281 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok
 @@ -0,0 +1,281 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok

diff --git a/target/linux/generic-2.6/patches-2.6.24/213-kobject_uevent.patch b/target/linux/generic-2.6/patches-2.6.24/213-kobject_uevent.patch
index a3d5ee2..1733727 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/213-kobject_uevent.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/213-kobject_uevent.patch
@@ -1,6 +1,8 @@
---- linux-2.6.24/lib/kobject_uevent.c  2008-01-24 23:58:37.000000000 +0100
-+++ linux-2.6.24-owrt/lib/kobject_uevent.c     2008-01-28 12:01:41.000000000 +0100
-@@ -27,7 +27,8 @@
+Index: linux-2.6.24.7/lib/kobject_uevent.c
+===================================================================
+--- linux-2.6.24.7.orig/lib/kobject_uevent.c
++++ linux-2.6.24.7/lib/kobject_uevent.c
+@@ -27,7 +27,8 @@ u64 uevent_seqnum;

  char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH;
  static DEFINE_SPINLOCK(sequence_lock);
  #if defined(CONFIG_NET)
  char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH;
  static DEFINE_SPINLOCK(sequence_lock);
  #if defined(CONFIG_NET)


@@ -10,7 +12,7 @@
  #endif
  
  /* the strings here must match the enum in include/linux/kobject.h */
  #endif
  
  /* the strings here must match the enum in include/linux/kobject.h */

-@@ -40,6 +41,18 @@
+@@ -40,6 +41,18 @@ static const char *kobject_actions[] = {

        [KOBJ_OFFLINE] =        "offline",
  };
  
        [KOBJ_OFFLINE] =        "offline",
  };
  


@@ -29,7 +31,7 @@
  /**
   * kobject_action_type - translate action string to numeric type
   *
  /**
   * kobject_action_type - translate action string to numeric type
   *

-@@ -173,9 +186,7 @@
+@@ -173,9 +186,7 @@ int kobject_uevent_env(struct kobject *k

        }
  
        /* we will send an event, so request a new sequence number */
        }
  
        /* we will send an event, so request a new sequence number */

diff --git a/target/linux/generic-2.6/patches-2.6.24/220-sound_kconfig.patch b/target/linux/generic-2.6/patches-2.6.24/220-sound_kconfig.patch
index a7a48f2..012aac3 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/220-sound_kconfig.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/220-sound_kconfig.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23.1/sound/core/Kconfig
+Index: linux-2.6.24.7/sound/core/Kconfig

 ===================================================================
 ===================================================================

---- linux-2.6.23.1.orig/sound/core/Kconfig     2007-11-25 18:14:23.486146184 +0100
-+++ linux-2.6.23.1/sound/core/Kconfig  2007-11-25 18:14:26.474316473 +0100
-@@ -9,7 +9,7 @@
+--- linux-2.6.24.7.orig/sound/core/Kconfig
++++ linux-2.6.24.7/sound/core/Kconfig
+@@ -9,7 +9,7 @@ config SND_PCM

        depends on SND
  
  config SND_HWDEP
        depends on SND
  
  config SND_HWDEP

diff --git a/target/linux/generic-2.6/patches-2.6.24/400-ledtrig_morse.patch b/target/linux/generic-2.6/patches-2.6.24/400-ledtrig_morse.patch
index 780fd34..2ca66d1 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/400-ledtrig_morse.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/400-ledtrig_morse.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23-rc9/drivers/leds/Kconfig
+Index: linux-2.6.24.7/drivers/leds/Kconfig

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc9.orig/drivers/leds/Kconfig 2007-10-02 12:51:05.000000000 +0800
-+++ linux-2.6.23-rc9/drivers/leds/Kconfig      2007-10-03 23:43:31.000000000 +0800
-@@ -133,4 +133,8 @@
+--- linux-2.6.24.7.orig/drivers/leds/Kconfig
++++ linux-2.6.24.7/drivers/leds/Kconfig
+@@ -146,4 +146,8 @@ config LEDS_TRIGGER_HEARTBEAT

          load average.
          If unsure, say Y.
  
          load average.
          If unsure, say Y.
  


@@ -11,11 +11,11 @@ Index: linux-2.6.23-rc9/drivers/leds/Kconfig
 +      depends on LEDS_TRIGGERS
 +
  endif # NEW_LEDS
 +      depends on LEDS_TRIGGERS
 +
  endif # NEW_LEDS

-Index: linux-2.6.23-rc9/drivers/leds/Makefile
+Index: linux-2.6.24.7/drivers/leds/Makefile

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc9.orig/drivers/leds/Makefile        2007-10-02 12:51:05.000000000 +0800
-+++ linux-2.6.23-rc9/drivers/leds/Makefile     2007-10-03 23:42:24.000000000 +0800
-@@ -22,3 +22,4 @@
+--- linux-2.6.24.7.orig/drivers/leds/Makefile
++++ linux-2.6.24.7/drivers/leds/Makefile
+@@ -24,3 +24,4 @@ obj-$(CONFIG_LEDS_CM_X270)              

  obj-$(CONFIG_LEDS_TRIGGER_TIMER)      += ledtrig-timer.o
  obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)   += ledtrig-ide-disk.o
  obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)  += ledtrig-heartbeat.o
  obj-$(CONFIG_LEDS_TRIGGER_TIMER)      += ledtrig-timer.o
  obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)   += ledtrig-ide-disk.o
  obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)  += ledtrig-heartbeat.o

diff --git a/target/linux/generic-2.6/patches-2.6.24/401-led_alix.patch b/target/linux/generic-2.6/patches-2.6.24/401-led_alix.patch
index cb00274..a89e662 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/401-led_alix.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/401-led_alix.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.23.1.orig/drivers/leds/Kconfig linux-2.6.23.1/drivers/leds/Kconfig
---- linux-2.6.23.1.orig/drivers/leds/Kconfig   2007-10-12 12:43:44.000000000 -0400
-+++ linux-2.6.23.1/drivers/leds/Kconfig        2007-10-31 02:36:22.000000000 -0400
-@@ -81,6 +81,12 @@
+Index: linux-2.6.24.7/drivers/leds/Kconfig
+===================================================================
+--- linux-2.6.24.7.orig/drivers/leds/Kconfig
++++ linux-2.6.24.7/drivers/leds/Kconfig
+@@ -81,6 +81,12 @@ config LEDS_WRAP

        help
          This option enables support for the PCEngines WRAP programmable LEDs.
  
        help
          This option enables support for the PCEngines WRAP programmable LEDs.
  


@@ -13,15 +14,16 @@ diff -Nur linux-2.6.23.1.orig/drivers/leds/Kconfig linux-2.6.23.1/drivers/leds/K
 +
  config LEDS_H1940
        tristate "LED Support for iPAQ H1940 device"
 +
  config LEDS_H1940
        tristate "LED Support for iPAQ H1940 device"

-       depends LEDS_CLASS && ARCH_H1940
-diff -Nur linux-2.6.23.1.orig/drivers/leds/Makefile linux-2.6.23.1/drivers/leds/Makefile
---- linux-2.6.23.1.orig/drivers/leds/Makefile  2007-10-12 12:43:44.000000000 -0400
-+++ linux-2.6.23.1/drivers/leds/Makefile       2007-10-31 02:36:17.000000000 -0400
-@@ -14,6 +14,7 @@
+       depends on LEDS_CLASS && ARCH_H1940
+Index: linux-2.6.24.7/drivers/leds/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/drivers/leds/Makefile
++++ linux-2.6.24.7/drivers/leds/Makefile
+@@ -14,6 +14,7 @@ obj-$(CONFIG_LEDS_S3C24XX)           += leds-s3c2

  obj-$(CONFIG_LEDS_AMS_DELTA)          += leds-ams-delta.o
  obj-$(CONFIG_LEDS_NET48XX)            += leds-net48xx.o
  obj-$(CONFIG_LEDS_WRAP)                       += leds-wrap.o
 +obj-$(CONFIG_LEDS_ALIX)                       += leds-alix.o
  obj-$(CONFIG_LEDS_H1940)              += leds-h1940.o
  obj-$(CONFIG_LEDS_AMS_DELTA)          += leds-ams-delta.o
  obj-$(CONFIG_LEDS_NET48XX)            += leds-net48xx.o
  obj-$(CONFIG_LEDS_WRAP)                       += leds-wrap.o
 +obj-$(CONFIG_LEDS_ALIX)                       += leds-alix.o
  obj-$(CONFIG_LEDS_H1940)              += leds-h1940.o

- obj-$(CONFIG_LEDS_COBALT)             += leds-cobalt.o
- obj-$(CONFIG_LEDS_GPIO)                       += leds-gpio.o
+ obj-$(CONFIG_LEDS_COBALT_QUBE)                += leds-cobalt-qube.o
+ obj-$(CONFIG_LEDS_COBALT_RAQ)         += leds-cobalt-raq.o

diff --git a/target/linux/generic-2.6/patches-2.6.24/402-ledtrig_default_on.patch b/target/linux/generic-2.6/patches-2.6.24/402-ledtrig_default_on.patch
index a59915c..f666fb0 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/402-ledtrig_default_on.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/402-ledtrig_default_on.patch
@@ -1,7 +1,8 @@
-diff -ur linux-2.6.23.1.orig/drivers/leds/Kconfig linux-2.6.23.1/drivers/leds/Kconfig
---- linux-2.6.23.1.orig/drivers/leds/Kconfig   2007-12-01 00:41:03.000000000 +1300
-+++ linux-2.6.23.1/drivers/leds/Kconfig        2007-12-01 01:26:43.000000000 +1300
-@@ -137,4 +137,11 @@
+Index: linux-2.6.24.7/drivers/leds/Kconfig
+===================================================================
+--- linux-2.6.24.7.orig/drivers/leds/Kconfig
++++ linux-2.6.24.7/drivers/leds/Kconfig
+@@ -156,4 +156,11 @@ config LEDS_TRIGGER_MORSE

        tristate "LED Morse Trigger"
        depends on LEDS_TRIGGERS
  
        tristate "LED Morse Trigger"
        depends on LEDS_TRIGGERS
  


@@ -13,10 +14,11 @@ diff -ur linux-2.6.23.1.orig/drivers/leds/Kconfig linux-2.6.23.1/drivers/leds/Kc
 +        If unsure, say Y.
 +
  endif # NEW_LEDS
 +        If unsure, say Y.
 +
  endif # NEW_LEDS

-diff -ur linux-2.6.23.1.orig/drivers/leds/Makefile linux-2.6.23.1/drivers/leds/Makefile
---- linux-2.6.23.1.orig/drivers/leds/Makefile  2007-12-01 00:41:03.000000000 +1300
-+++ linux-2.6.23.1/drivers/leds/Makefile       2007-12-01 01:27:12.000000000 +1300
-@@ -23,3 +23,4 @@
+Index: linux-2.6.24.7/drivers/leds/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/drivers/leds/Makefile
++++ linux-2.6.24.7/drivers/leds/Makefile
+@@ -26,3 +26,4 @@ obj-$(CONFIG_LEDS_TRIGGER_TIMER)     += ledt

  obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)   += ledtrig-ide-disk.o
  obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)  += ledtrig-heartbeat.o
  obj-$(CONFIG_LEDS_TRIGGER_MORSE)      += ledtrig-morse.o
  obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)   += ledtrig-ide-disk.o
  obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)  += ledtrig-heartbeat.o
  obj-$(CONFIG_LEDS_TRIGGER_MORSE)      += ledtrig-morse.o

diff --git a/target/linux/generic-2.6/patches-2.6.24/403-ds1672_detect.patch b/target/linux/generic-2.6/patches-2.6.24/403-ds1672_detect.patch
index c3eb72c..259257d 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/403-ds1672_detect.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/403-ds1672_detect.patch
@@ -1,5 +1,7 @@
---- linux-2.6.24.5/drivers/rtc/rtc-ds1672.c    2008-04-19 03:53:39.000000000 +0200
-+++ linux-2.6.24.5-owrt/drivers/rtc/rtc-ds1672.c       2008-04-29 22:16:41.000000000 +0200
+Index: linux-2.6.24.7/drivers/rtc/rtc-ds1672.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/rtc/rtc-ds1672.c
++++ linux-2.6.24.7/drivers/rtc/rtc-ds1672.c

 @@ -13,10 +13,10 @@
  #include <linux/i2c.h>
  #include <linux/rtc.h>
 @@ -13,10 +13,10 @@
  #include <linux/i2c.h>
  #include <linux/rtc.h>

diff --git a/target/linux/generic-2.6/patches-2.6.24/410-gpio_buttons.patch b/target/linux/generic-2.6/patches-2.6.24/410-gpio_buttons.patch
index 0395715..153e5f6 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/410-gpio_buttons.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/410-gpio_buttons.patch
@@ -1,6 +1,8 @@
---- linux-2.6.24.2.orig/drivers/input/misc/Kconfig     2007-08-21 06:33:06.000000000 +0200
-+++ linux-2.6.24.2/drivers/input/misc/Kconfig  2007-10-08 10:57:23.000000000 +0200
-@@ -178,4 +178,20 @@
+Index: linux-2.6.24.7/drivers/input/misc/Kconfig
+===================================================================
+--- linux-2.6.24.7.orig/drivers/input/misc/Kconfig
++++ linux-2.6.24.7/drivers/input/misc/Kconfig
+@@ -183,4 +183,20 @@ config HP_SDC_RTC

          Say Y here if you want to support the built-in real time clock
          of the HP SDC controller.
  
          Say Y here if you want to support the built-in real time clock
          of the HP SDC controller.
  


@@ -21,9 +23,11 @@
 +        module will be called gpio-buttons.
 +
  endif
 +        module will be called gpio-buttons.
 +
  endif

---- linux-2.6.24.2.orig/drivers/input/misc/Makefile    2007-08-21 06:33:06.000000000 +0200
-+++ linux-2.6.24.2/drivers/input/misc/Makefile 2007-10-08 10:50:12.000000000 +0200
-@@ -18,3 +18,4 @@
+Index: linux-2.6.24.7/drivers/input/misc/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/drivers/input/misc/Makefile
++++ linux-2.6.24.7/drivers/input/misc/Makefile
+@@ -18,3 +18,4 @@ obj-$(CONFIG_INPUT_POWERMATE)                += powerm

  obj-$(CONFIG_INPUT_YEALINK)           += yealink.o
  obj-$(CONFIG_HP_SDC_RTC)              += hp_sdc_rtc.o
  obj-$(CONFIG_INPUT_UINPUT)            += uinput.o
  obj-$(CONFIG_INPUT_YEALINK)           += yealink.o
  obj-$(CONFIG_HP_SDC_RTC)              += hp_sdc_rtc.o
  obj-$(CONFIG_INPUT_UINPUT)            += uinput.o

diff --git a/target/linux/generic-2.6/patches-2.6.24/510-Yaffs.patch b/target/linux/generic-2.6/patches-2.6.24/510-Yaffs.patch
index 4f5894c..47f470a 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/510-Yaffs.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/510-Yaffs.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23-rc6/fs/Kconfig
+Index: linux-2.6.24.7/fs/Kconfig

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/fs/Kconfig   2007-09-21 16:24:06.000000000 +0800
-+++ linux-2.6.23-rc6/fs/Kconfig        2007-09-21 16:24:08.000000000 +0800
-@@ -419,6 +419,7 @@
+--- linux-2.6.24.7.orig/fs/Kconfig
++++ linux-2.6.24.7/fs/Kconfig
+@@ -420,6 +420,7 @@ config FS_POSIX_ACL

  
  source "fs/xfs/Kconfig"
  source "fs/gfs2/Kconfig"
  
  source "fs/xfs/Kconfig"
  source "fs/gfs2/Kconfig"


@@ -10,11 +10,11 @@ Index: linux-2.6.23-rc6/fs/Kconfig
  
  config OCFS2_FS
        tristate "OCFS2 file system support"
  
  config OCFS2_FS
        tristate "OCFS2 file system support"

-Index: linux-2.6.23-rc6/fs/Makefile
+Index: linux-2.6.24.7/fs/Makefile

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/fs/Makefile  2007-09-21 16:24:06.000000000 +0800
-+++ linux-2.6.23-rc6/fs/Makefile       2007-09-21 16:24:08.000000000 +0800
-@@ -120,3 +120,4 @@
+--- linux-2.6.24.7.orig/fs/Makefile
++++ linux-2.6.24.7/fs/Makefile
+@@ -120,3 +120,4 @@ obj-$(CONFIG_HPPFS)                += hppfs/

  obj-$(CONFIG_DEBUG_FS)                += debugfs/
  obj-$(CONFIG_OCFS2_FS)                += ocfs2/
  obj-$(CONFIG_GFS2_FS)           += gfs2/
  obj-$(CONFIG_DEBUG_FS)                += debugfs/
  obj-$(CONFIG_OCFS2_FS)                += ocfs2/
  obj-$(CONFIG_GFS2_FS)           += gfs2/

diff --git a/target/linux/generic-2.6/patches-2.6.24/600-phy_extension.patch b/target/linux/generic-2.6/patches-2.6.24/600-phy_extension.patch
index 8261d4a..b63b92b 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/600-phy_extension.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/600-phy_extension.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23/drivers/net/phy/phy.c
+Index: linux-2.6.24.7/drivers/net/phy/phy.c

 ===================================================================
 ===================================================================

---- linux-2.6.23.orig/drivers/net/phy/phy.c    2007-10-14 00:05:26.000000000 +0200
-+++ linux-2.6.23/drivers/net/phy/phy.c 2007-10-14 00:44:21.000000000 +0200
-@@ -344,6 +344,50 @@
+--- linux-2.6.24.7.orig/drivers/net/phy/phy.c
++++ linux-2.6.24.7/drivers/net/phy/phy.c
+@@ -345,6 +345,50 @@ int phy_ethtool_gset(struct phy_device *

  }
  EXPORT_SYMBOL(phy_ethtool_gset);
  
  }
  EXPORT_SYMBOL(phy_ethtool_gset);
  


@@ -53,11 +53,11 @@ Index: linux-2.6.23/drivers/net/phy/phy.c
  /**
   * phy_mii_ioctl - generic PHY MII ioctl interface
   * @phydev: the phy_device struct
  /**
   * phy_mii_ioctl - generic PHY MII ioctl interface
   * @phydev: the phy_device struct

-Index: linux-2.6.23/include/linux/phy.h
+Index: linux-2.6.24.7/include/linux/phy.h

 ===================================================================
 ===================================================================

---- linux-2.6.23.orig/include/linux/phy.h      2007-10-14 00:05:15.000000000 +0200
-+++ linux-2.6.23/include/linux/phy.h   2007-10-14 00:18:54.000000000 +0200
-@@ -393,6 +393,7 @@
+--- linux-2.6.24.7.orig/include/linux/phy.h
++++ linux-2.6.24.7/include/linux/phy.h
+@@ -398,6 +398,7 @@ void phy_start_machine(struct phy_device

  void phy_stop_machine(struct phy_device *phydev);
  int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
  int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
  void phy_stop_machine(struct phy_device *phydev);
  int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
  int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);

diff --git a/target/linux/generic-2.6/patches-2.6.24/601-br2684-routed-support.patch b/target/linux/generic-2.6/patches-2.6.24/601-br2684-routed-support.patch
index 88a27f3..e53671a 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/601-br2684-routed-support.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/601-br2684-routed-support.patch
@@ -1,6 +1,7 @@
-diff -Nur linux-2.6.24.2/include/linux/atmbr2684.h linux-2.6.24.2-copy/include/linux/atmbr2684.h
---- linux-2.6.24.2/include/linux/atmbr2684.h   2008-02-11 05:51:11.000000000 +0000
-+++ linux-2.6.24.2-copy/include/linux/atmbr2684.h      2008-03-27 01:08:42.000000000 +0000
+Index: linux-2.6.24.7/include/linux/atmbr2684.h
+===================================================================
+--- linux-2.6.24.7.orig/include/linux/atmbr2684.h
++++ linux-2.6.24.7/include/linux/atmbr2684.h

 @@ -14,6 +14,9 @@
  #define BR2684_MEDIA_FDDI     (3)
  #define BR2684_MEDIA_802_6    (4)     /* 802.6 */
 @@ -14,6 +14,9 @@
  #define BR2684_MEDIA_FDDI     (3)
  #define BR2684_MEDIA_802_6    (4)     /* 802.6 */


@@ -38,7 +39,7 @@ diff -Nur linux-2.6.24.2/include/linux/atmbr2684.h linux-2.6.24.2-copy/include/l
  };
  
  /*
  };
  
  /*

-@@ -55,10 +65,10 @@
+@@ -55,10 +65,10 @@ struct atm_newif_br2684 {

  #define BR2684_FIND_BYNUM     (1)
  #define BR2684_FIND_BYIFNAME  (2)
  struct br2684_if_spec {
  #define BR2684_FIND_BYNUM     (1)
  #define BR2684_FIND_BYIFNAME  (2)
  struct br2684_if_spec {


@@ -52,7 +53,7 @@ diff -Nur linux-2.6.24.2/include/linux/atmbr2684.h linux-2.6.24.2-copy/include/l
        } spec;
  };
  
        } spec;
  };
  

-@@ -68,16 +78,16 @@
+@@ -68,16 +78,16 @@ struct br2684_if_spec {

   * is per-backend specific
   */
  struct atm_backend_br2684 {
   * is per-backend specific
   */
  struct atm_backend_br2684 {


@@ -78,7 +79,7 @@ diff -Nur linux-2.6.24.2/include/linux/atmbr2684.h linux-2.6.24.2-copy/include/l
  };
  
  /*
  };
  
  /*

-@@ -86,8 +96,8 @@
+@@ -86,8 +96,8 @@ struct atm_backend_br2684 {

   * efficient per-if in/out filters, this support will be removed
   */
  struct br2684_filter {
   * efficient per-if in/out filters, this support will be removed
   */
  struct br2684_filter {


@@ -89,7 +90,7 @@ diff -Nur linux-2.6.24.2/include/linux/atmbr2684.h linux-2.6.24.2-copy/include/l
  };
  
  struct br2684_filter_set {
  };
  
  struct br2684_filter_set {

-@@ -95,7 +105,13 @@
+@@ -95,7 +105,13 @@ struct br2684_filter_set {

        struct br2684_filter filter;
  };
  
        struct br2684_filter filter;
  };
  


@@ -103,9 +104,10 @@ diff -Nur linux-2.6.24.2/include/linux/atmbr2684.h linux-2.6.24.2-copy/include/l
  
  #endif /* _LINUX_ATMBR2684_H */
 +
  
  #endif /* _LINUX_ATMBR2684_H */
 +

-diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
---- linux-2.6.24.2/net/atm/br2684.c    2008-02-11 05:51:11.000000000 +0000
-+++ linux-2.6.24.2-copy/net/atm/br2684.c       2008-03-27 03:24:17.000000000 +0000
+Index: linux-2.6.24.7/net/atm/br2684.c
+===================================================================
+--- linux-2.6.24.7.orig/net/atm/br2684.c
++++ linux-2.6.24.7/net/atm/br2684.c

 @@ -1,8 +1,10 @@
  /*
 -Experimental ethernet netdevice using ATM AAL5 as underlying carrier
 @@ -1,8 +1,10 @@
  /*
 -Experimental ethernet netdevice using ATM AAL5 as underlying carrier


@@ -121,7 +123,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
  
  #include <linux/module.h>
  #include <linux/init.h>
  
  #include <linux/module.h>
  #include <linux/init.h>

-@@ -39,21 +41,35 @@
+@@ -39,21 +41,35 @@ static void skb_debug(const struct sk_bu

  #define skb_debug(skb)        do {} while (0)
  #endif
  
  #define skb_debug(skb)        do {} while (0)
  #endif
  


@@ -164,7 +166,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
        enum br2684_encaps encaps;
        struct list_head brvccs;
  #ifdef CONFIG_ATM_BR2684_IPFILTER
        enum br2684_encaps encaps;
        struct list_head brvccs;
  #ifdef CONFIG_ATM_BR2684_IPFILTER

-@@ -66,9 +82,10 @@
+@@ -66,9 +82,10 @@ struct br2684_dev {

        struct net_device *net_dev;
        struct list_head br2684_devs;
        int number;
        struct net_device *net_dev;
        struct list_head br2684_devs;
        int number;


@@ -176,7 +178,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
  };
  
  /*
  };
  
  /*

-@@ -84,7 +101,7 @@
+@@ -84,7 +101,7 @@ static LIST_HEAD(br2684_devs);

  
  static inline struct br2684_dev *BRPRIV(const struct net_device *net_dev)
  {
  
  static inline struct br2684_dev *BRPRIV(const struct net_device *net_dev)
  {


@@ -185,7 +187,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
  }
  
  static inline struct net_device *list_entry_brdev(const struct list_head *le)
  }
  
  static inline struct net_device *list_entry_brdev(const struct list_head *le)

-@@ -94,7 +111,7 @@
+@@ -94,7 +111,7 @@ static inline struct net_device *list_en

  
  static inline struct br2684_vcc *BR2684_VCC(const struct atm_vcc *atmvcc)
  {
  
  static inline struct br2684_vcc *BR2684_VCC(const struct atm_vcc *atmvcc)
  {


@@ -194,7 +196,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
  }
  
  static inline struct br2684_vcc *list_entry_brvcc(const struct list_head *le)
  }
  
  static inline struct br2684_vcc *list_entry_brvcc(const struct list_head *le)

-@@ -132,10 +149,11 @@
+@@ -132,10 +149,11 @@ static struct net_device *br2684_find_de

   * otherwise false
   */
  static int br2684_xmit_vcc(struct sk_buff *skb, struct br2684_dev *brdev,
   * otherwise false
   */
  static int br2684_xmit_vcc(struct sk_buff *skb, struct br2684_dev *brdev,


@@ -207,7 +209,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
        if (skb_headroom(skb) < minheadroom) {
                struct sk_buff *skb2 = skb_realloc_headroom(skb, minheadroom);
                brvcc->copies_needed++;
        if (skb_headroom(skb) < minheadroom) {
                struct sk_buff *skb2 = skb_realloc_headroom(skb, minheadroom);
                brvcc->copies_needed++;

-@@ -146,23 +164,48 @@
+@@ -146,23 +164,48 @@ static int br2684_xmit_vcc(struct sk_buf

                }
                skb = skb2;
        }
                }
                skb = skb2;
        }


@@ -266,7 +268,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
        atomic_add(skb->truesize, &sk_atm(atmvcc)->sk_wmem_alloc);
        ATM_SKB(skb)->atm_options = atmvcc->atm_options;
        brdev->stats.tx_packets++;
        atomic_add(skb->truesize, &sk_atm(atmvcc)->sk_wmem_alloc);
        ATM_SKB(skb)->atm_options = atmvcc->atm_options;
        brdev->stats.tx_packets++;

-@@ -172,10 +215,9 @@
+@@ -172,10 +215,9 @@ static int br2684_xmit_vcc(struct sk_buf

  }
  
  static inline struct br2684_vcc *pick_outgoing_vcc(struct sk_buff *skb,
  }
  
  static inline struct br2684_vcc *pick_outgoing_vcc(struct sk_buff *skb,


@@ -279,7 +281,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
  }
  
  static int br2684_start_xmit(struct sk_buff *skb, struct net_device *dev)
  }
  
  static int br2684_start_xmit(struct sk_buff *skb, struct net_device *dev)

-@@ -199,11 +241,10 @@
+@@ -199,11 +241,10 @@ static int br2684_start_xmit(struct sk_b

                /*
                 * We should probably use netif_*_queue() here, but that
                 * involves added complication.  We need to walk before
                /*
                 * We should probably use netif_*_queue() here, but that
                 * involves added complication.  We need to walk before


@@ -294,7 +296,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
                brdev->stats.tx_errors++;
                brdev->stats.tx_fifo_errors++;
        }
                brdev->stats.tx_errors++;
                brdev->stats.tx_fifo_errors++;
        }

-@@ -217,12 +258,11 @@
+@@ -217,12 +258,11 @@ static struct net_device_stats *br2684_g

        return &BRPRIV(dev)->stats;
  }
  
        return &BRPRIV(dev)->stats;
  }
  


@@ -308,7 +310,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
  static int br2684_mac_addr(struct net_device *dev, void *p)
  {
        int err = my_eth_mac_addr(dev, p);
  static int br2684_mac_addr(struct net_device *dev, void *p)
  {
        int err = my_eth_mac_addr(dev, p);

-@@ -233,7 +273,7 @@
+@@ -233,7 +273,7 @@ static int br2684_mac_addr(struct net_de

  
  #ifdef CONFIG_ATM_BR2684_IPFILTER
  /* this IOCTL is experimental. */
  
  #ifdef CONFIG_ATM_BR2684_IPFILTER
  /* this IOCTL is experimental. */


@@ -317,7 +319,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
  {
        struct br2684_vcc *brvcc;
        struct br2684_filter_set fs;
  {
        struct br2684_vcc *brvcc;
        struct br2684_filter_set fs;

-@@ -243,13 +283,12 @@
+@@ -243,13 +283,12 @@ static int br2684_setfilt(struct atm_vcc

        if (fs.ifspec.method != BR2684_FIND_BYNOTHING) {
                /*
                 * This is really a per-vcc thing, but we can also search
        if (fs.ifspec.method != BR2684_FIND_BYNOTHING) {
                /*
                 * This is really a per-vcc thing, but we can also search


@@ -333,7 +335,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
                        brvcc = NULL;
                else
                        brvcc = list_entry_brvcc(brdev->brvccs.next);
                        brvcc = NULL;
                else
                        brvcc = list_entry_brvcc(brdev->brvccs.next);

-@@ -267,15 +306,16 @@
+@@ -267,15 +306,16 @@ static inline int

  packet_fails_filter(__be16 type, struct br2684_vcc *brvcc, struct sk_buff *skb)
  {
        if (brvcc->filter.netmask == 0)
  packet_fails_filter(__be16 type, struct br2684_vcc *brvcc, struct sk_buff *skb)
  {
        if (brvcc->filter.netmask == 0)


@@ -354,7 +356,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
         */
        return 1;               /* drop */
  }
         */
        return 1;               /* drop */
  }

-@@ -299,7 +339,6 @@
+@@ -299,7 +339,6 @@ static void br2684_push(struct atm_vcc *

        struct br2684_vcc *brvcc = BR2684_VCC(atmvcc);
        struct net_device *net_dev = brvcc->device;
        struct br2684_dev *brdev = BRPRIV(net_dev);
        struct br2684_vcc *brvcc = BR2684_VCC(atmvcc);
        struct net_device *net_dev = brvcc->device;
        struct br2684_dev *brdev = BRPRIV(net_dev);


@@ -362,7 +364,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
  
        pr_debug("br2684_push\n");
  
  
        pr_debug("br2684_push\n");
  

-@@ -320,35 +359,58 @@
+@@ -320,35 +359,58 @@ static void br2684_push(struct atm_vcc *

        atm_return(atmvcc, skb->truesize);
        pr_debug("skb from brdev %p\n", brdev);
        if (brvcc->encaps == e_llc) {
        atm_return(atmvcc, skb->truesize);
        pr_debug("skb from brdev %p\n", brdev);
        if (brvcc->encaps == e_llc) {


@@ -436,7 +438,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
  #ifdef CONFIG_ATM_BR2684_IPFILTER
        if (unlikely(packet_fails_filter(skb->protocol, brvcc, skb))) {
                brdev->stats.rx_dropped++;
  #ifdef CONFIG_ATM_BR2684_IPFILTER
        if (unlikely(packet_fails_filter(skb->protocol, brvcc, skb))) {
                brdev->stats.rx_dropped++;

-@@ -372,11 +434,12 @@
+@@ -372,11 +434,12 @@ static void br2684_push(struct atm_vcc *

        netif_rx(skb);
  }
  
        netif_rx(skb);
  }
  


@@ -453,7 +455,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
        int err;
        struct br2684_vcc *brvcc;
        struct sk_buff *skb;
        int err;
        struct br2684_vcc *brvcc;
        struct sk_buff *skb;

-@@ -395,7 +458,7 @@
+@@ -395,7 +458,7 @@ Note: we do not have explicit unassign, 

        net_dev = br2684_find_dev(&be.ifspec);
        if (net_dev == NULL) {
                printk(KERN_ERR
        net_dev = br2684_find_dev(&be.ifspec);
        if (net_dev == NULL) {
                printk(KERN_ERR


@@ -462,7 +464,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
                err = -ENXIO;
                goto error;
        }
                err = -ENXIO;
                goto error;
        }

-@@ -411,13 +474,15 @@
+@@ -411,13 +474,15 @@ Note: we do not have explicit unassign, 

        }
        if (be.fcs_in != BR2684_FCSIN_NO || be.fcs_out != BR2684_FCSOUT_NO ||
            be.fcs_auto || be.has_vpiid || be.send_padding || (be.encaps !=
        }
        if (be.fcs_in != BR2684_FCSIN_NO || be.fcs_out != BR2684_FCSOUT_NO ||
            be.fcs_auto || be.has_vpiid || be.send_padding || (be.encaps !=


@@ -482,7 +484,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
        if (list_empty(&brdev->brvccs) && !brdev->mac_was_set) {
                unsigned char *esi = atmvcc->dev->esi;
                if (esi[0] | esi[1] | esi[2] | esi[3] | esi[4] | esi[5])
        if (list_empty(&brdev->brvccs) && !brdev->mac_was_set) {
                unsigned char *esi = atmvcc->dev->esi;
                if (esi[0] | esi[1] | esi[2] | esi[3] | esi[4] | esi[5])

-@@ -430,7 +495,7 @@
+@@ -430,7 +495,7 @@ Note: we do not have explicit unassign, 

        brvcc->device = net_dev;
        brvcc->atmvcc = atmvcc;
        atmvcc->user_back = brvcc;
        brvcc->device = net_dev;
        brvcc->atmvcc = atmvcc;
        atmvcc->user_back = brvcc;


@@ -491,7 +493,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
        brvcc->old_push = atmvcc->push;
        barrier();
        atmvcc->push = br2684_push;
        brvcc->old_push = atmvcc->push;
        barrier();
        atmvcc->push = br2684_push;

-@@ -461,7 +526,7 @@
+@@ -461,7 +526,7 @@ Note: we do not have explicit unassign, 

        }
        __module_get(THIS_MODULE);
        return 0;
        }
        __module_get(THIS_MODULE);
        return 0;


@@ -500,7 +502,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
        write_unlock_irq(&devs_lock);
        kfree(brvcc);
        return err;
        write_unlock_irq(&devs_lock);
        kfree(brvcc);
        return err;

-@@ -482,25 +547,52 @@
+@@ -482,25 +547,52 @@ static void br2684_setup(struct net_devi

        INIT_LIST_HEAD(&brdev->brvccs);
  }
  
        INIT_LIST_HEAD(&brdev->brvccs);
  }
  


@@ -555,7 +557,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
        if (!netdev)
                return -ENOMEM;
  
        if (!netdev)
                return -ENOMEM;
  

-@@ -516,6 +608,7 @@
+@@ -516,6 +608,7 @@ static int br2684_create(void __user *ar

        }
  
        write_lock_irq(&devs_lock);
        }
  
        write_lock_irq(&devs_lock);


@@ -563,7 +565,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
        brdev->number = list_empty(&br2684_devs) ? 1 :
            BRPRIV(list_entry_brdev(br2684_devs.prev))->number + 1;
        list_add_tail(&brdev->br2684_devs, &br2684_devs);
        brdev->number = list_empty(&br2684_devs) ? 1 :
            BRPRIV(list_entry_brdev(br2684_devs.prev))->number + 1;
        list_add_tail(&brdev->br2684_devs, &br2684_devs);

-@@ -528,16 +621,16 @@
+@@ -528,16 +621,16 @@ static int br2684_create(void __user *ar

   * -ENOIOCTLCMD for any unrecognized ioctl
   */
  static int br2684_ioctl(struct socket *sock, unsigned int cmd,
   * -ENOIOCTLCMD for any unrecognized ioctl
   */
  static int br2684_ioctl(struct socket *sock, unsigned int cmd,


@@ -584,7 +586,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
                err = get_user(b, (atm_backend_t __user *) argp);
                if (err)
                        return -EFAULT;
                err = get_user(b, (atm_backend_t __user *) argp);
                if (err)
                        return -EFAULT;

-@@ -549,7 +642,6 @@
+@@ -549,7 +642,6 @@ static int br2684_ioctl(struct socket *s

                        return br2684_regvcc(atmvcc, argp);
                else
                        return br2684_create(argp);
                        return br2684_regvcc(atmvcc, argp);
                else
                        return br2684_create(argp);


@@ -592,7 +594,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
  #ifdef CONFIG_ATM_BR2684_IPFILTER
        case BR2684_SETFILT:
                if (atmvcc->push != br2684_push)
  #ifdef CONFIG_ATM_BR2684_IPFILTER
        case BR2684_SETFILT:
                if (atmvcc->push != br2684_push)

-@@ -557,6 +649,7 @@
+@@ -557,6 +649,7 @@ static int br2684_ioctl(struct socket *s

                if (!capable(CAP_NET_ADMIN))
                        return -EPERM;
                err = br2684_setfilt(atmvcc, argp);
                if (!capable(CAP_NET_ADMIN))
                        return -EPERM;
                err = br2684_setfilt(atmvcc, argp);


@@ -600,7 +602,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
                return err;
  #endif /* CONFIG_ATM_BR2684_IPFILTER */
        }
                return err;
  #endif /* CONFIG_ATM_BR2684_IPFILTER */
        }

-@@ -564,24 +657,25 @@
+@@ -564,24 +657,25 @@ static int br2684_ioctl(struct socket *s

  }
  
  static struct atm_ioctl br2684_ioctl_ops = {
  }
  
  static struct atm_ioctl br2684_ioctl_ops = {


@@ -631,7 +633,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
  {
        read_unlock(&devs_lock);
  }
  {
        read_unlock(&devs_lock);
  }

-@@ -589,7 +683,7 @@
+@@ -589,7 +683,7 @@ static void br2684_seq_stop(struct seq_f

  static int br2684_seq_show(struct seq_file *seq, void *v)
  {
        const struct br2684_dev *brdev = list_entry(v, struct br2684_dev,
  static int br2684_seq_show(struct seq_file *seq, void *v)
  {
        const struct br2684_dev *brdev = list_entry(v, struct br2684_dev,


@@ -640,7 +642,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
        const struct net_device *net_dev = brdev->net_dev;
        const struct br2684_vcc *brvcc;
        DECLARE_MAC_BUF(mac);
        const struct net_device *net_dev = brdev->net_dev;
        const struct br2684_vcc *brvcc;
        DECLARE_MAC_BUF(mac);

-@@ -601,21 +695,19 @@
+@@ -601,21 +695,19 @@ static int br2684_seq_show(struct seq_fi

                   brdev->mac_was_set ? "set" : "auto");
  
        list_for_each_entry(brvcc, &brdev->brvccs, brvccs) {
                   brdev->mac_was_set ? "set" : "auto");
  
        list_for_each_entry(brvcc, &brdev->brvccs, brvccs) {


@@ -672,7 +674,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
  #undef bs
  #undef b1
  #endif /* CONFIG_ATM_BR2684_IPFILTER */
  #undef bs
  #undef b1
  #endif /* CONFIG_ATM_BR2684_IPFILTER */

-@@ -625,9 +717,9 @@
+@@ -625,9 +717,9 @@ static int br2684_seq_show(struct seq_fi

  
  static const struct seq_operations br2684_seq_ops = {
        .start = br2684_seq_start,
  
  static const struct seq_operations br2684_seq_ops = {
        .start = br2684_seq_start,


@@ -685,7 +687,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
  };
  
  static int br2684_proc_open(struct inode *inode, struct file *file)
  };
  
  static int br2684_proc_open(struct inode *inode, struct file *file)

-@@ -636,26 +728,28 @@
+@@ -636,26 +728,28 @@ static int br2684_proc_open(struct inode

  }
  
  static const struct file_operations br2684_proc_ops = {
  }
  
  static const struct file_operations br2684_proc_ops = {


@@ -723,7 +725,7 @@ diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
  }
  
  static void __exit br2684_exit(void)
  }
  
  static void __exit br2684_exit(void)

-@@ -689,3 +783,4 @@
+@@ -689,3 +783,4 @@ module_exit(br2684_exit);

  MODULE_AUTHOR("Marcell GAL");
  MODULE_DESCRIPTION("RFC2684 bridged protocols over ATM/AAL5");
  MODULE_LICENSE("GPL");
  MODULE_AUTHOR("Marcell GAL");
  MODULE_DESCRIPTION("RFC2684 bridged protocols over ATM/AAL5");
  MODULE_LICENSE("GPL");

diff --git a/target/linux/generic-2.6/patches-2.6.24/700-powerpc_git.patch b/target/linux/generic-2.6/patches-2.6.24/700-powerpc_git.patch
index d31c2bb..ffaa28f 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/700-powerpc_git.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/700-powerpc_git.patch
@@ -1,7 +1,8 @@
-diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/kernel-parameters.txt powerpc.git/Documentation/kernel-parameters.txt
---- linux-2.6.24/Documentation/kernel-parameters.txt   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/Documentation/kernel-parameters.txt    2008-01-28 20:25:33.000000000 +0100
-@@ -686,6 +686,7 @@
+Index: linux-2.6.24.7/Documentation/kernel-parameters.txt
+===================================================================
+--- linux-2.6.24.7.orig/Documentation/kernel-parameters.txt
++++ linux-2.6.24.7/Documentation/kernel-parameters.txt
+@@ -686,6 +686,7 @@ and is between 256 and 4096 characters. 

                        See Documentation/isdn/README.HiSax.
  
        hugepages=      [HW,X86-32,IA-64] Maximal number of HugeTLB pages.
                        See Documentation/isdn/README.HiSax.
  
        hugepages=      [HW,X86-32,IA-64] Maximal number of HugeTLB pages.


@@ -9,20 +10,22 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/kernel-parameters.txt
  
        i8042.direct    [HW] Put keyboard port into non-translated mode
        i8042.dumbkbd   [HW] Pretend that controller can only read data from
  
        i8042.direct    [HW] Put keyboard port into non-translated mode
        i8042.dumbkbd   [HW] Pretend that controller can only read data from

-diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/00-INDEX powerpc.git/Documentation/powerpc/00-INDEX
---- linux-2.6.24/Documentation/powerpc/00-INDEX        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/Documentation/powerpc/00-INDEX 2008-01-28 20:25:33.000000000 +0100
-@@ -28,3 +28,6 @@
+Index: linux-2.6.24.7/Documentation/powerpc/00-INDEX
+===================================================================
+--- linux-2.6.24.7.orig/Documentation/powerpc/00-INDEX
++++ linux-2.6.24.7/Documentation/powerpc/00-INDEX
+@@ -28,3 +28,6 @@ sound.txt

        - info on sound support under Linux/PPC
  zImage_layout.txt
        - info on the kernel images for Linux/PPC
 +qe_firmware.txt
 +      - describes the layout of firmware binaries for the Freescale QUICC
 +        Engine and the code that parses and uploads the microcode therein.
        - info on sound support under Linux/PPC
  zImage_layout.txt
        - info on the kernel images for Linux/PPC
 +qe_firmware.txt
 +      - describes the layout of firmware binaries for the Freescale QUICC
 +        Engine and the code that parses and uploads the microcode therein.

-diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/booting-without-of.txt powerpc.git/Documentation/powerpc/booting-without-of.txt
---- linux-2.6.24/Documentation/powerpc/booting-without-of.txt  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/Documentation/powerpc/booting-without-of.txt   2008-01-28 20:25:33.000000000 +0100
-@@ -52,7 +52,11 @@
+Index: linux-2.6.24.7/Documentation/powerpc/booting-without-of.txt
+===================================================================
+--- linux-2.6.24.7.orig/Documentation/powerpc/booting-without-of.txt
++++ linux-2.6.24.7/Documentation/powerpc/booting-without-of.txt
+@@ -52,7 +52,11 @@ Table of Contents

        i) Freescale QUICC Engine module (QE)
        j) CFI or JEDEC memory-mapped NOR flash
        k) Global Utilities Block
        i) Freescale QUICC Engine module (QE)
        j) CFI or JEDEC memory-mapped NOR flash
        k) Global Utilities Block


@@ -35,7 +38,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/booting-witho
  
    VII - Specifying interrupt information for devices
      1) interrupts property
  
    VII - Specifying interrupt information for devices
      1) interrupts property

-@@ -671,10 +675,10 @@
+@@ -671,10 +675,10 @@ device or bus to be described by the dev

  
  In general, the format of an address for a device is defined by the
  parent bus type, based on the #address-cells and #size-cells
  
  In general, the format of an address for a device is defined by the
  parent bus type, based on the #address-cells and #size-cells


@@ -50,7 +53,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/booting-witho
  
  Those 2 properties define 'cells' for representing an address and a
  size. A "cell" is a 32-bit number. For example, if both contain 2
  
  Those 2 properties define 'cells' for representing an address and a
  size. A "cell" is a 32-bit number. For example, if both contain 2

-@@ -711,13 +715,14 @@
+@@ -711,13 +715,14 @@ define a bus type with a more complex ad

  like address space bits, you'll have to add a bus translator to the
  prom_parse.c file of the recent kernels for your bus type.
  
  like address space bits, you'll have to add a bus translator to the
  prom_parse.c file of the recent kernels for your bus type.
  


@@ -69,7 +72,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/booting-witho
  
        bus address, parent bus address, size
  
  
        bus address, parent bus address, size
  

-@@ -735,6 +740,10 @@
+@@ -735,6 +740,10 @@ fit in a single 32-bit word.   New 32-bi

  1/1 format, unless the processor supports physical addresses greater
  than 32-bits, in which case a 2/1 format is recommended.
  
  1/1 format, unless the processor supports physical addresses greater
  than 32-bits, in which case a 2/1 format is recommended.
  


@@ -80,7 +83,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/booting-witho
  
  2) Note about "compatible" properties
  -------------------------------------
  
  2) Note about "compatible" properties
  -------------------------------------

-@@ -1218,16 +1227,14 @@
+@@ -1218,16 +1227,14 @@ platforms are moved over to use the flat

  
    Required properties:
      - reg : Offset and length of the register set for the device
  
    Required properties:
      - reg : Offset and length of the register set for the device


@@ -99,7 +102,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/booting-witho
  
                ethernet-phy@0 {
                        ......
  
                ethernet-phy@0 {
                        ......

-@@ -1254,6 +1261,10 @@
+@@ -1254,6 +1261,10 @@ platforms are moved over to use the flat

        services interrupts for this device.
      - phy-handle : The phandle for the PHY connected to this ethernet
        controller.
        services interrupts for this device.
      - phy-handle : The phandle for the PHY connected to this ethernet
        controller.


@@ -110,7 +113,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/booting-witho
  
    Recommended properties:
  
  
    Recommended properties:
  

-@@ -1408,7 +1419,6 @@
+@@ -1408,7 +1419,6 @@ platforms are moved over to use the flat

  
     Example multi port host USB controller device node :
        usb@22000 {
  
     Example multi port host USB controller device node :
        usb@22000 {


@@ -118,7 +121,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/booting-witho
                compatible = "fsl-usb2-mph";
                reg = <22000 1000>;
                #address-cells = <1>;
                compatible = "fsl-usb2-mph";
                reg = <22000 1000>;
                #address-cells = <1>;

-@@ -1422,7 +1432,6 @@
+@@ -1422,7 +1432,6 @@ platforms are moved over to use the flat

  
     Example dual role USB controller device node :
        usb@23000 {
  
     Example dual role USB controller device node :
        usb@23000 {


@@ -126,7 +129,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/booting-witho
                compatible = "fsl-usb2-dr";
                reg = <23000 1000>;
                #address-cells = <1>;
                compatible = "fsl-usb2-dr";
                reg = <23000 1000>;
                #address-cells = <1>;

-@@ -1586,7 +1595,6 @@
+@@ -1586,7 +1595,6 @@ platforms are moved over to use the flat

     iii) USB (Universal Serial Bus Controller)
  
     Required properties:
     iii) USB (Universal Serial Bus Controller)
  
     Required properties:


@@ -134,7 +137,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/booting-witho
     - compatible : could be "qe_udc" or "fhci-hcd".
     - mode : the could be "host" or "slave".
     - reg : Offset and length of the register set for the device
     - compatible : could be "qe_udc" or "fhci-hcd".
     - mode : the could be "host" or "slave".
     - reg : Offset and length of the register set for the device

-@@ -1600,7 +1608,6 @@
+@@ -1600,7 +1608,6 @@ platforms are moved over to use the flat

  
     Example(slave):
        usb@6c0 {
  
     Example(slave):
        usb@6c0 {


@@ -142,7 +145,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/booting-witho
                compatible = "qe_udc";
                reg = <6c0 40>;
                interrupts = <8b 0>;
                compatible = "qe_udc";
                reg = <6c0 40>;
                interrupts = <8b 0>;

-@@ -1613,7 +1620,7 @@
+@@ -1613,7 +1620,7 @@ platforms are moved over to use the flat

  
     Required properties:
     - device_type : should be "network", "hldc", "uart", "transparent"
  
     Required properties:
     - device_type : should be "network", "hldc", "uart", "transparent"


@@ -151,7 +154,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/booting-witho
     - compatible : could be "ucc_geth" or "fsl_atm" and so on.
     - model : should be "UCC".
     - device-id : the ucc number(1-8), corresponding to UCCx in UM.
     - compatible : could be "ucc_geth" or "fsl_atm" and so on.
     - model : should be "UCC".
     - device-id : the ucc number(1-8), corresponding to UCCx in UM.

-@@ -1626,6 +1633,26 @@
+@@ -1626,6 +1633,26 @@ platforms are moved over to use the flat

     - interrupt-parent : the phandle for the interrupt controller that
       services interrupts for this device.
     - pio-handle : The phandle for the Parallel I/O port configuration.
     - interrupt-parent : the phandle for the interrupt controller that
       services interrupts for this device.
     - pio-handle : The phandle for the Parallel I/O port configuration.


@@ -178,7 +181,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/booting-witho
     - rx-clock : represents the UCC receive clock source.
       0x00 : clock source is disabled;
       0x1~0x10 : clock source is BRG1~BRG16 respectively;
     - rx-clock : represents the UCC receive clock source.
       0x00 : clock source is disabled;
       0x1~0x10 : clock source is BRG1~BRG16 respectively;

-@@ -1772,6 +1799,32 @@
+@@ -1772,6 +1799,32 @@ platforms are moved over to use the flat

                };
        };
  
                };
        };
  


@@ -211,7 +214,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/booting-witho
     j) CFI or JEDEC memory-mapped NOR flash
  
      Flash chips (Memory Technology Devices) are often used for solid state
     j) CFI or JEDEC memory-mapped NOR flash
  
      Flash chips (Memory Technology Devices) are often used for solid state

-@@ -2075,8 +2128,7 @@
+@@ -2075,8 +2128,7 @@ platforms are moved over to use the flat

  
     Example:
        localbus@f0010100 {
  
     Example:
        localbus@f0010100 {


@@ -221,7 +224,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/booting-witho
                             "fsl,pq2-localbus";
                #address-cells = <2>;
                #size-cells = <1>;
                             "fsl,pq2-localbus";
                #address-cells = <2>;
                #size-cells = <1>;

-@@ -2254,7 +2306,7 @@
+@@ -2254,7 +2306,7 @@ platforms are moved over to use the flat

                           available.
                           For Axon: 0x0000012a
  
                           available.
                           For Axon: 0x0000012a
  


@@ -230,7 +233,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/booting-witho
  
     The Xilinx EDK toolchain ships with a set of IP cores (devices) for use
     in Xilinx Spartan and Virtex FPGAs.  The devices cover the whole range
  
     The Xilinx EDK toolchain ships with a set of IP cores (devices) for use
     in Xilinx Spartan and Virtex FPGAs.  The devices cover the whole range

-@@ -2276,7 +2328,7 @@
+@@ -2276,7 +2328,7 @@ platforms are moved over to use the flat

     properties of the device node.  In general, device nodes for IP-cores
     will take the following form:
  
     properties of the device node.  In general, device nodes for IP-cores
     will take the following form:
  


@@ -239,7 +242,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/booting-witho
                compatible = "xlnx,(ip-core-name)-(HW_VER)"
                             [, (list of compatible devices), ...];
                reg = <(baseaddr) (size)>;
                compatible = "xlnx,(ip-core-name)-(HW_VER)"
                             [, (list of compatible devices), ...];
                reg = <(baseaddr) (size)>;

-@@ -2286,6 +2338,9 @@
+@@ -2286,6 +2338,9 @@ platforms are moved over to use the flat

                xlnx,(parameter2) = <(int-value)>;
        };
  
                xlnx,(parameter2) = <(int-value)>;
        };
  


@@ -249,7 +252,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/booting-witho
        (ip-core-name): the name of the ip block (given after the BEGIN
                        directive in system.mhs).  Should be in lowercase
                        and all underscores '_' converted to dashes '-'.
        (ip-core-name): the name of the ip block (given after the BEGIN
                        directive in system.mhs).  Should be in lowercase
                        and all underscores '_' converted to dashes '-'.

-@@ -2294,9 +2349,9 @@
+@@ -2294,9 +2349,9 @@ platforms are moved over to use the flat

                        dropped from the parameter name, the name is converted
                        to lowercase and all underscore '_' characters are
                        converted to dashes '-'.
                        dropped from the parameter name, the name is converted
                        to lowercase and all underscore '_' characters are
                        converted to dashes '-'.


@@ -261,7 +264,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/booting-witho
  
     Typically, the compatible list will include the exact IP core version
     followed by an older IP core version which implements the same
  
     Typically, the compatible list will include the exact IP core version
     followed by an older IP core version which implements the same

-@@ -2326,11 +2381,11 @@
+@@ -2326,11 +2381,11 @@ platforms are moved over to use the flat

  
     becomes the following device tree node:
  
  
     becomes the following device tree node:
  


@@ -275,7 +278,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/booting-witho
                interrupts = <1 0>; // got this from the opb_intc parameters
                current-speed = <d#115200>;     // standard serial device prop
                clock-frequency = <d#50000000>; // standard serial device prop
                interrupts = <1 0>; // got this from the opb_intc parameters
                current-speed = <d#115200>;     // standard serial device prop
                clock-frequency = <d#50000000>; // standard serial device prop

-@@ -2339,16 +2394,19 @@
+@@ -2339,16 +2394,19 @@ platforms are moved over to use the flat

                xlnx,use-parity = <0>;
        };
  
                xlnx,use-parity = <0>;
        };
  


@@ -305,7 +308,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/booting-witho
  
        BEGIN opb_ps2_dual_ref
                PARAMETER INSTANCE = opb_ps2_dual_ref_0
  
        BEGIN opb_ps2_dual_ref
                PARAMETER INSTANCE = opb_ps2_dual_ref_0

-@@ -2370,21 +2428,24 @@
+@@ -2370,21 +2428,24 @@ platforms are moved over to use the flat

  
     It would result in the following device tree nodes:
  
  
     It would result in the following device tree nodes:
  


@@ -333,7 +336,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/booting-witho
                        interrupts = <3 0>;
                        cell-index = <0>;
                };
                        interrupts = <3 0>;
                        cell-index = <0>;
                };

-@@ -2447,17 +2508,18 @@
+@@ -2447,17 +2508,18 @@ platforms are moved over to use the flat

  
     Gives this device tree (some properties removed for clarity):
  
  
     Gives this device tree (some properties removed for clarity):
  


@@ -355,7 +358,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/booting-witho
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges = <20000000 20000000 20000000
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges = <20000000 20000000 20000000

-@@ -2465,11 +2527,11 @@
+@@ -2465,11 +2527,11 @@ platforms are moved over to use the flat

                                  80000000 80000000 40000000
                                  c0000000 c0000000 20000000>;
  
                                  80000000 80000000 40000000
                                  c0000000 c0000000 20000000>;
  


@@ -369,7 +372,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/booting-witho
                                reg = <d1000fc0 20>;
                        };
                };
                                reg = <d1000fc0 20>;
                        };
                };

-@@ -2514,6 +2576,46 @@
+@@ -2514,6 +2576,46 @@ platforms are moved over to use the flat

        Requred properties:
         - current-speed : Baud rate of uartlite
  
        Requred properties:
         - current-speed : Baud rate of uartlite
  


@@ -416,9 +419,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/booting-witho
     More devices will be defined as this spec matures.
  
  VII - Specifying interrupt information for devices
     More devices will be defined as this spec matures.
  
  VII - Specifying interrupt information for devices

-diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/qe_firmware.txt powerpc.git/Documentation/powerpc/qe_firmware.txt
---- linux-2.6.24/Documentation/powerpc/qe_firmware.txt 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/Documentation/powerpc/qe_firmware.txt  2008-01-28 20:25:33.000000000 +0100
+Index: linux-2.6.24.7/Documentation/powerpc/qe_firmware.txt
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/Documentation/powerpc/qe_firmware.txt

 @@ -0,0 +1,295 @@
 +         Freescale QUICC Engine Firmware Uploading
 +         -----------------------------------------
 @@ -0,0 +1,295 @@
 +         Freescale QUICC Engine Firmware Uploading
 +         -----------------------------------------


@@ -715,10 +719,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/qe_firmware.t
 +
 +A Python program that creates firmware binaries from the header files normally
 +distributed by Freescale can be found on http://opensource.freescale.com.
 +
 +A Python program that creates firmware binaries from the header files normally
 +distributed by Freescale can be found on http://opensource.freescale.com.

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/Kconfig powerpc.git/arch/powerpc/Kconfig
---- linux-2.6.24/arch/powerpc/Kconfig  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/Kconfig   2008-01-28 21:37:04.000000000 +0100
-@@ -140,6 +140,9 @@
+Index: linux-2.6.24.7/arch/powerpc/Kconfig
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/Kconfig
++++ linux-2.6.24.7/arch/powerpc/Kconfig
+@@ -140,6 +140,9 @@ config DEFAULT_UIMAGE

          Used to allow a board to specify it wants a uImage built by default
        default n
  
          Used to allow a board to specify it wants a uImage built by default
        default n
  


@@ -728,7 +733,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/Kconfig powerpc.git/ar
  config PPC64_SWSUSP
        bool
        depends on PPC64 && (BROKEN || (PPC_PMAC64 && EXPERIMENTAL))
  config PPC64_SWSUSP
        bool
        depends on PPC64 && (BROKEN || (PPC_PMAC64 && EXPERIMENTAL))

-@@ -160,11 +163,13 @@
+@@ -160,11 +163,13 @@ config PPC_DCR

  
  config PPC_OF_PLATFORM_PCI
        bool
  
  config PPC_OF_PLATFORM_PCI
        bool


@@ -742,7 +747,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/Kconfig powerpc.git/ar
  source "arch/powerpc/platforms/Kconfig"
  
  menu "Kernel options"
  source "arch/powerpc/platforms/Kconfig"
  
  menu "Kernel options"

-@@ -417,7 +422,7 @@
+@@ -417,7 +422,7 @@ endmenu

  
  config ISA_DMA_API
        bool
  
  config ISA_DMA_API
        bool


@@ -751,7 +756,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/Kconfig powerpc.git/ar
  
  menu "Bus options"
  
  
  menu "Bus options"
  

-@@ -467,7 +472,7 @@
+@@ -467,7 +472,7 @@ config MCA

  config PCI
        bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \
                || PPC_MPC52xx || (EMBEDDED && (PPC_PSERIES || PPC_ISERIES)) \
  config PCI
        bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \
                || PPC_MPC52xx || (EMBEDDED && (PPC_PSERIES || PPC_ISERIES)) \


@@ -760,10 +765,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/Kconfig powerpc.git/ar
        default y if !40x && !CPM2 && !8xx && !PPC_83xx \
                && !PPC_85xx && !PPC_86xx
        default PCI_PERMEDIA if !4xx && !CPM2 && !8xx
        default y if !40x && !CPM2 && !8xx && !PPC_83xx \
                && !PPC_85xx && !PPC_86xx
        default PCI_PERMEDIA if !4xx && !CPM2 && !8xx

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/Kconfig.debug powerpc.git/arch/powerpc/Kconfig.debug
---- linux-2.6.24/arch/powerpc/Kconfig.debug    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/Kconfig.debug     2008-01-28 20:25:49.000000000 +0100
-@@ -151,6 +151,13 @@
+Index: linux-2.6.24.7/arch/powerpc/Kconfig.debug
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/Kconfig.debug
++++ linux-2.6.24.7/arch/powerpc/Kconfig.debug
+@@ -151,6 +151,13 @@ config BOOTX_TEXT

  
  config PPC_EARLY_DEBUG
        bool "Early debugging (dangerous)"
  
  config PPC_EARLY_DEBUG
        bool "Early debugging (dangerous)"


@@ -777,7 +783,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/Kconfig.debug powerpc.
  
  choice
        prompt "Early debugging console"
  
  choice
        prompt "Early debugging console"

-@@ -218,7 +225,16 @@
+@@ -218,7 +225,16 @@ config PPC_EARLY_DEBUG_44x

        depends on 44x
        help
          Select this to enable early debugging for IBM 44x chips via the
        depends on 44x
        help
          Select this to enable early debugging for IBM 44x chips via the


@@ -795,7 +801,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/Kconfig.debug powerpc.
  
  config PPC_EARLY_DEBUG_CPM
        bool "Early serial debugging for Freescale CPM-based serial ports"
  
  config PPC_EARLY_DEBUG_CPM
        bool "Early serial debugging for Freescale CPM-based serial ports"

-@@ -235,12 +251,20 @@
+@@ -235,12 +251,20 @@ config PPC_EARLY_DEBUG_44x_PHYSLOW

        hex "Low 32 bits of early debug UART physical address"
        depends on PPC_EARLY_DEBUG_44x
        default "0x40000200"
        hex "Low 32 bits of early debug UART physical address"
        depends on PPC_EARLY_DEBUG_44x
        default "0x40000200"


@@ -816,10 +822,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/Kconfig.debug powerpc.
  config PPC_EARLY_DEBUG_CPM_ADDR
        hex "CPM UART early debug transmit descriptor address"
        depends on PPC_EARLY_DEBUG_CPM
  config PPC_EARLY_DEBUG_CPM_ADDR
        hex "CPM UART early debug transmit descriptor address"
        depends on PPC_EARLY_DEBUG_CPM

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/Makefile powerpc.git/arch/powerpc/Makefile
---- linux-2.6.24/arch/powerpc/Makefile 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/Makefile  2008-01-28 20:25:49.000000000 +0100
-@@ -167,6 +167,9 @@
+Index: linux-2.6.24.7/arch/powerpc/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/Makefile
++++ linux-2.6.24.7/arch/powerpc/Makefile
+@@ -167,6 +167,9 @@ boot := arch/$(ARCH)/boot

  $(BOOT_TARGETS): vmlinux
        $(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)
  
  $(BOOT_TARGETS): vmlinux
        $(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)
  


@@ -829,9 +836,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/Makefile powerpc.git/a
  define archhelp
    @echo '* zImage          - Compressed kernel image (arch/$(ARCH)/boot/zImage.*)'
    @echo '  install         - Install kernel using'
  define archhelp
    @echo '* zImage          - Compressed kernel image (arch/$(ARCH)/boot/zImage.*)'
    @echo '  install         - Install kernel using'

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/4xx.c powerpc.git/arch/powerpc/boot/4xx.c
---- linux-2.6.24/arch/powerpc/boot/4xx.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/4xx.c        2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/4xx.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/4xx.c
++++ linux-2.6.24.7/arch/powerpc/boot/4xx.c

 @@ -22,16 +22,14 @@
  #include "dcr.h"
  
 @@ -22,16 +22,14 @@
  #include "dcr.h"
  


@@ -851,7 +859,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/4xx.c powerpc.git
                if (bank_config & SDRAM_CONFIG_BANK_ENABLE)
                        memsize += SDRAM_CONFIG_BANK_SIZE(bank_config);
        }
                if (bank_config & SDRAM_CONFIG_BANK_ENABLE)
                        memsize += SDRAM_CONFIG_BANK_SIZE(bank_config);
        }

-@@ -39,6 +37,69 @@
+@@ -39,6 +37,69 @@ void ibm4xx_fixup_memsize(void)

        dt_fixup_memory(0, memsize);
  }
  
        dt_fixup_memory(0, memsize);
  }
  


@@ -921,7 +929,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/4xx.c powerpc.git
  /* 4xx DDR1/2 Denali memory controller support */
  /* DDR0 registers */
  #define DDR0_02                       2
  /* 4xx DDR1/2 Denali memory controller support */
  /* DDR0 registers */
  #define DDR0_02                       2

-@@ -77,19 +138,13 @@
+@@ -77,19 +138,13 @@ void ibm4xx_fixup_memsize(void)

  
  #define DDR_GET_VAL(val, mask, shift) (((val) >> (shift)) & (mask))
  
  
  #define DDR_GET_VAL(val, mask, shift) (((val) >> (shift)) & (mask))
  


@@ -942,7 +950,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/4xx.c powerpc.git
        if (!DDR_GET_VAL(val, DDR_START, DDR_START_SHIFT))
                fatal("DDR controller is not initialized\n");
  
        if (!DDR_GET_VAL(val, DDR_START, DDR_START_SHIFT))
                fatal("DDR controller is not initialized\n");
  

-@@ -99,12 +154,12 @@
+@@ -99,12 +154,12 @@ void ibm4xx_denali_fixup_memsize(void)

        max_row = DDR_GET_VAL(val, DDR_MAX_ROW_REG, DDR_MAX_ROW_REG_SHIFT);
  
        /* get CS value */
        max_row = DDR_GET_VAL(val, DDR_MAX_ROW_REG, DDR_MAX_ROW_REG_SHIFT);
  
        /* get CS value */


@@ -957,7 +965,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/4xx.c powerpc.git
                        cs++;
                val = val >> 1;
        }
                        cs++;
                val = val >> 1;
        }

-@@ -115,15 +170,15 @@
+@@ -115,15 +170,15 @@ void ibm4xx_denali_fixup_memsize(void)

                fatal("DDR wrong CS configuration\n");
  
        /* get data path bytes */
                fatal("DDR wrong CS configuration\n");
  
        /* get data path bytes */


@@ -976,7 +984,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/4xx.c powerpc.git
  
        row = DDR_GET_VAL(val, DDR_APIN, DDR_APIN_SHIFT);
        if (row > max_row)
  
        row = DDR_GET_VAL(val, DDR_APIN, DDR_APIN_SHIFT);
        if (row > max_row)

-@@ -131,7 +186,7 @@
+@@ -131,7 +186,7 @@ void ibm4xx_denali_fixup_memsize(void)

        row = max_row - row;
  
        /* get collomn size and banks */
        row = max_row - row;
  
        /* get collomn size and banks */


@@ -985,7 +993,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/4xx.c powerpc.git
  
        col = DDR_GET_VAL(val, DDR_COL_SZ, DDR_COL_SZ_SHIFT);
        if (col > max_col)
  
        col = DDR_GET_VAL(val, DDR_COL_SZ, DDR_COL_SZ_SHIFT);
        if (col > max_col)

-@@ -179,13 +234,17 @@
+@@ -179,13 +234,17 @@ void ibm40x_dbcr_reset(void)

  #define EMAC_RESET 0x20000000
  void ibm4xx_quiesce_eth(u32 *emac0, u32 *emac1)
  {
  #define EMAC_RESET 0x20000000
  void ibm4xx_quiesce_eth(u32 *emac0, u32 *emac1)
  {


@@ -1004,7 +1012,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/4xx.c powerpc.git
  }
  
  /* Read 4xx EBC bus bridge registers to get mappings of the peripheral
  }
  
  /* Read 4xx EBC bus bridge registers to get mappings of the peripheral

-@@ -217,84 +276,335 @@
+@@ -217,84 +276,335 @@ void ibm4xx_fixup_ebc_ranges(const char 

        setprop(devp, "ranges", ranges, (p - ranges) * sizeof(u32));
  }
  
        setprop(devp, "ranges", ranges, (p - ranges) * sizeof(u32));
  }
  


@@ -1405,9 +1413,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/4xx.c powerpc.git
 -      dt_fixup_clock("/plb/opb/serial@ef600600", uart0);
 +      dt_fixup_clock("/plb/opb/serial@ef600400", uart1);
  }
 -      dt_fixup_clock("/plb/opb/serial@ef600600", uart0);
 +      dt_fixup_clock("/plb/opb/serial@ef600400", uart1);
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/4xx.h powerpc.git/arch/powerpc/boot/4xx.h
---- linux-2.6.24/arch/powerpc/boot/4xx.h       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/4xx.h        2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/4xx.h
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/4xx.h
++++ linux-2.6.24.7/arch/powerpc/boot/4xx.h

 @@ -11,12 +11,22 @@
  #ifndef _POWERPC_BOOT_4XX_H_
  #define _POWERPC_BOOT_4XX_H_
 @@ -11,12 +11,22 @@
  #ifndef _POWERPC_BOOT_4XX_H_
  #define _POWERPC_BOOT_4XX_H_


@@ -1433,10 +1442,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/4xx.h powerpc.git
 +                          unsigned int tmr_clk);
  
  #endif /* _POWERPC_BOOT_4XX_H_ */
 +                          unsigned int tmr_clk);
  
  #endif /* _POWERPC_BOOT_4XX_H_ */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/Makefile powerpc.git/arch/powerpc/boot/Makefile
---- linux-2.6.24/arch/powerpc/boot/Makefile    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/Makefile     2008-01-28 20:25:49.000000000 +0100
-@@ -33,12 +33,15 @@
+Index: linux-2.6.24.7/arch/powerpc/boot/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/Makefile
++++ linux-2.6.24.7/arch/powerpc/boot/Makefile
+@@ -33,12 +33,15 @@ ifeq ($(call cc-option-yn, -fstack-prote

  BOOTCFLAGS    += -fno-stack-protector
  endif
  
  BOOTCFLAGS    += -fno-stack-protector
  endif
  


@@ -1453,7 +1463,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/Makefile powerpc.
  zlib       := inffast.c inflate.c inftrees.c
  zlibheader := inffast.h inffixed.h inflate.h inftrees.h infutil.h
  zliblinuxheader := zlib.h zconf.h zutil.h
  zlib       := inffast.c inflate.c inftrees.c
  zlibheader := inffast.h inffixed.h inflate.h inftrees.h infutil.h
  zliblinuxheader := zlib.h zconf.h zutil.h

-@@ -46,17 +49,21 @@
+@@ -46,17 +49,21 @@ zliblinuxheader := zlib.h zconf.h zutil.

  $(addprefix $(obj)/,$(zlib) gunzip_util.o main.o): \
        $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader))
  
  $(addprefix $(obj)/,$(zlib) gunzip_util.o main.o): \
        $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader))
  


@@ -1478,7 +1488,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/Makefile powerpc.
  src-boot := $(src-wlib) $(src-plat) empty.c
  
  src-boot := $(addprefix $(obj)/, $(src-boot))
  src-boot := $(src-wlib) $(src-plat) empty.c
  
  src-boot := $(addprefix $(obj)/, $(src-boot))

-@@ -101,24 +108,61 @@
+@@ -101,24 +108,61 @@ quiet_cmd_bootar = BOOTAR  $@

        cmd_bootar = $(CROSS32AR) -cr $@.$$$$ $(filter-out FORCE,$^); mv $@.$$$$ $@
  
  $(patsubst %.c,%.o, $(filter %.c, $(src-boot))): %.o: %.c FORCE
        cmd_bootar = $(CROSS32AR) -cr $@.$$$$ $(filter-out FORCE,$^); mv $@.$$$$ $@
  
  $(patsubst %.c,%.o, $(filter %.c, $(src-boot))): %.o: %.c FORCE


@@ -1542,7 +1552,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/Makefile powerpc.
  # Bits for building various flavours of zImage
  
  ifneq ($(CROSS32_COMPILE),)
  # Bits for building various flavours of zImage
  
  ifneq ($(CROSS32_COMPILE),)

-@@ -150,15 +194,26 @@
+@@ -150,15 +194,26 @@ image-$(CONFIG_DEFAULT_UIMAGE)           += uImag

  ifneq ($(CONFIG_DEVICE_TREE),"")
  image-$(CONFIG_PPC_8xx)                       += cuImage.8xx
  image-$(CONFIG_PPC_EP88XC)            += zImage.ep88xc
  ifneq ($(CONFIG_DEVICE_TREE),"")
  image-$(CONFIG_PPC_8xx)                       += cuImage.8xx
  image-$(CONFIG_PPC_EP88XC)            += zImage.ep88xc


@@ -1569,7 +1579,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/Makefile powerpc.
  endif
  
  # For 32-bit powermacs, build the COFF and miboot images
  endif
  
  # For 32-bit powermacs, build the COFF and miboot images

-@@ -243,3 +298,51 @@
+@@ -243,3 +298,51 @@ clean-kernel := vmlinux.strip vmlinux.bi

  clean-kernel += $(addsuffix .gz,$(clean-kernel))
  # If not absolute clean-files are relative to $(obj).
  clean-files += $(addprefix $(objtree)/, $(clean-kernel))
  clean-kernel += $(addsuffix .gz,$(clean-kernel))
  # If not absolute clean-files are relative to $(obj).
  clean-files += $(addprefix $(objtree)/, $(clean-kernel))


@@ -1621,10 +1631,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/Makefile powerpc.
 +
 +$(obj)/bootwrapper_install: $(all-installed)
 +
 +
 +$(obj)/bootwrapper_install: $(all-installed)
 +

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/bamboo.c powerpc.git/arch/powerpc/boot/bamboo.c
---- linux-2.6.24/arch/powerpc/boot/bamboo.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/bamboo.c     2008-01-28 20:25:49.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.6.24.7/arch/powerpc/boot/bamboo.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/bamboo.c
++++ linux-2.6.24.7/arch/powerpc/boot/bamboo.c
+@@ -30,8 +30,8 @@ static void bamboo_fixups(void)

  {
        unsigned long sysclk = 33333333;
  
  {
        unsigned long sysclk = 33333333;
  


@@ -1635,7 +1646,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/bamboo.c powerpc.
        ibm4xx_quiesce_eth((u32 *)0xef600e00, (u32 *)0xef600f00);
        dt_fixup_mac_addresses(bamboo_mac0, bamboo_mac1);
  }
        ibm4xx_quiesce_eth((u32 *)0xef600e00, (u32 *)0xef600f00);
        dt_fixup_mac_addresses(bamboo_mac0, bamboo_mac1);
  }

-@@ -42,6 +42,6 @@
+@@ -42,6 +42,6 @@ void bamboo_init(void *mac0, void *mac1)

        platform_ops.exit = ibm44x_dbcr_reset;
        bamboo_mac0 = mac0;
        bamboo_mac1 = mac1;
        platform_ops.exit = ibm44x_dbcr_reset;
        bamboo_mac0 = mac0;
        bamboo_mac1 = mac1;


@@ -1643,10 +1654,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/bamboo.c powerpc.
 +      fdt_init(_dtb_start);
        serial_console_init();
  }
 +      fdt_init(_dtb_start);
        serial_console_init();
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-52xx.c powerpc.git/arch/powerpc/boot/cuboot-52xx.c
---- linux-2.6.24/arch/powerpc/boot/cuboot-52xx.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/cuboot-52xx.c        2008-01-28 20:25:49.000000000 +0100
-@@ -53,7 +53,7 @@
+Index: linux-2.6.24.7/arch/powerpc/boot/cuboot-52xx.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/cuboot-52xx.c
++++ linux-2.6.24.7/arch/powerpc/boot/cuboot-52xx.c
+@@ -53,7 +53,7 @@ void platform_init(unsigned long r3, uns

                     unsigned long r6, unsigned long r7)
  {
        CUBOOT_INIT();
                     unsigned long r6, unsigned long r7)
  {
        CUBOOT_INIT();


@@ -1655,9 +1667,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-52xx.c pow
        serial_console_init();
        platform_ops.fixups = platform_fixups;
  }
        serial_console_init();
        platform_ops.fixups = platform_fixups;
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-824x.c powerpc.git/arch/powerpc/boot/cuboot-824x.c
---- linux-2.6.24/arch/powerpc/boot/cuboot-824x.c       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/cuboot-824x.c        2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/cuboot-824x.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/cuboot-824x.c

 @@ -0,0 +1,53 @@
 +/*
 + * Old U-boot compatibility for 824x
 @@ -0,0 +1,53 @@
 +/*
 + * Old U-boot compatibility for 824x


@@ -1712,10 +1725,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-824x.c pow
 +      serial_console_init();
 +      platform_ops.fixups = platform_fixups;
 +}
 +      serial_console_init();
 +      platform_ops.fixups = platform_fixups;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-83xx.c powerpc.git/arch/powerpc/boot/cuboot-83xx.c
---- linux-2.6.24/arch/powerpc/boot/cuboot-83xx.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/cuboot-83xx.c        2008-01-28 20:25:49.000000000 +0100
-@@ -24,7 +24,8 @@
+Index: linux-2.6.24.7/arch/powerpc/boot/cuboot-83xx.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/cuboot-83xx.c
++++ linux-2.6.24.7/arch/powerpc/boot/cuboot-83xx.c
+@@ -24,7 +24,8 @@ static void platform_fixups(void)

        void *soc;
  
        dt_fixup_memory(bd.bi_memstart, bd.bi_memsize);
        void *soc;
  
        dt_fixup_memory(bd.bi_memstart, bd.bi_memsize);


@@ -1725,7 +1739,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-83xx.c pow
        dt_fixup_cpu_clocks(bd.bi_intfreq, bd.bi_busfreq / 4, bd.bi_busfreq);
  
        /* Unfortunately, the specific model number is encoded in the
        dt_fixup_cpu_clocks(bd.bi_intfreq, bd.bi_busfreq / 4, bd.bi_busfreq);
  
        /* Unfortunately, the specific model number is encoded in the

-@@ -52,7 +53,7 @@
+@@ -52,7 +53,7 @@ void platform_init(unsigned long r3, uns

                     unsigned long r6, unsigned long r7)
  {
        CUBOOT_INIT();
                     unsigned long r6, unsigned long r7)
  {
        CUBOOT_INIT();


@@ -1734,10 +1748,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-83xx.c pow
        serial_console_init();
        platform_ops.fixups = platform_fixups;
  }
        serial_console_init();
        platform_ops.fixups = platform_fixups;
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-85xx.c powerpc.git/arch/powerpc/boot/cuboot-85xx.c
---- linux-2.6.24/arch/powerpc/boot/cuboot-85xx.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/cuboot-85xx.c        2008-01-28 20:25:49.000000000 +0100
-@@ -24,8 +24,9 @@
+Index: linux-2.6.24.7/arch/powerpc/boot/cuboot-85xx.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/cuboot-85xx.c
++++ linux-2.6.24.7/arch/powerpc/boot/cuboot-85xx.c
+@@ -24,8 +24,9 @@ static void platform_fixups(void)

        void *soc;
  
        dt_fixup_memory(bd.bi_memstart, bd.bi_memsize);
        void *soc;
  
        dt_fixup_memory(bd.bi_memstart, bd.bi_memsize);


@@ -1749,7 +1764,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-85xx.c pow
        dt_fixup_cpu_clocks(bd.bi_intfreq, bd.bi_busfreq / 8, bd.bi_busfreq);
  
        /* Unfortunately, the specific model number is encoded in the
        dt_fixup_cpu_clocks(bd.bi_intfreq, bd.bi_busfreq / 8, bd.bi_busfreq);
  
        /* Unfortunately, the specific model number is encoded in the

-@@ -53,7 +54,7 @@
+@@ -53,7 +54,7 @@ void platform_init(unsigned long r3, uns

                     unsigned long r6, unsigned long r7)
  {
        CUBOOT_INIT();
                     unsigned long r6, unsigned long r7)
  {
        CUBOOT_INIT();


@@ -1758,10 +1773,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-85xx.c pow
        serial_console_init();
        platform_ops.fixups = platform_fixups;
  }
        serial_console_init();
        platform_ops.fixups = platform_fixups;
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-8xx.c powerpc.git/arch/powerpc/boot/cuboot-8xx.c
---- linux-2.6.24/arch/powerpc/boot/cuboot-8xx.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/cuboot-8xx.c 2008-01-28 20:25:49.000000000 +0100
-@@ -41,7 +41,7 @@
+Index: linux-2.6.24.7/arch/powerpc/boot/cuboot-8xx.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/cuboot-8xx.c
++++ linux-2.6.24.7/arch/powerpc/boot/cuboot-8xx.c
+@@ -41,7 +41,7 @@ void platform_init(unsigned long r3, uns

                     unsigned long r6, unsigned long r7)
  {
        CUBOOT_INIT();
                     unsigned long r6, unsigned long r7)
  {
        CUBOOT_INIT();


@@ -1770,10 +1786,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-8xx.c powe
        serial_console_init();
        platform_ops.fixups = platform_fixups;
  }
        serial_console_init();
        platform_ops.fixups = platform_fixups;
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-hpc2.c powerpc.git/arch/powerpc/boot/cuboot-hpc2.c
---- linux-2.6.24/arch/powerpc/boot/cuboot-hpc2.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/cuboot-hpc2.c        2008-01-28 20:25:49.000000000 +0100
-@@ -42,7 +42,7 @@
+Index: linux-2.6.24.7/arch/powerpc/boot/cuboot-hpc2.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/cuboot-hpc2.c
++++ linux-2.6.24.7/arch/powerpc/boot/cuboot-hpc2.c
+@@ -42,7 +42,7 @@ void platform_init(unsigned long r3, uns

                unsigned long r6, unsigned long r7)
  {
        CUBOOT_INIT();
                unsigned long r6, unsigned long r7)
  {
        CUBOOT_INIT();


@@ -1782,9 +1799,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-hpc2.c pow
        serial_console_init();
        platform_ops.fixups = platform_fixups;
  }
        serial_console_init();
        platform_ops.fixups = platform_fixups;
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-katmai.c powerpc.git/arch/powerpc/boot/cuboot-katmai.c
---- linux-2.6.24/arch/powerpc/boot/cuboot-katmai.c     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/cuboot-katmai.c      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/cuboot-katmai.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/cuboot-katmai.c

 @@ -0,0 +1,56 @@
 +/*
 + * Old U-boot compatibility for Katmai
 @@ -0,0 +1,56 @@
 +/*
 + * Old U-boot compatibility for Katmai


@@ -1842,10 +1860,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-katmai.c p
 +      fdt_init(_dtb_start);
 +      serial_console_init();
 +}
 +      fdt_init(_dtb_start);
 +      serial_console_init();
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-pq2.c powerpc.git/arch/powerpc/boot/cuboot-pq2.c
---- linux-2.6.24/arch/powerpc/boot/cuboot-pq2.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/cuboot-pq2.c 2008-01-28 20:25:49.000000000 +0100
-@@ -255,7 +255,7 @@
+Index: linux-2.6.24.7/arch/powerpc/boot/cuboot-pq2.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/cuboot-pq2.c
++++ linux-2.6.24.7/arch/powerpc/boot/cuboot-pq2.c
+@@ -255,7 +255,7 @@ void platform_init(unsigned long r3, uns

                     unsigned long r6, unsigned long r7)
  {
        CUBOOT_INIT();
                     unsigned long r6, unsigned long r7)
  {
        CUBOOT_INIT();


@@ -1854,9 +1873,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-pq2.c powe
        serial_console_init();
        platform_ops.fixups = pq2_platform_fixups;
  }
        serial_console_init();
        platform_ops.fixups = pq2_platform_fixups;
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-rainier.c powerpc.git/arch/powerpc/boot/cuboot-rainier.c
---- linux-2.6.24/arch/powerpc/boot/cuboot-rainier.c    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/cuboot-rainier.c     2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/cuboot-rainier.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/cuboot-rainier.c

 @@ -0,0 +1,56 @@
 +/*
 + * Old U-boot compatibility for Rainier
 @@ -0,0 +1,56 @@
 +/*
 + * Old U-boot compatibility for Rainier


@@ -1914,10 +1934,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-rainier.c
 +      fdt_init(_dtb_start);
 +      serial_console_init();
 +}
 +      fdt_init(_dtb_start);
 +      serial_console_init();
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-sequoia.c powerpc.git/arch/powerpc/boot/cuboot-sequoia.c
---- linux-2.6.24/arch/powerpc/boot/cuboot-sequoia.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/cuboot-sequoia.c     2008-01-28 20:25:49.000000000 +0100
-@@ -39,7 +39,7 @@
+Index: linux-2.6.24.7/arch/powerpc/boot/cuboot-sequoia.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/cuboot-sequoia.c
++++ linux-2.6.24.7/arch/powerpc/boot/cuboot-sequoia.c
+@@ -39,7 +39,7 @@ static void sequoia_fixups(void)

  {
        unsigned long sysclk = 33333333;
  
  {
        unsigned long sysclk = 33333333;
  


@@ -1926,7 +1947,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-sequoia.c
        ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
        ibm4xx_denali_fixup_memsize();
        dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr);
        ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
        ibm4xx_denali_fixup_memsize();
        dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr);

-@@ -51,6 +51,6 @@
+@@ -51,6 +51,6 @@ void platform_init(unsigned long r3, uns

        CUBOOT_INIT();
        platform_ops.fixups = sequoia_fixups;
        platform_ops.exit = ibm44x_dbcr_reset;
        CUBOOT_INIT();
        platform_ops.fixups = sequoia_fixups;
        platform_ops.exit = ibm44x_dbcr_reset;


@@ -1934,9 +1955,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-sequoia.c
 +      fdt_init(_dtb_start);
        serial_console_init();
  }
 +      fdt_init(_dtb_start);
        serial_console_init();
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-taishan.c powerpc.git/arch/powerpc/boot/cuboot-taishan.c
---- linux-2.6.24/arch/powerpc/boot/cuboot-taishan.c    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/cuboot-taishan.c     2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/cuboot-taishan.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/cuboot-taishan.c

 @@ -0,0 +1,54 @@
 +/*
 + * Old U-boot compatibility for Taishan
 @@ -0,0 +1,54 @@
 +/*
 + * Old U-boot compatibility for Taishan


@@ -1992,9 +2014,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-taishan.c
 +      fdt_init(_dtb_start);
 +      serial_console_init();
 +}
 +      fdt_init(_dtb_start);
 +      serial_console_init();
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-warp.c powerpc.git/arch/powerpc/boot/cuboot-warp.c
---- linux-2.6.24/arch/powerpc/boot/cuboot-warp.c       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/cuboot-warp.c        2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/cuboot-warp.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/cuboot-warp.c

 @@ -0,0 +1,39 @@
 +/*
 + * Copyright (c) 2008 PIKA Technologies
 @@ -0,0 +1,39 @@
 +/*
 + * Copyright (c) 2008 PIKA Technologies


@@ -2035,9 +2058,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-warp.c pow
 +      fdt_init(_dtb_start);
 +      serial_console_init();
 +}
 +      fdt_init(_dtb_start);
 +      serial_console_init();
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dcr.h powerpc.git/arch/powerpc/boot/dcr.h
---- linux-2.6.24/arch/powerpc/boot/dcr.h       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dcr.h        2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dcr.h
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/dcr.h
++++ linux-2.6.24.7/arch/powerpc/boot/dcr.h

 @@ -14,12 +14,20 @@
  #define DCRN_SDRAM0_CFGADDR                           0x010
  #define DCRN_SDRAM0_CFGDATA                           0x011
 @@ -14,12 +14,20 @@
  #define DCRN_SDRAM0_CFGADDR                           0x010
  #define DCRN_SDRAM0_CFGDATA                           0x011


@@ -2060,7 +2084,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dcr.h powerpc.git
  
  #define                       SDRAM_CONFIG_BANK_ENABLE        0x00000001
  #define                       SDRAM_CONFIG_SIZE_MASK          0x000e0000
  
  #define                       SDRAM_CONFIG_BANK_ENABLE        0x00000001
  #define                       SDRAM_CONFIG_SIZE_MASK          0x000e0000

-@@ -138,5 +146,54 @@
+@@ -138,5 +146,54 @@ static const unsigned long sdram_bxcr[] 

  #define DCRN_CPC0_PLLMR 0xb0
  #define DCRN_405_CPC0_CR0 0xb1
  #define DCRN_405_CPC0_CR1 0xb2
  #define DCRN_CPC0_PLLMR 0xb0
  #define DCRN_405_CPC0_CR0 0xb1
  #define DCRN_405_CPC0_CR1 0xb2


@@ -2115,10 +2139,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dcr.h powerpc.git
 +
  
  #endif        /* _PPC_BOOT_DCR_H_ */
 +
  
  #endif        /* _PPC_BOOT_DCR_H_ */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/devtree.c powerpc.git/arch/powerpc/boot/devtree.c
---- linux-2.6.24/arch/powerpc/boot/devtree.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/devtree.c    2008-01-28 20:25:49.000000000 +0100
-@@ -88,6 +88,20 @@
+Index: linux-2.6.24.7/arch/powerpc/boot/devtree.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/devtree.c
++++ linux-2.6.24.7/arch/powerpc/boot/devtree.c
+@@ -88,6 +88,20 @@ void dt_fixup_clock(const char *path, u3

        }
  }
  
        }
  }
  


@@ -2139,9 +2164,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/devtree.c powerpc
  void dt_fixup_mac_address(u32 index, const u8 *addr)
  {
        void *devp = find_node_by_prop_value(NULL, "linux,network-index",
  void dt_fixup_mac_address(u32 index, const u8 *addr)
  {
        void *devp = find_node_by_prop_value(NULL, "linux,network-index",

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/Makefile.dtc powerpc.git/arch/powerpc/boot/dtc-src/Makefile.dtc
---- linux-2.6.24/arch/powerpc/boot/dtc-src/Makefile.dtc        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/Makefile.dtc 2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dtc-src/Makefile.dtc
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dtc-src/Makefile.dtc

 @@ -0,0 +1,25 @@
 +# Makefile.dtc
 +#
 @@ -0,0 +1,25 @@
 +# Makefile.dtc
 +#


@@ -2168,9 +2194,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/Makefile.
 +# things, but we supply the dependencies on generated header files explicitly
 +
 +$(addprefix $(DTC_objdir)/,$(DTC_GEN_SRCS:%.c=%.o)): $(addprefix $(DTC_objdir)/,$(DTC_BISON_INCLUDES))
 +# things, but we supply the dependencies on generated header files explicitly
 +
 +$(addprefix $(DTC_objdir)/,$(DTC_GEN_SRCS:%.c=%.o)): $(addprefix $(DTC_objdir)/,$(DTC_BISON_INCLUDES))

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/checks.c powerpc.git/arch/powerpc/boot/dtc-src/checks.c
---- linux-2.6.24/arch/powerpc/boot/dtc-src/checks.c    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/checks.c     2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dtc-src/checks.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dtc-src/checks.c

 @@ -0,0 +1,750 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2007.
 @@ -0,0 +1,750 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2007.


@@ -2922,9 +2949,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/checks.c
 +
 +      return 1;
 +}
 +
 +      return 1;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/data.c powerpc.git/arch/powerpc/boot/dtc-src/data.c
---- linux-2.6.24/arch/powerpc/boot/dtc-src/data.c      1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/data.c       2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dtc-src/data.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dtc-src/data.c

 @@ -0,0 +1,321 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
 @@ -0,0 +1,321 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.


@@ -3247,9 +3275,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/data.c po
 +
 +      return 1;
 +}
 +
 +      return 1;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/dtc-lexer.l powerpc.git/arch/powerpc/boot/dtc-src/dtc-lexer.l
---- linux-2.6.24/arch/powerpc/boot/dtc-src/dtc-lexer.l 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/dtc-lexer.l  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dtc-src/dtc-lexer.l
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dtc-src/dtc-lexer.l

 @@ -0,0 +1,328 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
 @@ -0,0 +1,328 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.


@@ -3579,9 +3608,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/dtc-lexer
 +
 +      return 1;
 +}
 +
 +      return 1;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/dtc-lexer.lex.c_shipped powerpc.git/arch/powerpc/boot/dtc-src/dtc-lexer.lex.c_shipped
---- linux-2.6.24/arch/powerpc/boot/dtc-src/dtc-lexer.lex.c_shipped     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/dtc-lexer.lex.c_shipped      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dtc-src/dtc-lexer.lex.c_shipped
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dtc-src/dtc-lexer.lex.c_shipped

 @@ -0,0 +1,2174 @@
 +#line 2 "dtc-lexer.lex.c"
 +
 @@ -0,0 +1,2174 @@
 +#line 2 "dtc-lexer.lex.c"
 +


@@ -5757,9 +5787,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/dtc-lexer
 +      return 1;
 +}
 +
 +      return 1;
 +}
 +

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/dtc-parser.tab.c_shipped powerpc.git/arch/powerpc/boot/dtc-src/dtc-parser.tab.c_shipped
---- linux-2.6.24/arch/powerpc/boot/dtc-src/dtc-parser.tab.c_shipped    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/dtc-parser.tab.c_shipped     2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dtc-src/dtc-parser.tab.c_shipped
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dtc-src/dtc-parser.tab.c_shipped

 @@ -0,0 +1,1983 @@
 +/* A Bison parser, made by GNU Bison 2.3.  */
 +
 @@ -0,0 +1,1983 @@
 +/* A Bison parser, made by GNU Bison 2.3.  */
 +


@@ -7744,9 +7775,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/dtc-parse
 +      return val;
 +}
 +
 +      return val;
 +}
 +

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/dtc-parser.tab.h_shipped powerpc.git/arch/powerpc/boot/dtc-src/dtc-parser.tab.h_shipped
---- linux-2.6.24/arch/powerpc/boot/dtc-src/dtc-parser.tab.h_shipped    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/dtc-parser.tab.h_shipped     2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dtc-src/dtc-parser.tab.h_shipped
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dtc-src/dtc-parser.tab.h_shipped

 @@ -0,0 +1,111 @@
 +/* A Bison parser, made by GNU Bison 2.3.  */
 +
 @@ -0,0 +1,111 @@
 +/* A Bison parser, made by GNU Bison 2.3.  */
 +


@@ -7859,9 +7891,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/dtc-parse
 +#endif
 +
 +extern YYLTYPE yylloc;
 +#endif
 +
 +extern YYLTYPE yylloc;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/dtc-parser.y powerpc.git/arch/powerpc/boot/dtc-src/dtc-parser.y
---- linux-2.6.24/arch/powerpc/boot/dtc-src/dtc-parser.y        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/dtc-parser.y 2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dtc-src/dtc-parser.y
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dtc-src/dtc-parser.y

 @@ -0,0 +1,336 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
 @@ -0,0 +1,336 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.


@@ -8199,9 +8232,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/dtc-parse
 +              yyerror("bad literal");
 +      return val;
 +}
 +              yyerror("bad literal");
 +      return val;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/dtc.c powerpc.git/arch/powerpc/boot/dtc-src/dtc.c
---- linux-2.6.24/arch/powerpc/boot/dtc-src/dtc.c       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/dtc.c        2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dtc-src/dtc.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dtc-src/dtc.c

 @@ -0,0 +1,231 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
 @@ -0,0 +1,231 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.


@@ -8434,9 +8468,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/dtc.c pow
 +
 +      exit(0);
 +}
 +
 +      exit(0);
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/dtc.h powerpc.git/arch/powerpc/boot/dtc-src/dtc.h
---- linux-2.6.24/arch/powerpc/boot/dtc-src/dtc.h       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/dtc.h        2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dtc-src/dtc.h
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dtc-src/dtc.h

 @@ -0,0 +1,269 @@
 +#ifndef _DTC_H
 +#define _DTC_H
 @@ -0,0 +1,269 @@
 +#ifndef _DTC_H
 +#define _DTC_H


@@ -8707,9 +8742,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/dtc.h pow
 +void fill_fullpaths(struct node *tree, const char *prefix);
 +
 +#endif /* _DTC_H */
 +void fill_fullpaths(struct node *tree, const char *prefix);
 +
 +#endif /* _DTC_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/flattree.c powerpc.git/arch/powerpc/boot/dtc-src/flattree.c
---- linux-2.6.24/arch/powerpc/boot/dtc-src/flattree.c  1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/flattree.c   2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dtc-src/flattree.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dtc-src/flattree.c

 @@ -0,0 +1,968 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
 @@ -0,0 +1,968 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.


@@ -9679,9 +9715,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/flattree.
 +
 +      return build_boot_info(reservelist, tree);
 +}
 +
 +      return build_boot_info(reservelist, tree);
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/fstree.c powerpc.git/arch/powerpc/boot/dtc-src/fstree.c
---- linux-2.6.24/arch/powerpc/boot/dtc-src/fstree.c    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/fstree.c     2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dtc-src/fstree.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dtc-src/fstree.c

 @@ -0,0 +1,94 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
 @@ -0,0 +1,94 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.


@@ -9777,9 +9814,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/fstree.c
 +      return build_boot_info(NULL, tree);
 +}
 +
 +      return build_boot_info(NULL, tree);
 +}
 +

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/livetree.c powerpc.git/arch/powerpc/boot/dtc-src/livetree.c
---- linux-2.6.24/arch/powerpc/boot/dtc-src/livetree.c  1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/livetree.c   2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dtc-src/livetree.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dtc-src/livetree.c

 @@ -0,0 +1,305 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
 @@ -0,0 +1,305 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.


@@ -10086,9 +10124,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/livetree.
 +
 +      return node->phandle;
 +}
 +
 +      return node->phandle;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/srcpos.c powerpc.git/arch/powerpc/boot/dtc-src/srcpos.c
---- linux-2.6.24/arch/powerpc/boot/dtc-src/srcpos.c    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/srcpos.c     2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dtc-src/srcpos.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dtc-src/srcpos.c

 @@ -0,0 +1,105 @@
 +/*
 + * Copyright 2007 Jon Loeliger, Freescale Semiconductor, Inc.
 @@ -0,0 +1,105 @@
 +/*
 + * Copyright 2007 Jon Loeliger, Freescale Semiconductor, Inc.


@@ -10195,9 +10234,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/srcpos.c
 +{
 +      return srcpos_filename_for_num(srcpos_filenum);
 +}
 +{
 +      return srcpos_filename_for_num(srcpos_filenum);
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/srcpos.h powerpc.git/arch/powerpc/boot/dtc-src/srcpos.h
---- linux-2.6.24/arch/powerpc/boot/dtc-src/srcpos.h    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/srcpos.h     2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dtc-src/srcpos.h
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dtc-src/srcpos.h

 @@ -0,0 +1,75 @@
 +/*
 + * Copyright 2007 Jon Loeliger, Freescale Semiconductor, Inc.
 @@ -0,0 +1,75 @@
 +/*
 + * Copyright 2007 Jon Loeliger, Freescale Semiconductor, Inc.


@@ -10274,9 +10314,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/srcpos.h
 +extern int lookup_file_name(const char *fname, int add_it);
 +extern const char *srcpos_filename_for_num(int filenum);
 +const char *srcpos_get_filename(void);
 +extern int lookup_file_name(const char *fname, int add_it);
 +extern const char *srcpos_filename_for_num(int filenum);
 +const char *srcpos_get_filename(void);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/treesource.c powerpc.git/arch/powerpc/boot/dtc-src/treesource.c
---- linux-2.6.24/arch/powerpc/boot/dtc-src/treesource.c        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/treesource.c 2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dtc-src/treesource.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dtc-src/treesource.c

 @@ -0,0 +1,275 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
 @@ -0,0 +1,275 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.


@@ -10553,14 +10594,16 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/treesourc
 +      write_tree_source_node(f, bi->dt, 0);
 +}
 +
 +      write_tree_source_node(f, bi->dt, 0);
 +}
 +

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/version_gen.h powerpc.git/arch/powerpc/boot/dtc-src/version_gen.h
---- linux-2.6.24/arch/powerpc/boot/dtc-src/version_gen.h       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/version_gen.h        2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dtc-src/version_gen.h
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dtc-src/version_gen.h

 @@ -0,0 +1 @@
 +#define DTC_VERSION "DTC 1.0.0-gd6f9b62f"
 @@ -0,0 +1 @@
 +#define DTC_VERSION "DTC 1.0.0-gd6f9b62f"

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/adder875-redboot.dts powerpc.git/arch/powerpc/boot/dts/adder875-redboot.dts
---- linux-2.6.24/arch/powerpc/boot/dts/adder875-redboot.dts    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/adder875-redboot.dts     2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/adder875-redboot.dts
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dts/adder875-redboot.dts

 @@ -0,0 +1,184 @@
 +/*
 + * Device Tree Source for MPC885 ADS running RedBoot
 @@ -0,0 +1,184 @@
 +/*
 + * Device Tree Source for MPC885 ADS running RedBoot


@@ -10746,9 +10789,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/adder875-redb
 +              linux,stdout-path = &console;
 +      };
 +};
 +              linux,stdout-path = &console;
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/adder875-uboot.dts powerpc.git/arch/powerpc/boot/dts/adder875-uboot.dts
---- linux-2.6.24/arch/powerpc/boot/dts/adder875-uboot.dts      1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/adder875-uboot.dts       2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/adder875-uboot.dts
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dts/adder875-uboot.dts

 @@ -0,0 +1,183 @@
 +/*
 + * Device Tree Source for MPC885 ADS running U-Boot
 @@ -0,0 +1,183 @@
 +/*
 + * Device Tree Source for MPC885 ADS running U-Boot


@@ -10933,9 +10977,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/adder875-uboo
 +              linux,stdout-path = &console;
 +      };
 +};
 +              linux,stdout-path = &console;
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/bamboo.dts powerpc.git/arch/powerpc/boot/dts/bamboo.dts
---- linux-2.6.24/arch/powerpc/boot/dts/bamboo.dts      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/bamboo.dts       2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/bamboo.dts
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/dts/bamboo.dts
++++ linux-2.6.24.7/arch/powerpc/boot/dts/bamboo.dts

 @@ -16,14 +16,24 @@
        #size-cells = <1>;
        model = "amcc,bamboo";
 @@ -16,14 +16,24 @@
        #size-cells = <1>;
        model = "amcc,bamboo";


@@ -11029,9 +11074,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/bamboo.dts po
 -              bootargs = "console=ttyS0,115200";
        };
  };
 -              bootargs = "console=ttyS0,115200";
        };
  };

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/cm5200.dts powerpc.git/arch/powerpc/boot/dts/cm5200.dts
---- linux-2.6.24/arch/powerpc/boot/dts/cm5200.dts      1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/cm5200.dts       2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/cm5200.dts
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dts/cm5200.dts

 @@ -0,0 +1,236 @@
 +/*
 + * CM5200 board Device Tree Source
 @@ -0,0 +1,236 @@
 +/*
 + * CM5200 board Device Tree Source


@@ -11269,9 +11315,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/cm5200.dts po
 +              };
 +      };
 +};
 +              };
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/ebony.dts powerpc.git/arch/powerpc/boot/dts/ebony.dts
---- linux-2.6.24/arch/powerpc/boot/dts/ebony.dts       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/ebony.dts        2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/ebony.dts
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/dts/ebony.dts
++++ linux-2.6.24.7/arch/powerpc/boot/dts/ebony.dts

 @@ -16,14 +16,22 @@
        #size-cells = <1>;
        model = "ibm,ebony";
 @@ -16,14 +16,22 @@
        #size-cells = <1>;
        model = "ibm,ebony";


@@ -11359,9 +11406,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/ebony.dts pow
                };
        };
  
                };
        };
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/ep405.dts powerpc.git/arch/powerpc/boot/dts/ep405.dts
---- linux-2.6.24/arch/powerpc/boot/dts/ep405.dts       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/ep405.dts        2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/ep405.dts
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dts/ep405.dts

 @@ -0,0 +1,228 @@
 +/*
 + * Device Tree Source for EP405
 @@ -0,0 +1,228 @@
 +/*
 + * Device Tree Source for EP405


@@ -11591,9 +11639,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/ep405.dts pow
 +              linux,stdout-path = "/plb/opb/serial@ef600300";
 +      };
 +};
 +              linux,stdout-path = "/plb/opb/serial@ef600300";
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/ep8248e.dts powerpc.git/arch/powerpc/boot/dts/ep8248e.dts
---- linux-2.6.24/arch/powerpc/boot/dts/ep8248e.dts     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/ep8248e.dts      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/ep8248e.dts
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dts/ep8248e.dts

 @@ -0,0 +1,207 @@
 +/*
 + * Device Tree for the Embedded Planet EP8248E board running PlanetCore.
 @@ -0,0 +1,207 @@
 +/*
 + * Device Tree for the Embedded Planet EP8248E board running PlanetCore.


@@ -11802,9 +11851,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/ep8248e.dts p
 +              };
 +      };
 +};
 +              };
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/haleakala.dts powerpc.git/arch/powerpc/boot/dts/haleakala.dts
---- linux-2.6.24/arch/powerpc/boot/dts/haleakala.dts   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/haleakala.dts    2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/haleakala.dts
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dts/haleakala.dts

 @@ -0,0 +1,274 @@
 +/*
 + * Device Tree Source for AMCC Haleakala (405EXr)
 @@ -0,0 +1,274 @@
 +/*
 + * Device Tree Source for AMCC Haleakala (405EXr)


@@ -12080,9 +12130,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/haleakala.dts
 +              };
 +      };
 +};
 +              };
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/katmai.dts powerpc.git/arch/powerpc/boot/dts/katmai.dts
---- linux-2.6.24/arch/powerpc/boot/dts/katmai.dts      1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/katmai.dts       2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/katmai.dts
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dts/katmai.dts

 @@ -0,0 +1,400 @@
 +/*
 + * Device Tree Source for AMCC Katmai eval board
 @@ -0,0 +1,400 @@
 +/*
 + * Device Tree Source for AMCC Katmai eval board


@@ -12484,9 +12535,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/katmai.dts po
 +              linux,stdout-path = "/plb/opb/serial@10000200";
 +      };
 +};
 +              linux,stdout-path = "/plb/opb/serial@10000200";
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/kilauea.dts powerpc.git/arch/powerpc/boot/dts/kilauea.dts
---- linux-2.6.24/arch/powerpc/boot/dts/kilauea.dts     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/kilauea.dts      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/kilauea.dts
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/dts/kilauea.dts
++++ linux-2.6.24.7/arch/powerpc/boot/dts/kilauea.dts

 @@ -13,14 +13,22 @@
        #size-cells = <1>;
        model = "amcc,kilauea";
 @@ -13,14 +13,22 @@
        #size-cells = <1>;
        model = "amcc,kilauea";


@@ -12621,10 +12673,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/kilauea.dts p
 +              };
        };
  };
 +              };
        };
  };

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/kuroboxHD.dts powerpc.git/arch/powerpc/boot/dts/kuroboxHD.dts
---- linux-2.6.24/arch/powerpc/boot/dts/kuroboxHD.dts   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/kuroboxHD.dts    2008-01-28 20:25:49.000000000 +0100
-@@ -23,6 +23,12 @@
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/kuroboxHD.dts
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/dts/kuroboxHD.dts
++++ linux-2.6.24.7/arch/powerpc/boot/dts/kuroboxHD.dts
+@@ -23,6 +23,12 @@ XXXX add flash parts, rtc, ??

        #address-cells = <1>;
        #size-cells = <1>;
  
        #address-cells = <1>;
        #size-cells = <1>;
  


@@ -12637,7 +12690,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/kuroboxHD.dts
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;

-@@ -60,7 +66,7 @@
+@@ -60,7 +66,7 @@ XXXX add flash parts, rtc, ??

                i2c@80003000 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                i2c@80003000 {
                        #address-cells = <1>;
                        #size-cells = <0>;


@@ -12646,7 +12699,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/kuroboxHD.dts
                        compatible = "fsl-i2c";
                        reg = <80003000 1000>;
                        interrupts = <5 2>;
                        compatible = "fsl-i2c";
                        reg = <80003000 1000>;
                        interrupts = <5 2>;

-@@ -73,7 +79,8 @@
+@@ -73,7 +79,8 @@ XXXX add flash parts, rtc, ??

                        };
                };
  
                        };
                };
  


@@ -12656,7 +12709,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/kuroboxHD.dts
                        device_type = "serial";
                        compatible = "ns16550";
                        reg = <80004500 8>;
                        device_type = "serial";
                        compatible = "ns16550";
                        reg = <80004500 8>;

-@@ -83,7 +90,8 @@
+@@ -83,7 +90,8 @@ XXXX add flash parts, rtc, ??

                        interrupt-parent = <&mpic>;
                };
  
                        interrupt-parent = <&mpic>;
                };
  


@@ -12666,7 +12719,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/kuroboxHD.dts
                        device_type = "serial";
                        compatible = "ns16550";
                        reg = <80004600 8>;
                        device_type = "serial";
                        compatible = "ns16550";
                        reg = <80004600 8>;

-@@ -102,7 +110,7 @@
+@@ -102,7 +110,7 @@ XXXX add flash parts, rtc, ??

                        reg = <80040000 40000>;
                };
  
                        reg = <80040000 40000>;
                };
  


@@ -12675,10 +12728,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/kuroboxHD.dts
                        #address-cells = <3>;
                        #size-cells = <2>;
                        #interrupt-cells = <1>;
                        #address-cells = <3>;
                        #size-cells = <2>;
                        #interrupt-cells = <1>;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/kuroboxHG.dts powerpc.git/arch/powerpc/boot/dts/kuroboxHG.dts
---- linux-2.6.24/arch/powerpc/boot/dts/kuroboxHG.dts   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/kuroboxHG.dts    2008-01-28 20:25:49.000000000 +0100
-@@ -23,6 +23,12 @@
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/kuroboxHG.dts
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/dts/kuroboxHG.dts
++++ linux-2.6.24.7/arch/powerpc/boot/dts/kuroboxHG.dts
+@@ -23,6 +23,12 @@ XXXX add flash parts, rtc, ??

        #address-cells = <1>;
        #size-cells = <1>;
  
        #address-cells = <1>;
        #size-cells = <1>;
  


@@ -12691,7 +12745,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/kuroboxHG.dts
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;

-@@ -60,7 +66,7 @@
+@@ -60,7 +66,7 @@ XXXX add flash parts, rtc, ??

                i2c@80003000 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                i2c@80003000 {
                        #address-cells = <1>;
                        #size-cells = <0>;


@@ -12700,7 +12754,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/kuroboxHG.dts
                        compatible = "fsl-i2c";
                        reg = <80003000 1000>;
                        interrupts = <5 2>;
                        compatible = "fsl-i2c";
                        reg = <80003000 1000>;
                        interrupts = <5 2>;

-@@ -73,7 +79,8 @@
+@@ -73,7 +79,8 @@ XXXX add flash parts, rtc, ??

                        };
                };
  
                        };
                };
  


@@ -12710,7 +12764,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/kuroboxHG.dts
                        device_type = "serial";
                        compatible = "ns16550";
                        reg = <80004500 8>;
                        device_type = "serial";
                        compatible = "ns16550";
                        reg = <80004500 8>;

-@@ -83,7 +90,8 @@
+@@ -83,7 +90,8 @@ XXXX add flash parts, rtc, ??

                        interrupt-parent = <&mpic>;
                };
  
                        interrupt-parent = <&mpic>;
                };
  


@@ -12720,7 +12774,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/kuroboxHG.dts
                        device_type = "serial";
                        compatible = "ns16550";
                        reg = <80004600 8>;
                        device_type = "serial";
                        compatible = "ns16550";
                        reg = <80004600 8>;

-@@ -102,7 +110,7 @@
+@@ -102,7 +110,7 @@ XXXX add flash parts, rtc, ??

                        reg = <80040000 40000>;
                };
  
                        reg = <80040000 40000>;
                };
  


@@ -12729,9 +12783,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/kuroboxHG.dts
                        #address-cells = <3>;
                        #size-cells = <2>;
                        #interrupt-cells = <1>;
                        #address-cells = <3>;
                        #size-cells = <2>;
                        #interrupt-cells = <1>;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/lite5200.dts powerpc.git/arch/powerpc/boot/dts/lite5200.dts
---- linux-2.6.24/arch/powerpc/boot/dts/lite5200.dts    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/lite5200.dts     2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/lite5200.dts
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/dts/lite5200.dts
++++ linux-2.6.24.7/arch/powerpc/boot/dts/lite5200.dts

 @@ -19,7 +19,7 @@
  / {
        model = "fsl,lite5200";
 @@ -19,7 +19,7 @@
  / {
        model = "fsl,lite5200";


@@ -12761,9 +12816,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/lite5200.dts
                        compatible = "mpc5200-i2c","fsl-i2c";
                        cell-index = <1>;
                        reg = <3d40 40>;
                        compatible = "mpc5200-i2c","fsl-i2c";
                        cell-index = <1>;
                        reg = <3d40 40>;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/lite5200b.dts powerpc.git/arch/powerpc/boot/dts/lite5200b.dts
---- linux-2.6.24/arch/powerpc/boot/dts/lite5200b.dts   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/lite5200b.dts    2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/lite5200b.dts
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/dts/lite5200b.dts
++++ linux-2.6.24.7/arch/powerpc/boot/dts/lite5200b.dts

 @@ -19,7 +19,7 @@
  / {
        model = "fsl,lite5200b";
 @@ -19,7 +19,7 @@
  / {
        model = "fsl,lite5200b";


@@ -12793,9 +12849,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/lite5200b.dts
                        compatible = "mpc5200b-i2c","mpc5200-i2c","fsl-i2c";
                        cell-index = <1>;
                        reg = <3d40 40>;
                        compatible = "mpc5200b-i2c","mpc5200-i2c","fsl-i2c";
                        cell-index = <1>;
                        reg = <3d40 40>;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/makalu.dts powerpc.git/arch/powerpc/boot/dts/makalu.dts
---- linux-2.6.24/arch/powerpc/boot/dts/makalu.dts      1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/makalu.dts       2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/makalu.dts
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dts/makalu.dts

 @@ -0,0 +1,347 @@
 +/*
 + * Device Tree Source for AMCC Makalu (405EX)
 @@ -0,0 +1,347 @@
 +/*
 + * Device Tree Source for AMCC Makalu (405EX)


@@ -13144,9 +13201,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/makalu.dts po
 +              };
 +      };
 +};
 +              };
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/motionpro.dts powerpc.git/arch/powerpc/boot/dts/motionpro.dts
---- linux-2.6.24/arch/powerpc/boot/dts/motionpro.dts   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/motionpro.dts    2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/motionpro.dts
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dts/motionpro.dts

 @@ -0,0 +1,309 @@
 +/*
 + * Motion-PRO board Device Tree Source
 @@ -0,0 +1,309 @@
 +/*
 + * Motion-PRO board Device Tree Source


@@ -13457,9 +13515,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/motionpro.dts
 +                        01000000 0 00000000 b0000000 0 01000000>;
 +      };
 +};
 +                        01000000 0 00000000 b0000000 0 01000000>;
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8313erdb.dts powerpc.git/arch/powerpc/boot/dts/mpc8313erdb.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8313erdb.dts 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8313erdb.dts  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/mpc8313erdb.dts
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/dts/mpc8313erdb.dts
++++ linux-2.6.24.7/arch/powerpc/boot/dts/mpc8313erdb.dts

 @@ -15,6 +15,14 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -15,6 +15,14 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -13628,9 +13687,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8313erdb.d
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc832x_mds.dts powerpc.git/arch/powerpc/boot/dts/mpc832x_mds.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc832x_mds.dts 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc832x_mds.dts  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/mpc832x_mds.dts
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/dts/mpc832x_mds.dts
++++ linux-2.6.24.7/arch/powerpc/boot/dts/mpc832x_mds.dts

 @@ -7,6 +7,18 @@
   * under  the terms of  the GNU General  Public License as published by the
   * Free Software Foundation;  either version 2 of the  License, or (at your
 @@ -7,6 +7,18 @@
   * under  the terms of  the GNU General  Public License as published by the
   * Free Software Foundation;  either version 2 of the  License, or (at your


@@ -13821,9 +13881,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc832x_mds.d
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
                                /* IDSEL 0x11 AD17 */
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
                                /* IDSEL 0x11 AD17 */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc832x_rdb.dts powerpc.git/arch/powerpc/boot/dts/mpc832x_rdb.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc832x_rdb.dts 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc832x_rdb.dts  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/mpc832x_rdb.dts
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/dts/mpc832x_rdb.dts
++++ linux-2.6.24.7/arch/powerpc/boot/dts/mpc832x_rdb.dts

 @@ -15,6 +15,14 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -15,6 +15,14 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -13933,9 +13994,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc832x_rdb.d
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
                                /* IDSEL 0x10 AD16 (USB) */
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
                                /* IDSEL 0x10 AD16 (USB) */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8349emitx.dts powerpc.git/arch/powerpc/boot/dts/mpc8349emitx.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8349emitx.dts        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8349emitx.dts 2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/mpc8349emitx.dts
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/dts/mpc8349emitx.dts
++++ linux-2.6.24.7/arch/powerpc/boot/dts/mpc8349emitx.dts

 @@ -14,6 +14,15 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -14,6 +14,15 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -14122,9 +14184,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8349emitx.
 +              };
 +      };
  };
 +              };
 +      };
  };

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8349emitxgp.dts powerpc.git/arch/powerpc/boot/dts/mpc8349emitxgp.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8349emitxgp.dts      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8349emitxgp.dts       2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/mpc8349emitxgp.dts
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/dts/mpc8349emitxgp.dts
++++ linux-2.6.24.7/arch/powerpc/boot/dts/mpc8349emitxgp.dts

 @@ -14,6 +14,13 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -14,6 +14,13 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -14223,9 +14286,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8349emitxg
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
                                /* IDSEL 0x0F - PCI Slot */
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
                                /* IDSEL 0x0F - PCI Slot */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc834x_mds.dts powerpc.git/arch/powerpc/boot/dts/mpc834x_mds.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc834x_mds.dts 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc834x_mds.dts  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/mpc834x_mds.dts
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/dts/mpc834x_mds.dts
++++ linux-2.6.24.7/arch/powerpc/boot/dts/mpc834x_mds.dts

 @@ -15,6 +15,15 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -15,6 +15,15 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -14373,9 +14437,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc834x_mds.d
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc836x_mds.dts powerpc.git/arch/powerpc/boot/dts/mpc836x_mds.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc836x_mds.dts 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc836x_mds.dts  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/mpc836x_mds.dts
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/dts/mpc836x_mds.dts
++++ linux-2.6.24.7/arch/powerpc/boot/dts/mpc836x_mds.dts

 @@ -20,6 +20,14 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -20,6 +20,14 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -14501,9 +14566,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc836x_mds.d
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8377_mds.dts powerpc.git/arch/powerpc/boot/dts/mpc8377_mds.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8377_mds.dts 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8377_mds.dts  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/mpc8377_mds.dts
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dts/mpc8377_mds.dts

 @@ -0,0 +1,279 @@
 +/*
 + * MPC8377E MDS Device Tree Source
 @@ -0,0 +1,279 @@
 +/*
 + * MPC8377E MDS Device Tree Source


@@ -14784,9 +14850,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8377_mds.d
 +              device_type = "pci";
 +      };
 +};
 +              device_type = "pci";
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8378_mds.dts powerpc.git/arch/powerpc/boot/dts/mpc8378_mds.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8378_mds.dts 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8378_mds.dts  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/mpc8378_mds.dts
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dts/mpc8378_mds.dts

 @@ -0,0 +1,265 @@
 +/*
 + * MPC8378E MDS Device Tree Source
 @@ -0,0 +1,265 @@
 +/*
 + * MPC8378E MDS Device Tree Source


@@ -15053,9 +15120,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8378_mds.d
 +              device_type = "pci";
 +      };
 +};
 +              device_type = "pci";
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8379_mds.dts powerpc.git/arch/powerpc/boot/dts/mpc8379_mds.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8379_mds.dts 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8379_mds.dts  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/mpc8379_mds.dts
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dts/mpc8379_mds.dts

 @@ -0,0 +1,293 @@
 +/*
 + * MPC8379E MDS Device Tree Source
 @@ -0,0 +1,293 @@
 +/*
 + * MPC8379E MDS Device Tree Source


@@ -15350,9 +15418,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8379_mds.d
 +              device_type = "pci";
 +      };
 +};
 +              device_type = "pci";
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8540ads.dts powerpc.git/arch/powerpc/boot/dts/mpc8540ads.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8540ads.dts  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8540ads.dts   2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/mpc8540ads.dts
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/dts/mpc8540ads.dts
++++ linux-2.6.24.7/arch/powerpc/boot/dts/mpc8540ads.dts

 @@ -16,6 +16,15 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -16,6 +16,15 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -15485,9 +15554,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8540ads.dt
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8541cds.dts powerpc.git/arch/powerpc/boot/dts/mpc8541cds.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8541cds.dts  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8541cds.dts   2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/mpc8541cds.dts
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/dts/mpc8541cds.dts
++++ linux-2.6.24.7/arch/powerpc/boot/dts/mpc8541cds.dts

 @@ -16,6 +16,15 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -16,6 +16,15 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -15596,9 +15666,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8541cds.dt
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8544ds.dts powerpc.git/arch/powerpc/boot/dts/mpc8544ds.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8544ds.dts   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8544ds.dts    2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/mpc8544ds.dts
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/dts/mpc8544ds.dts
++++ linux-2.6.24.7/arch/powerpc/boot/dts/mpc8544ds.dts

 @@ -15,6 +15,17 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -15,6 +15,17 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -15758,9 +15829,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8544ds.dts
 -
        };
  };
 -
        };
  };

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8548cds.dts powerpc.git/arch/powerpc/boot/dts/mpc8548cds.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8548cds.dts  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8548cds.dts   2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/mpc8548cds.dts
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/dts/mpc8548cds.dts
++++ linux-2.6.24.7/arch/powerpc/boot/dts/mpc8548cds.dts

 @@ -16,6 +16,20 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -16,6 +16,20 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -15917,9 +15989,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8548cds.dt
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8555cds.dts powerpc.git/arch/powerpc/boot/dts/mpc8555cds.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8555cds.dts  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8555cds.dts   2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/mpc8555cds.dts
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/dts/mpc8555cds.dts
++++ linux-2.6.24.7/arch/powerpc/boot/dts/mpc8555cds.dts

 @@ -16,6 +16,15 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -16,6 +16,15 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -16028,9 +16101,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8555cds.dt
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8560ads.dts powerpc.git/arch/powerpc/boot/dts/mpc8560ads.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8560ads.dts  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8560ads.dts   2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/mpc8560ads.dts
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/dts/mpc8560ads.dts
++++ linux-2.6.24.7/arch/powerpc/boot/dts/mpc8560ads.dts

 @@ -16,6 +16,16 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -16,6 +16,16 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -16170,9 +16244,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8560ads.dt
                #interrupt-cells = <1>;
                #size-cells = <2>;
                #address-cells = <3>;
                #interrupt-cells = <1>;
                #size-cells = <2>;
                #address-cells = <3>;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8568mds.dts powerpc.git/arch/powerpc/boot/dts/mpc8568mds.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8568mds.dts  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8568mds.dts   2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/mpc8568mds.dts
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/dts/mpc8568mds.dts
++++ linux-2.6.24.7/arch/powerpc/boot/dts/mpc8568mds.dts

 @@ -20,6 +20,17 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -20,6 +20,17 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -16365,9 +16440,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8568mds.dt
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8572ds.dts powerpc.git/arch/powerpc/boot/dts/mpc8572ds.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8572ds.dts   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8572ds.dts    2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/mpc8572ds.dts
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/dts/mpc8572ds.dts
++++ linux-2.6.24.7/arch/powerpc/boot/dts/mpc8572ds.dts

 @@ -15,6 +15,18 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -15,6 +15,18 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -16540,9 +16616,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8572ds.dts
                interrupt-map = <
                        /* IDSEL 0x0 */
                        0000 0 0 1 &mpic 0 1
                interrupt-map = <
                        /* IDSEL 0x0 */
                        0000 0 0 1 &mpic 0 1

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8610_hpcd.dts powerpc.git/arch/powerpc/boot/dts/mpc8610_hpcd.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8610_hpcd.dts        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8610_hpcd.dts 2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/mpc8610_hpcd.dts
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/dts/mpc8610_hpcd.dts
++++ linux-2.6.24.7/arch/powerpc/boot/dts/mpc8610_hpcd.dts

 @@ -1,7 +1,7 @@
  /*
   * MPC8610 HPCD Device Tree Source
 @@ -1,7 +1,7 @@
  /*
   * MPC8610 HPCD Device Tree Source


@@ -16757,9 +16834,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8610_hpcd.
                compatible = "fsl,mpc8641-pcie";
                device_type = "pci";
                #interrupt-cells = <1>;
                compatible = "fsl,mpc8641-pcie";
                device_type = "pci";
                #interrupt-cells = <1>;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8641_hpcn.dts powerpc.git/arch/powerpc/boot/dts/mpc8641_hpcn.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8641_hpcn.dts        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8641_hpcn.dts 2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/mpc8641_hpcn.dts
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/dts/mpc8641_hpcn.dts
++++ linux-2.6.24.7/arch/powerpc/boot/dts/mpc8641_hpcn.dts

 @@ -16,6 +16,17 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -16,6 +16,17 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -17004,9 +17082,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8641_hpcn.
                compatible = "fsl,mpc8641-pcie";
                device_type = "pci";
                #interrupt-cells = <1>;
                compatible = "fsl,mpc8641-pcie";
                device_type = "pci";
                #interrupt-cells = <1>;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc866ads.dts powerpc.git/arch/powerpc/boot/dts/mpc866ads.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc866ads.dts   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc866ads.dts    2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/mpc866ads.dts
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/dts/mpc866ads.dts
++++ linux-2.6.24.7/arch/powerpc/boot/dts/mpc866ads.dts

 @@ -12,7 +12,7 @@
  
  / {
 @@ -12,7 +12,7 @@
  
  / {


@@ -17233,9 +17312,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc866ads.dts
 +              linux,stdout-path = "/soc/cpm/serial@a80";
 +      };
  };
 +              linux,stdout-path = "/soc/cpm/serial@a80";
 +      };
  };

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/rainier.dts powerpc.git/arch/powerpc/boot/dts/rainier.dts
---- linux-2.6.24/arch/powerpc/boot/dts/rainier.dts     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/rainier.dts      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/rainier.dts
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dts/rainier.dts

 @@ -0,0 +1,353 @@
 +/*
 + * Device Tree Source for AMCC Rainier
 @@ -0,0 +1,353 @@
 +/*
 + * Device Tree Source for AMCC Rainier


@@ -17590,9 +17670,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/rainier.dts p
 +              bootargs = "console=ttyS0,115200";
 +      };
 +};
 +              bootargs = "console=ttyS0,115200";
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/sequoia.dts powerpc.git/arch/powerpc/boot/dts/sequoia.dts
---- linux-2.6.24/arch/powerpc/boot/dts/sequoia.dts     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/sequoia.dts      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/sequoia.dts
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/dts/sequoia.dts
++++ linux-2.6.24.7/arch/powerpc/boot/dts/sequoia.dts

 @@ -17,14 +17,24 @@
        #size-cells = <1>;
        model = "amcc,sequoia";
 @@ -17,14 +17,24 @@
        #size-cells = <1>;
        model = "amcc,sequoia";


@@ -17676,9 +17757,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/sequoia.dts p
        };
  
        chosen {
        };
  
        chosen {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/storcenter.dts powerpc.git/arch/powerpc/boot/dts/storcenter.dts
---- linux-2.6.24/arch/powerpc/boot/dts/storcenter.dts  1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/storcenter.dts   2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/storcenter.dts
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dts/storcenter.dts

 @@ -0,0 +1,138 @@
 +/*
 + * Device Tree Source for IOMEGA StorCenter
 @@ -0,0 +1,138 @@
 +/*
 + * Device Tree Source for IOMEGA StorCenter


@@ -17818,9 +17900,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/storcenter.dt
 +              linux,stdout-path = "/soc/serial@4500";
 +      };
 +};
 +              linux,stdout-path = "/soc/serial@4500";
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/taishan.dts powerpc.git/arch/powerpc/boot/dts/taishan.dts
---- linux-2.6.24/arch/powerpc/boot/dts/taishan.dts     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/taishan.dts      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/taishan.dts
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dts/taishan.dts

 @@ -0,0 +1,383 @@
 +/*
 + * Device Tree Source for IBM/AMCC Taishan
 @@ -0,0 +1,383 @@
 +/*
 + * Device Tree Source for IBM/AMCC Taishan


@@ -18205,9 +18288,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/taishan.dts p
 +              linux,stdout-path = "/plb/opb/serial@40000300";
 +      };
 +};
 +              linux,stdout-path = "/plb/opb/serial@40000300";
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/tqm5200.dts powerpc.git/arch/powerpc/boot/dts/tqm5200.dts
---- linux-2.6.24/arch/powerpc/boot/dts/tqm5200.dts     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/tqm5200.dts      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/tqm5200.dts
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dts/tqm5200.dts

 @@ -0,0 +1,184 @@
 +/*
 + * TQM5200 board Device Tree Source
 @@ -0,0 +1,184 @@
 +/*
 + * TQM5200 board Device Tree Source


@@ -18393,9 +18477,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/tqm5200.dts p
 +                        01000000 0 00000000 a0000000 0 01000000>;
 +      };
 +};
 +                        01000000 0 00000000 a0000000 0 01000000>;
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/walnut.dts powerpc.git/arch/powerpc/boot/dts/walnut.dts
---- linux-2.6.24/arch/powerpc/boot/dts/walnut.dts      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/walnut.dts       2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/walnut.dts
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/dts/walnut.dts
++++ linux-2.6.24.7/arch/powerpc/boot/dts/walnut.dts

 @@ -14,14 +14,21 @@
        #size-cells = <1>;
        model = "ibm,walnut";
 @@ -14,14 +14,21 @@
        #size-cells = <1>;
        model = "ibm,walnut";


@@ -18479,9 +18564,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/walnut.dts po
        };
  
        chosen {
        };
  
        chosen {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/warp.dts powerpc.git/arch/powerpc/boot/dts/warp.dts
---- linux-2.6.24/arch/powerpc/boot/dts/warp.dts        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/warp.dts 2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/dts/warp.dts
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/dts/warp.dts

 @@ -0,0 +1,239 @@
 +/*
 + * Device Tree Source for PIKA Warp
 @@ -0,0 +1,239 @@
 +/*
 + * Device Tree Source for PIKA Warp


@@ -18722,9 +18808,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/warp.dts powe
 +              linux,stdout-path = "/plb/opb/serial@ef600300";
 +      };
 +};
 +              linux,stdout-path = "/plb/opb/serial@ef600300";
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/ebony.c powerpc.git/arch/powerpc/boot/ebony.c
---- linux-2.6.24/arch/powerpc/boot/ebony.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/ebony.c      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/ebony.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/ebony.c
++++ linux-2.6.24.7/arch/powerpc/boot/ebony.c

 @@ -31,66 +31,6 @@
  
  static u8 *ebony_mac0, *ebony_mac1;
 @@ -31,66 +31,6 @@
  
  static u8 *ebony_mac0, *ebony_mac1;


@@ -18792,7 +18879,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/ebony.c powerpc.g
  #define EBONY_FPGA_PATH               "/plb/opb/ebc/fpga"
  #define       EBONY_FPGA_FLASH_SEL    0x01
  #define EBONY_SMALL_FLASH_PATH        "/plb/opb/ebc/small-flash"
  #define EBONY_FPGA_PATH               "/plb/opb/ebc/fpga"
  #define       EBONY_FPGA_FLASH_SEL    0x01
  #define EBONY_SMALL_FLASH_PATH        "/plb/opb/ebc/small-flash"

-@@ -134,7 +74,7 @@
+@@ -134,7 +74,7 @@ static void ebony_fixups(void)

        unsigned long sysclk = 33000000;
  
        ibm440gp_fixup_clocks(sysclk, 6 * 1843200);
        unsigned long sysclk = 33000000;
  
        ibm440gp_fixup_clocks(sysclk, 6 * 1843200);


@@ -18801,7 +18888,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/ebony.c powerpc.g
        dt_fixup_mac_addresses(ebony_mac0, ebony_mac1);
        ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
        ebony_flashsel_fixup();
        dt_fixup_mac_addresses(ebony_mac0, ebony_mac1);
        ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
        ebony_flashsel_fixup();

-@@ -146,6 +86,6 @@
+@@ -146,6 +86,6 @@ void ebony_init(void *mac0, void *mac1)

        platform_ops.exit = ibm44x_dbcr_reset;
        ebony_mac0 = mac0;
        ebony_mac1 = mac1;
        platform_ops.exit = ibm44x_dbcr_reset;
        ebony_mac0 = mac0;
        ebony_mac1 = mac1;


@@ -18809,9 +18896,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/ebony.c powerpc.g
 +      fdt_init(_dtb_start);
        serial_console_init();
  }
 +      fdt_init(_dtb_start);
        serial_console_init();
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/ep405.c powerpc.git/arch/powerpc/boot/ep405.c
---- linux-2.6.24/arch/powerpc/boot/ep405.c     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/ep405.c      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/ep405.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/ep405.c

 @@ -0,0 +1,74 @@
 +/*
 + * Embedded Planet EP405 with PlanetCore firmware
 @@ -0,0 +1,74 @@
 +/*
 + * Embedded Planet EP405 with PlanetCore firmware


@@ -18887,9 +18975,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/ep405.c powerpc.g
 +      serial_console_init();
 +      platform_ops.fixups = platform_fixups;
 +}
 +      serial_console_init();
 +      platform_ops.fixups = platform_fixups;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/ep8248e.c powerpc.git/arch/powerpc/boot/ep8248e.c
---- linux-2.6.24/arch/powerpc/boot/ep8248e.c   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/ep8248e.c    2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/ep8248e.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/ep8248e.c

 @@ -0,0 +1,55 @@
 +/*
 + * Embedded Planet EP8248E with PlanetCore firmware
 @@ -0,0 +1,55 @@
 +/*
 + * Embedded Planet EP8248E with PlanetCore firmware


@@ -18946,10 +19035,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/ep8248e.c powerpc
 +      serial_console_init();
 +      platform_ops.fixups = platform_fixups;
 +}
 +      serial_console_init();
 +      platform_ops.fixups = platform_fixups;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/ep88xc.c powerpc.git/arch/powerpc/boot/ep88xc.c
---- linux-2.6.24/arch/powerpc/boot/ep88xc.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/ep88xc.c     2008-01-28 20:25:49.000000000 +0100
-@@ -45,7 +45,7 @@
+Index: linux-2.6.24.7/arch/powerpc/boot/ep88xc.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/ep88xc.c
++++ linux-2.6.24.7/arch/powerpc/boot/ep88xc.c
+@@ -45,7 +45,7 @@ void platform_init(unsigned long r3, uns

        mem_size *= 1024 * 1024;
        simple_alloc_init(_end, mem_size - (unsigned long)_end, 32, 64);
  
        mem_size *= 1024 * 1024;
        simple_alloc_init(_end, mem_size - (unsigned long)_end, 32, 64);
  


@@ -18958,9 +19048,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/ep88xc.c powerpc.
  
        planetcore_set_stdout_path(table);
  
  
        planetcore_set_stdout_path(table);
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/flatdevtree.c powerpc.git/arch/powerpc/boot/flatdevtree.c
---- linux-2.6.24/arch/powerpc/boot/flatdevtree.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/flatdevtree.c        1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/flatdevtree.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/flatdevtree.c
++++ /dev/null

 @@ -1,1036 +0,0 @@
 -/*
 - * This program is free software; you can redistribute it and/or modify
 @@ -1,1036 +0,0 @@
 -/*
 - * This program is free software; you can redistribute it and/or modify


@@ -19998,9 +20089,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/flatdevtree.c pow
 -
 -      return buf;
 -}
 -
 -      return buf;
 -}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/flatdevtree.h powerpc.git/arch/powerpc/boot/flatdevtree.h
---- linux-2.6.24/arch/powerpc/boot/flatdevtree.h       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/flatdevtree.h        1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/flatdevtree.h
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/flatdevtree.h
++++ /dev/null

 @@ -1,113 +0,0 @@
 -/*
 - * This program is free software; you can redistribute it and/or modify
 @@ -1,113 +0,0 @@
 -/*
 - * This program is free software; you can redistribute it and/or modify


@@ -20115,9 +20207,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/flatdevtree.h pow
 -char *ft_get_path(struct ft_cxt *cxt, const void *phandle, char *buf, int len);
 -
 -#endif /* FLATDEVTREE_H */
 -char *ft_get_path(struct ft_cxt *cxt, const void *phandle, char *buf, int len);
 -
 -#endif /* FLATDEVTREE_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/flatdevtree_misc.c powerpc.git/arch/powerpc/boot/flatdevtree_misc.c
---- linux-2.6.24/arch/powerpc/boot/flatdevtree_misc.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/flatdevtree_misc.c   1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/flatdevtree_misc.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/flatdevtree_misc.c
++++ /dev/null

 @@ -1,79 +0,0 @@
 -/*
 - * This file does the necessary interface mapping between the bootwrapper
 @@ -1,79 +0,0 @@
 -/*
 - * This file does the necessary interface mapping between the bootwrapper


@@ -20198,10 +20291,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/flatdevtree_misc.
 -      return ft_open(&cxt, dt_blob, max_size, max_find_device,
 -                      platform_ops.realloc);
 -}
 -      return ft_open(&cxt, dt_blob, max_size, max_find_device,
 -                      platform_ops.realloc);
 -}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/holly.c powerpc.git/arch/powerpc/boot/holly.c
---- linux-2.6.24/arch/powerpc/boot/holly.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/holly.c      2008-01-28 20:25:49.000000000 +0100
-@@ -28,6 +28,6 @@
+Index: linux-2.6.24.7/arch/powerpc/boot/holly.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/holly.c
++++ linux-2.6.24.7/arch/powerpc/boot/holly.c
+@@ -28,6 +28,6 @@ void platform_init(unsigned long r3, uns

        u32 heapsize = 0x8000000 - (u32)_end; /* 128M */
  
        simple_alloc_init(_end, heapsize, 32, 64);
        u32 heapsize = 0x8000000 - (u32)_end; /* 128M */
  
        simple_alloc_init(_end, heapsize, 32, 64);


@@ -20209,9 +20303,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/holly.c powerpc.g
 +      fdt_init(_dtb_start);
        serial_console_init();
  }
 +      fdt_init(_dtb_start);
        serial_console_init();
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/Makefile.libfdt powerpc.git/arch/powerpc/boot/libfdt/Makefile.libfdt
---- linux-2.6.24/arch/powerpc/boot/libfdt/Makefile.libfdt      1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/libfdt/Makefile.libfdt       2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/libfdt/Makefile.libfdt
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/libfdt/Makefile.libfdt

 @@ -0,0 +1,14 @@
 +# Makefile.libfdt
 +#
 @@ -0,0 +1,14 @@
 +# Makefile.libfdt
 +#


@@ -20227,9 +20322,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/Makefile.l
 +
 +$(LIBFDT_objdir)/$(LIBFDT_LIB): $(addprefix $(LIBFDT_objdir)/,$(LIBFDT_OBJS))
 +
 +
 +$(LIBFDT_objdir)/$(LIBFDT_LIB): $(addprefix $(LIBFDT_objdir)/,$(LIBFDT_OBJS))
 +

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/fdt.c powerpc.git/arch/powerpc/boot/libfdt/fdt.c
---- linux-2.6.24/arch/powerpc/boot/libfdt/fdt.c        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/libfdt/fdt.c 2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/libfdt/fdt.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/libfdt/fdt.c

 @@ -0,0 +1,156 @@
 +/*
 + * libfdt - Flat Device Tree manipulation
 @@ -0,0 +1,156 @@
 +/*
 + * libfdt - Flat Device Tree manipulation


@@ -20387,9 +20483,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/fdt.c powe
 +      memmove(buf, fdt, fdt_totalsize(fdt));
 +      return 0;
 +}
 +      memmove(buf, fdt, fdt_totalsize(fdt));
 +      return 0;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/fdt.h powerpc.git/arch/powerpc/boot/libfdt/fdt.h
---- linux-2.6.24/arch/powerpc/boot/libfdt/fdt.h        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/libfdt/fdt.h 2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/libfdt/fdt.h
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/libfdt/fdt.h

 @@ -0,0 +1,60 @@
 +#ifndef _FDT_H
 +#define _FDT_H
 @@ -0,0 +1,60 @@
 +#ifndef _FDT_H
 +#define _FDT_H


@@ -20451,9 +20548,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/fdt.h powe
 +#define FDT_V17_SIZE  (FDT_V16_SIZE + sizeof(uint32_t))
 +
 +#endif /* _FDT_H */
 +#define FDT_V17_SIZE  (FDT_V16_SIZE + sizeof(uint32_t))
 +
 +#endif /* _FDT_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/fdt_ro.c powerpc.git/arch/powerpc/boot/libfdt/fdt_ro.c
---- linux-2.6.24/arch/powerpc/boot/libfdt/fdt_ro.c     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/libfdt/fdt_ro.c      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/libfdt/fdt_ro.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/libfdt/fdt_ro.c

 @@ -0,0 +1,583 @@
 +/*
 + * libfdt - Flat Device Tree manipulation
 @@ -0,0 +1,583 @@
 +/*
 + * libfdt - Flat Device Tree manipulation


@@ -21038,9 +21136,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/fdt_ro.c p
 +
 +      return -FDT_ERR_NOTFOUND;
 +}
 +
 +      return -FDT_ERR_NOTFOUND;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/fdt_rw.c powerpc.git/arch/powerpc/boot/libfdt/fdt_rw.c
---- linux-2.6.24/arch/powerpc/boot/libfdt/fdt_rw.c     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/libfdt/fdt_rw.c      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/libfdt/fdt_rw.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/libfdt/fdt_rw.c

 @@ -0,0 +1,447 @@
 +/*
 + * libfdt - Flat Device Tree manipulation
 @@ -0,0 +1,447 @@
 +/*
 + * libfdt - Flat Device Tree manipulation


@@ -21489,9 +21588,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/fdt_rw.c p
 +
 +      return 0;
 +}
 +
 +      return 0;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/fdt_strerror.c powerpc.git/arch/powerpc/boot/libfdt/fdt_strerror.c
---- linux-2.6.24/arch/powerpc/boot/libfdt/fdt_strerror.c       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/libfdt/fdt_strerror.c        2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/libfdt/fdt_strerror.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/libfdt/fdt_strerror.c

 @@ -0,0 +1,96 @@
 +/*
 + * libfdt - Flat Device Tree manipulation
 @@ -0,0 +1,96 @@
 +/*
 + * libfdt - Flat Device Tree manipulation


@@ -21589,9 +21689,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/fdt_strerr
 +
 +      return "<unknown error>";
 +}
 +
 +      return "<unknown error>";
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/fdt_sw.c powerpc.git/arch/powerpc/boot/libfdt/fdt_sw.c
---- linux-2.6.24/arch/powerpc/boot/libfdt/fdt_sw.c     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/libfdt/fdt_sw.c      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/libfdt/fdt_sw.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/libfdt/fdt_sw.c

 @@ -0,0 +1,258 @@
 +/*
 + * libfdt - Flat Device Tree manipulation
 @@ -0,0 +1,258 @@
 +/*
 + * libfdt - Flat Device Tree manipulation


@@ -21851,9 +21952,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/fdt_sw.c p
 +      fdt_set_magic(fdt, FDT_MAGIC);
 +      return 0;
 +}
 +      fdt_set_magic(fdt, FDT_MAGIC);
 +      return 0;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/fdt_wip.c powerpc.git/arch/powerpc/boot/libfdt/fdt_wip.c
---- linux-2.6.24/arch/powerpc/boot/libfdt/fdt_wip.c    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/libfdt/fdt_wip.c     2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/libfdt/fdt_wip.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/libfdt/fdt_wip.c

 @@ -0,0 +1,144 @@
 +/*
 + * libfdt - Flat Device Tree manipulation
 @@ -0,0 +1,144 @@
 +/*
 + * libfdt - Flat Device Tree manipulation


@@ -21999,9 +22101,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/fdt_wip.c
 +      nop_region(fdt_offset_ptr_w(fdt, nodeoffset, 0), endoffset - nodeoffset);
 +      return 0;
 +}
 +      nop_region(fdt_offset_ptr_w(fdt, nodeoffset, 0), endoffset - nodeoffset);
 +      return 0;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/libfdt.h powerpc.git/arch/powerpc/boot/libfdt/libfdt.h
---- linux-2.6.24/arch/powerpc/boot/libfdt/libfdt.h     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/libfdt/libfdt.h      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/libfdt/libfdt.h
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/libfdt/libfdt.h

 @@ -0,0 +1,721 @@
 +#ifndef _LIBFDT_H
 +#define _LIBFDT_H
 @@ -0,0 +1,721 @@
 +#ifndef _LIBFDT_H
 +#define _LIBFDT_H


@@ -22724,9 +22827,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/libfdt.h p
 +const char *fdt_strerror(int errval);
 +
 +#endif /* _LIBFDT_H */
 +const char *fdt_strerror(int errval);
 +
 +#endif /* _LIBFDT_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/libfdt_internal.h powerpc.git/arch/powerpc/boot/libfdt/libfdt_internal.h
---- linux-2.6.24/arch/powerpc/boot/libfdt/libfdt_internal.h    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/libfdt/libfdt_internal.h     2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/libfdt/libfdt_internal.h
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/libfdt/libfdt_internal.h

 @@ -0,0 +1,89 @@
 +#ifndef _LIBFDT_INTERNAL_H
 +#define _LIBFDT_INTERNAL_H
 @@ -0,0 +1,89 @@
 +#ifndef _LIBFDT_INTERNAL_H
 +#define _LIBFDT_INTERNAL_H


@@ -22817,9 +22921,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/libfdt_int
 +#define SW_MAGIC              (~FDT_MAGIC)
 +
 +#endif /* _LIBFDT_INTERNAL_H */
 +#define SW_MAGIC              (~FDT_MAGIC)
 +
 +#endif /* _LIBFDT_INTERNAL_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt-wrapper.c powerpc.git/arch/powerpc/boot/libfdt-wrapper.c
---- linux-2.6.24/arch/powerpc/boot/libfdt-wrapper.c    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/libfdt-wrapper.c     2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/libfdt-wrapper.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/libfdt-wrapper.c

 @@ -0,0 +1,184 @@
 +/*
 + * This file does the necessary interface mapping between the bootwrapper
 @@ -0,0 +1,184 @@
 +/*
 + * This file does the necessary interface mapping between the bootwrapper


@@ -23005,9 +23110,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt-wrapper.c
 +      if (buf)
 +              fdt = buf;
 +}
 +      if (buf)
 +              fdt = buf;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt_env.h powerpc.git/arch/powerpc/boot/libfdt_env.h
---- linux-2.6.24/arch/powerpc/boot/libfdt_env.h        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/libfdt_env.h 2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/libfdt_env.h
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/libfdt_env.h

 @@ -0,0 +1,17 @@
 +#ifndef _ARCH_POWERPC_BOOT_LIBFDT_ENV_H
 +#define _ARCH_POWERPC_BOOT_LIBFDT_ENV_H
 @@ -0,0 +1,17 @@
 +#ifndef _ARCH_POWERPC_BOOT_LIBFDT_ENV_H
 +#define _ARCH_POWERPC_BOOT_LIBFDT_ENV_H


@@ -23026,9 +23132,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt_env.h powe
 +#define cpu_to_fdt64(x)               (x)
 +
 +#endif /* _ARCH_POWERPC_BOOT_LIBFDT_ENV_H */
 +#define cpu_to_fdt64(x)               (x)
 +
 +#endif /* _ARCH_POWERPC_BOOT_LIBFDT_ENV_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/main.c powerpc.git/arch/powerpc/boot/main.c
---- linux-2.6.24/arch/powerpc/boot/main.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/main.c       2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/main.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/main.c
++++ linux-2.6.24.7/arch/powerpc/boot/main.c

 @@ -16,7 +16,6 @@
  #include "stdio.h"
  #include "ops.h"
 @@ -16,7 +16,6 @@
  #include "stdio.h"
  #include "ops.h"


@@ -23037,10 +23144,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/main.c powerpc.gi
  #include "reg.h"
  
  static struct gunzip_state gzstate;
  #include "reg.h"
  
  static struct gunzip_state gzstate;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/ops.h powerpc.git/arch/powerpc/boot/ops.h
---- linux-2.6.24/arch/powerpc/boot/ops.h       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/ops.h        2008-01-28 20:25:49.000000000 +0100
-@@ -79,7 +79,7 @@
+Index: linux-2.6.24.7/arch/powerpc/boot/ops.h
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/ops.h
++++ linux-2.6.24.7/arch/powerpc/boot/ops.h
+@@ -79,7 +79,7 @@ struct loader_info {

  extern struct loader_info loader_info;
  
  void start(void);
  extern struct loader_info loader_info;
  
  void start(void);


@@ -23049,7 +23157,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/ops.h powerpc.git
  int serial_console_init(void);
  int ns16550_console_init(void *devp, struct serial_console_data *scdp);
  int mpsc_console_init(void *devp, struct serial_console_data *scdp);
  int serial_console_init(void);
  int ns16550_console_init(void *devp, struct serial_console_data *scdp);
  int mpsc_console_init(void *devp, struct serial_console_data *scdp);

-@@ -159,9 +159,23 @@
+@@ -159,9 +159,23 @@ static inline void *find_node_by_devtype

        return find_node_by_prop_value_str(prev, "device_type", type);
  }
  
        return find_node_by_prop_value_str(prev, "device_type", type);
  }
  


@@ -23073,10 +23181,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/ops.h powerpc.git
  void dt_fixup_mac_address(u32 index, const u8 *addr);
  void __dt_fixup_mac_addresses(u32 startindex, ...);
  #define dt_fixup_mac_addresses(...) \
  void dt_fixup_mac_address(u32 index, const u8 *addr);
  void __dt_fixup_mac_addresses(u32 startindex, ...);
  #define dt_fixup_mac_addresses(...) \

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/prpmc2800.c powerpc.git/arch/powerpc/boot/prpmc2800.c
---- linux-2.6.24/arch/powerpc/boot/prpmc2800.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/prpmc2800.c  2008-01-28 20:25:49.000000000 +0100
-@@ -547,8 +547,7 @@
+Index: linux-2.6.24.7/arch/powerpc/boot/prpmc2800.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/prpmc2800.c
++++ linux-2.6.24.7/arch/powerpc/boot/prpmc2800.c
+@@ -547,8 +547,7 @@ void platform_init(unsigned long r3, uns

        if (!dtb)
                exit();
        memmove(dtb, _dtb_start, dt_size);
        if (!dtb)
                exit();
        memmove(dtb, _dtb_start, dt_size);


@@ -23086,10 +23195,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/prpmc2800.c power
  
        bridge_base = mv64x60_get_bridge_base();
  
  
        bridge_base = mv64x60_get_bridge_base();
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/ps3.c powerpc.git/arch/powerpc/boot/ps3.c
---- linux-2.6.24/arch/powerpc/boot/ps3.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/ps3.c        2008-01-28 20:25:49.000000000 +0100
-@@ -131,7 +131,7 @@
+Index: linux-2.6.24.7/arch/powerpc/boot/ps3.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/ps3.c
++++ linux-2.6.24.7/arch/powerpc/boot/ps3.c
+@@ -131,7 +131,7 @@ void platform_init(void)

        printf("\n-- PS3 bootwrapper --\n");
  
        simple_alloc_init(_end, heapsize, 32, 64);
        printf("\n-- PS3 bootwrapper --\n");
  
        simple_alloc_init(_end, heapsize, 32, 64);


@@ -23098,9 +23208,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/ps3.c powerpc.git
  
        chosen = finddevice("/chosen");
  
  
        chosen = finddevice("/chosen");
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/redboot-8xx.c powerpc.git/arch/powerpc/boot/redboot-8xx.c
---- linux-2.6.24/arch/powerpc/boot/redboot-8xx.c       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/redboot-8xx.c        2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/redboot-8xx.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/redboot-8xx.c

 @@ -0,0 +1,58 @@
 +/*
 + * RedBoot firmware support
 @@ -0,0 +1,58 @@
 +/*
 + * RedBoot firmware support


@@ -23160,9 +23271,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/redboot-8xx.c pow
 +      loader_info.cmdline = (char *)bd.bi_cmdline;
 +      loader_info.cmdline_len = strlen((char *)bd.bi_cmdline);
 +}
 +      loader_info.cmdline = (char *)bd.bi_cmdline;
 +      loader_info.cmdline_len = strlen((char *)bd.bi_cmdline);
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/redboot.h powerpc.git/arch/powerpc/boot/redboot.h
---- linux-2.6.24/arch/powerpc/boot/redboot.h   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/redboot.h    2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/redboot.h
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/boot/redboot.h

 @@ -0,0 +1,56 @@
 +#ifndef _PPC_REDBOOT_H
 +#define _PPC_REDBOOT_H
 @@ -0,0 +1,56 @@
 +#ifndef _PPC_REDBOOT_H
 +#define _PPC_REDBOOT_H


@@ -23220,10 +23332,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/redboot.h powerpc
 +#define bi_pci_busfreq bi_pci_freq
 +#define bi_immr_base   bi_immr
 +#endif
 +#define bi_pci_busfreq bi_pci_freq
 +#define bi_immr_base   bi_immr
 +#endif

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/reg.h powerpc.git/arch/powerpc/boot/reg.h
---- linux-2.6.24/arch/powerpc/boot/reg.h       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/reg.h        2008-01-28 20:25:49.000000000 +0100
-@@ -16,6 +16,14 @@
+Index: linux-2.6.24.7/arch/powerpc/boot/reg.h
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/reg.h
++++ linux-2.6.24.7/arch/powerpc/boot/reg.h
+@@ -16,6 +16,14 @@ static inline u32 mfpvr(void)

        return pvr;
  }
  
        return pvr;
  }
  


@@ -23238,10 +23351,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/reg.h powerpc.git
  register void *__stack_pointer asm("r1");
  #define get_sp()      (__stack_pointer)
  
  register void *__stack_pointer asm("r1");
  #define get_sp()      (__stack_pointer)
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/serial.c powerpc.git/arch/powerpc/boot/serial.c
---- linux-2.6.24/arch/powerpc/boot/serial.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/serial.c     2008-01-28 20:25:49.000000000 +0100
-@@ -128,7 +128,8 @@
+Index: linux-2.6.24.7/arch/powerpc/boot/serial.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/serial.c
++++ linux-2.6.24.7/arch/powerpc/boot/serial.c
+@@ -128,7 +128,8 @@ int serial_console_init(void)

                rc = cpm_console_init(devp, &serial_cd);
        else if (dt_is_compatible(devp, "mpc5200-psc-uart"))
                rc = mpc5200_psc_console_init(devp, &serial_cd);
                rc = cpm_console_init(devp, &serial_cd);
        else if (dt_is_compatible(devp, "mpc5200-psc-uart"))
                rc = mpc5200_psc_console_init(devp, &serial_cd);


@@ -23251,9 +23365,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/serial.c powerpc.
                rc = uartlite_console_init(devp, &serial_cd);
  
        /* Add other serial console driver calls here */
                rc = uartlite_console_init(devp, &serial_cd);
  
        /* Add other serial console driver calls here */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/treeboot-walnut.c powerpc.git/arch/powerpc/boot/treeboot-walnut.c
---- linux-2.6.24/arch/powerpc/boot/treeboot-walnut.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/treeboot-walnut.c    2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/boot/treeboot-walnut.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/treeboot-walnut.c
++++ linux-2.6.24.7/arch/powerpc/boot/treeboot-walnut.c

 @@ -20,55 +20,6 @@
  
  BSS_STACK(4096);
 @@ -20,55 +20,6 @@
  
  BSS_STACK(4096);


@@ -23310,7 +23425,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/treeboot-walnut.c
  static void walnut_flashsel_fixup(void)
  {
        void *devp, *sram;
  static void walnut_flashsel_fixup(void)
  {
        void *devp, *sram;

-@@ -112,7 +63,7 @@
+@@ -112,7 +63,7 @@ static void walnut_flashsel_fixup(void)

  #define WALNUT_OPENBIOS_MAC_OFF 0xfffffe0b
  static void walnut_fixups(void)
  {
  #define WALNUT_OPENBIOS_MAC_OFF 0xfffffe0b
  static void walnut_fixups(void)
  {


@@ -23319,7 +23434,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/treeboot-walnut.c
        ibm405gp_fixup_clocks(33330000, 0xa8c000);
        ibm4xx_quiesce_eth((u32 *)0xef600800, NULL);
        ibm4xx_fixup_ebc_ranges("/plb/ebc");
        ibm405gp_fixup_clocks(33330000, 0xa8c000);
        ibm4xx_quiesce_eth((u32 *)0xef600800, NULL);
        ibm4xx_fixup_ebc_ranges("/plb/ebc");

-@@ -128,6 +79,6 @@
+@@ -128,6 +79,6 @@ void platform_init(void)

        simple_alloc_init(_end, avail_ram, 32, 32);
        platform_ops.fixups = walnut_fixups;
        platform_ops.exit = ibm40x_dbcr_reset;
        simple_alloc_init(_end, avail_ram, 32, 32);
        platform_ops.fixups = walnut_fixups;
        platform_ops.exit = ibm40x_dbcr_reset;


@@ -23327,10 +23442,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/treeboot-walnut.c
 +      fdt_init(_dtb_start);
        serial_console_init();
  }
 +      fdt_init(_dtb_start);
        serial_console_init();
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/wrapper powerpc.git/arch/powerpc/boot/wrapper
---- linux-2.6.24/arch/powerpc/boot/wrapper     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/wrapper      2008-01-28 20:25:49.000000000 +0100
-@@ -45,6 +45,7 @@
+Index: linux-2.6.24.7/arch/powerpc/boot/wrapper
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/boot/wrapper
++++ linux-2.6.24.7/arch/powerpc/boot/wrapper
+@@ -45,6 +45,7 @@ CROSS=

  
  # directory for object and other files used by this script
  object=arch/powerpc/boot
  
  # directory for object and other files used by this script
  object=arch/powerpc/boot


@@ -23338,7 +23454,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/wrapper powerpc.g
  
  # directory for working files
  tmpdir=.
  
  # directory for working files
  tmpdir=.

-@@ -95,6 +96,7 @@
+@@ -95,6 +96,7 @@ while [ "$#" -gt 0 ]; do

        shift
        [ "$#" -gt 0 ] || usage
        object="$1"
        shift
        [ "$#" -gt 0 ] || usage
        object="$1"


@@ -23346,7 +23462,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/wrapper powerpc.g
        ;;
      -W)
        shift
        ;;
      -W)
        shift

-@@ -116,10 +118,13 @@
+@@ -116,10 +118,13 @@ while [ "$#" -gt 0 ]; do

  done
  
  if [ -n "$dts" ]; then
  done
  
  if [ -n "$dts" ]; then


@@ -23361,7 +23477,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/wrapper powerpc.g
  fi
  
  if [ -z "$kernel" ]; then
  fi
  
  if [ -z "$kernel" ]; then

-@@ -163,7 +168,7 @@
+@@ -163,7 +168,7 @@ ps3)

      ksection=.kernel:vmlinux.bin
      isection=.kernel:initrd
      ;;
      ksection=.kernel:vmlinux.bin
      isection=.kernel:initrd
      ;;


@@ -23370,7 +23486,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/wrapper powerpc.g
      platformo="$object/fixed-head.o $object/$platform.o"
      binary=y
      ;;
      platformo="$object/fixed-head.o $object/$platform.o"
      binary=y
      ;;

-@@ -246,11 +251,11 @@
+@@ -246,11 +251,11 @@ fi

  # post-processing needed for some platforms
  case "$platform" in
  pseries|chrp)
  # post-processing needed for some platforms
  case "$platform" in
  pseries|chrp)


@@ -23384,7 +23500,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/wrapper powerpc.g
      ;;
  cuboot*)
      gzip -f -9 "$ofile"
      ;;
  cuboot*)
      gzip -f -9 "$ofile"

-@@ -259,7 +264,7 @@
+@@ -259,7 +264,7 @@ cuboot*)

      ;;
  treeboot*)
      mv "$ofile" "$ofile.elf"
      ;;
  treeboot*)
      mv "$ofile" "$ofile.elf"


@@ -23393,7 +23509,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/wrapper powerpc.g
      if [ -z "$cacheit" ]; then
        rm -f "$ofile.elf"
      fi
      if [ -z "$cacheit" ]; then
        rm -f "$ofile.elf"
      fi

-@@ -287,8 +292,6 @@
+@@ -287,8 +292,6 @@ ps3)

      overlay_dest="256"
      overlay_size="256"
  
      overlay_dest="256"
      overlay_size="256"
  


@@ -23402,7 +23518,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/wrapper powerpc.g
      ${CROSS}objcopy -O binary "$ofile" "$ofile.bin"
  
      dd if="$ofile.bin" of="$ofile.bin" conv=notrunc   \
      ${CROSS}objcopy -O binary "$ofile" "$ofile.bin"
  
      dd if="$ofile.bin" of="$ofile.bin" conv=notrunc   \

-@@ -299,6 +302,8 @@
+@@ -299,6 +302,8 @@ ps3)

          skip=$system_reset_overlay seek=$overlay_dest \
          count=$overlay_size bs=1
  
          skip=$system_reset_overlay seek=$overlay_dest \
          count=$overlay_size bs=1
  


@@ -23412,9 +23528,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/wrapper powerpc.g
 +    gzip --force -9 --stdout "$ofile.bin" > "$odir/otheros.bld"
      ;;
  esac
 +    gzip --force -9 --stdout "$ofile.bin" > "$odir/otheros.bld"
      ;;
  esac

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/adder875-redboot_defconfig powerpc.git/arch/powerpc/configs/adder875-redboot_defconfig
---- linux-2.6.24/arch/powerpc/configs/adder875-redboot_defconfig       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/adder875-redboot_defconfig        2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/configs/adder875-redboot_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/configs/adder875-redboot_defconfig

 @@ -0,0 +1,798 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,798 @@
 +#
 +# Automatically generated make config: don't edit


@@ -24214,9 +24331,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/adder875-redbo
 +# CONFIG_CRYPTO is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y
 +# CONFIG_CRYPTO is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/adder875-uboot_defconfig powerpc.git/arch/powerpc/configs/adder875-uboot_defconfig
---- linux-2.6.24/arch/powerpc/configs/adder875-uboot_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/adder875-uboot_defconfig  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/configs/adder875-uboot_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/configs/adder875-uboot_defconfig

 @@ -0,0 +1,798 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,798 @@
 +#
 +# Automatically generated make config: don't edit


@@ -25016,9 +25134,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/adder875-uboot
 +# CONFIG_CRYPTO is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y
 +# CONFIG_CRYPTO is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/bamboo_defconfig powerpc.git/arch/powerpc/configs/bamboo_defconfig
---- linux-2.6.24/arch/powerpc/configs/bamboo_defconfig 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/bamboo_defconfig  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/configs/bamboo_defconfig
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/configs/bamboo_defconfig
++++ linux-2.6.24.7/arch/powerpc/configs/bamboo_defconfig

 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit


@@ -25029,7 +25148,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/bamboo_defconf
  #
  # CONFIG_PPC64 is not set
  
  #
  # CONFIG_PPC64 is not set
  

-@@ -131,6 +131,7 @@
+@@ -131,6 +131,7 @@ CONFIG_DEFAULT_AS=y

  # CONFIG_DEFAULT_CFQ is not set
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="anticipatory"
  # CONFIG_DEFAULT_CFQ is not set
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="anticipatory"


@@ -25037,7 +25156,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/bamboo_defconf
  
  #
  # Platform support
  
  #
  # Platform support

-@@ -143,6 +144,9 @@
+@@ -143,6 +144,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"

  CONFIG_BAMBOO=y
  # CONFIG_EBONY is not set
  # CONFIG_SEQUOIA is not set
  CONFIG_BAMBOO=y
  # CONFIG_EBONY is not set
  # CONFIG_SEQUOIA is not set


@@ -25047,7 +25166,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/bamboo_defconf
  CONFIG_440EP=y
  CONFIG_IBM440EP_ERR42=y
  # CONFIG_MPIC is not set
  CONFIG_440EP=y
  CONFIG_IBM440EP_ERR42=y
  # CONFIG_MPIC is not set

-@@ -372,9 +376,7 @@
+@@ -372,9 +376,7 @@ CONFIG_MISC_DEVICES=y

  # CONFIG_FIREWIRE is not set
  # CONFIG_IEEE1394 is not set
  # CONFIG_I2O is not set
  # CONFIG_FIREWIRE is not set
  # CONFIG_IEEE1394 is not set
  # CONFIG_I2O is not set


@@ -25058,7 +25177,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/bamboo_defconf
  CONFIG_NETDEVICES=y
  # CONFIG_NETDEVICES_MULTIQUEUE is not set
  # CONFIG_DUMMY is not set
  CONFIG_NETDEVICES=y
  # CONFIG_NETDEVICES_MULTIQUEUE is not set
  # CONFIG_DUMMY is not set

-@@ -736,19 +738,7 @@
+@@ -736,19 +738,7 @@ CONFIG_DEBUGGER=y

  # CONFIG_KGDB is not set
  # CONFIG_XMON is not set
  # CONFIG_BDI_SWITCH is not set
  # CONFIG_KGDB is not set
  # CONFIG_XMON is not set
  # CONFIG_BDI_SWITCH is not set


@@ -25079,10 +25198,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/bamboo_defconf
  
  #
  # Security options
  
  #
  # Security options

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/celleb_defconfig powerpc.git/arch/powerpc/configs/celleb_defconfig
---- linux-2.6.24/arch/powerpc/configs/celleb_defconfig 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/celleb_defconfig  2008-01-28 20:25:49.000000000 +0100
-@@ -50,7 +50,8 @@
+Index: linux-2.6.24.7/arch/powerpc/configs/celleb_defconfig
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/configs/celleb_defconfig
++++ linux-2.6.24.7/arch/powerpc/configs/celleb_defconfig
+@@ -50,7 +50,8 @@ CONFIG_AUDIT_ARCH=y

  CONFIG_GENERIC_BUG=y
  # CONFIG_DEFAULT_UIMAGE is not set
  # CONFIG_PPC_DCR_NATIVE is not set
  CONFIG_GENERIC_BUG=y
  # CONFIG_DEFAULT_UIMAGE is not set
  # CONFIG_PPC_DCR_NATIVE is not set


@@ -25092,7 +25212,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/celleb_defconf
  CONFIG_PPC_OF_PLATFORM_PCI=y
  CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
  
  CONFIG_PPC_OF_PLATFORM_PCI=y
  CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
  

-@@ -148,7 +149,7 @@
+@@ -148,7 +149,7 @@ CONFIG_PPC_MULTIPLATFORM=y

  CONFIG_PPC_CELLEB=y
  # CONFIG_PPC_PS3 is not set
  CONFIG_PPC_CELL=y
  CONFIG_PPC_CELLEB=y
  # CONFIG_PPC_PS3 is not set
  CONFIG_PPC_CELL=y


@@ -25101,7 +25221,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/celleb_defconf
  # CONFIG_PPC_IBM_CELL_BLADE is not set
  
  #
  # CONFIG_PPC_IBM_CELL_BLADE is not set
  
  #

-@@ -157,13 +158,19 @@
+@@ -157,13 +158,19 @@ CONFIG_PPC_CELL=y

  CONFIG_SPU_FS=y
  CONFIG_SPU_FS_64K_LS=y
  CONFIG_SPU_BASE=y
  CONFIG_SPU_FS=y
  CONFIG_SPU_FS_64K_LS=y
  CONFIG_SPU_BASE=y


@@ -25123,7 +25243,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/celleb_defconf
  # CONFIG_MMIO_NVRAM is not set
  # CONFIG_PPC_MPC106 is not set
  # CONFIG_PPC_970_NAP is not set
  # CONFIG_MMIO_NVRAM is not set
  # CONFIG_PPC_MPC106 is not set
  # CONFIG_PPC_970_NAP is not set

-@@ -593,10 +600,11 @@
+@@ -593,10 +600,11 @@ CONFIG_MII=y

  # CONFIG_NET_VENDOR_3COM is not set
  # CONFIG_NET_TULIP is not set
  # CONFIG_HP100 is not set
  # CONFIG_NET_VENDOR_3COM is not set
  # CONFIG_NET_TULIP is not set
  # CONFIG_HP100 is not set


@@ -25139,7 +25259,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/celleb_defconf
  # CONFIG_NET_PCI is not set
  # CONFIG_B44 is not set
  CONFIG_NETDEV_1000=y
  # CONFIG_NET_PCI is not set
  # CONFIG_B44 is not set
  CONFIG_NETDEV_1000=y

-@@ -741,6 +749,7 @@
+@@ -741,6 +749,7 @@ CONFIG_SERIAL_TXX9_CONSOLE=y

  CONFIG_UNIX98_PTYS=y
  # CONFIG_LEGACY_PTYS is not set
  CONFIG_HVC_DRIVER=y
  CONFIG_UNIX98_PTYS=y
  # CONFIG_LEGACY_PTYS is not set
  CONFIG_HVC_DRIVER=y


@@ -25147,7 +25267,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/celleb_defconf
  CONFIG_HVC_BEAT=y
  # CONFIG_IPMI_HANDLER is not set
  # CONFIG_HW_RANDOM is not set
  CONFIG_HVC_BEAT=y
  # CONFIG_IPMI_HANDLER is not set
  # CONFIG_HW_RANDOM is not set

-@@ -822,6 +831,7 @@
+@@ -822,6 +831,7 @@ CONFIG_WATCHDOG=y

  # Watchdog Device Drivers
  #
  # CONFIG_SOFT_WATCHDOG is not set
  # Watchdog Device Drivers
  #
  # CONFIG_SOFT_WATCHDOG is not set


@@ -25155,7 +25275,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/celleb_defconf
  
  #
  # PCI-based Watchdog Cards
  
  #
  # PCI-based Watchdog Cards

-@@ -1245,17 +1255,7 @@
+@@ -1245,17 +1255,7 @@ CONFIG_XMON_DISASSEMBLY=y

  CONFIG_IRQSTACKS=y
  # CONFIG_VIRQ_DEBUG is not set
  # CONFIG_BOOTX_TEXT is not set
  CONFIG_IRQSTACKS=y
  # CONFIG_VIRQ_DEBUG is not set
  # CONFIG_BOOTX_TEXT is not set


@@ -25174,9 +25294,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/celleb_defconf
  
  #
  # Security options
  
  #
  # Security options

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ebony_defconfig powerpc.git/arch/powerpc/configs/ebony_defconfig
---- linux-2.6.24/arch/powerpc/configs/ebony_defconfig  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/ebony_defconfig   2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/configs/ebony_defconfig
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/configs/ebony_defconfig
++++ linux-2.6.24.7/arch/powerpc/configs/ebony_defconfig

 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit


@@ -25187,7 +25308,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ebony_defconfi
  #
  # CONFIG_PPC64 is not set
  
  #
  # CONFIG_PPC64 is not set
  

-@@ -130,6 +130,7 @@
+@@ -130,6 +130,7 @@ CONFIG_DEFAULT_AS=y

  # CONFIG_DEFAULT_CFQ is not set
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="anticipatory"
  # CONFIG_DEFAULT_CFQ is not set
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="anticipatory"


@@ -25195,7 +25316,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ebony_defconfi
  
  #
  # Platform support
  
  #
  # Platform support

-@@ -142,6 +143,9 @@
+@@ -142,6 +143,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"

  # CONFIG_BAMBOO is not set
  CONFIG_EBONY=y
  # CONFIG_SEQUOIA is not set
  # CONFIG_BAMBOO is not set
  CONFIG_EBONY=y
  # CONFIG_SEQUOIA is not set


@@ -25205,9 +25326,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ebony_defconfi
  CONFIG_440GP=y
  # CONFIG_MPIC is not set
  # CONFIG_MPIC_WEIRD is not set
  CONFIG_440GP=y
  # CONFIG_MPIC is not set
  # CONFIG_MPIC_WEIRD is not set

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ep405_defconfig powerpc.git/arch/powerpc/configs/ep405_defconfig
---- linux-2.6.24/arch/powerpc/configs/ep405_defconfig  1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/ep405_defconfig   2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/configs/ep405_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/configs/ep405_defconfig

 @@ -0,0 +1,952 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,952 @@
 +#
 +# Automatically generated make config: don't edit


@@ -26161,9 +26283,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ep405_defconfi
 +# CONFIG_CRYPTO_AUTHENC is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set
 +# CONFIG_CRYPTO_AUTHENC is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ep8248e_defconfig powerpc.git/arch/powerpc/configs/ep8248e_defconfig
---- linux-2.6.24/arch/powerpc/configs/ep8248e_defconfig        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/ep8248e_defconfig 2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/configs/ep8248e_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/configs/ep8248e_defconfig

 @@ -0,0 +1,821 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,821 @@
 +#
 +# Automatically generated make config: don't edit


@@ -26986,9 +27109,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ep8248e_defcon
 +# CONFIG_CRYPTO_HW is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y
 +# CONFIG_CRYPTO_HW is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/katmai_defconfig powerpc.git/arch/powerpc/configs/katmai_defconfig
---- linux-2.6.24/arch/powerpc/configs/katmai_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/katmai_defconfig  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/configs/katmai_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/configs/katmai_defconfig

 @@ -0,0 +1,790 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,790 @@
 +#
 +# Automatically generated make config: don't edit


@@ -27780,9 +27904,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/katmai_defconf
 +# CONFIG_CRYPTO_AUTHENC is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set
 +# CONFIG_CRYPTO_AUTHENC is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/kilauea_defconfig powerpc.git/arch/powerpc/configs/kilauea_defconfig
---- linux-2.6.24/arch/powerpc/configs/kilauea_defconfig        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/kilauea_defconfig 2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/configs/kilauea_defconfig
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/configs/kilauea_defconfig
++++ linux-2.6.24.7/arch/powerpc/configs/kilauea_defconfig

 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit


@@ -27793,7 +27918,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/kilauea_defcon
  #
  # CONFIG_PPC64 is not set
  
  #
  # CONFIG_PPC64 is not set
  

-@@ -40,7 +40,7 @@
+@@ -40,7 +40,7 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

  CONFIG_ARCH_MAY_HAVE_PC_FDC=y
  CONFIG_PPC_OF=y
  CONFIG_OF=y
  CONFIG_ARCH_MAY_HAVE_PC_FDC=y
  CONFIG_PPC_OF=y
  CONFIG_OF=y


@@ -27802,7 +27927,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/kilauea_defcon
  # CONFIG_GENERIC_TBSYNC is not set
  CONFIG_AUDIT_ARCH=y
  CONFIG_GENERIC_BUG=y
  # CONFIG_GENERIC_TBSYNC is not set
  CONFIG_AUDIT_ARCH=y
  CONFIG_GENERIC_BUG=y

-@@ -125,6 +125,7 @@
+@@ -125,6 +125,7 @@ CONFIG_DEFAULT_AS=y

  # CONFIG_DEFAULT_CFQ is not set
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="anticipatory"
  # CONFIG_DEFAULT_CFQ is not set
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="anticipatory"


@@ -27810,7 +27935,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/kilauea_defcon
  
  #
  # Platform support
  
  #
  # Platform support

-@@ -134,9 +135,12 @@
+@@ -134,9 +135,12 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"

  # CONFIG_PPC_CELL is not set
  # CONFIG_PPC_CELL_NATIVE is not set
  # CONFIG_PQ2ADS is not set
  # CONFIG_PPC_CELL is not set
  # CONFIG_PPC_CELL_NATIVE is not set
  # CONFIG_PQ2ADS is not set


@@ -27823,7 +27948,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/kilauea_defcon
  # CONFIG_MPIC is not set
  # CONFIG_MPIC_WEIRD is not set
  # CONFIG_PPC_I8259 is not set
  # CONFIG_MPIC is not set
  # CONFIG_MPIC_WEIRD is not set
  # CONFIG_PPC_I8259 is not set

-@@ -199,11 +203,17 @@
+@@ -199,11 +203,17 @@ CONFIG_ISA_DMA_API=y

  # Bus options
  #
  CONFIG_ZONE_DMA=y
  # Bus options
  #
  CONFIG_ZONE_DMA=y


@@ -27845,7 +27970,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/kilauea_defcon
  
  #
  # Advanced setup
  
  #
  # Advanced setup

-@@ -368,11 +378,13 @@
+@@ -368,11 +378,13 @@ CONFIG_MTD_CFI_UTIL=y

  # CONFIG_MTD_COMPLEX_MAPPINGS is not set
  # CONFIG_MTD_PHYSMAP is not set
  CONFIG_MTD_PHYSMAP_OF=y
  # CONFIG_MTD_COMPLEX_MAPPINGS is not set
  # CONFIG_MTD_PHYSMAP is not set
  CONFIG_MTD_PHYSMAP_OF=y


@@ -27859,7 +27984,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/kilauea_defcon
  # CONFIG_MTD_SLRAM is not set
  # CONFIG_MTD_PHRAM is not set
  # CONFIG_MTD_MTDRAM is not set
  # CONFIG_MTD_SLRAM is not set
  # CONFIG_MTD_PHRAM is not set
  # CONFIG_MTD_MTDRAM is not set

-@@ -395,9 +407,14 @@
+@@ -395,9 +407,14 @@ CONFIG_OF_DEVICE=y

  # CONFIG_PARPORT is not set
  CONFIG_BLK_DEV=y
  # CONFIG_BLK_DEV_FD is not set
  # CONFIG_PARPORT is not set
  CONFIG_BLK_DEV=y
  # CONFIG_BLK_DEV_FD is not set


@@ -27874,7 +27999,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/kilauea_defcon
  CONFIG_BLK_DEV_RAM=y
  CONFIG_BLK_DEV_RAM_COUNT=16
  CONFIG_BLK_DEV_RAM_SIZE=35000
  CONFIG_BLK_DEV_RAM=y
  CONFIG_BLK_DEV_RAM_COUNT=16
  CONFIG_BLK_DEV_RAM_SIZE=35000

-@@ -417,6 +434,14 @@
+@@ -417,6 +434,14 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024

  # CONFIG_SCSI_NETLINK is not set
  # CONFIG_ATA is not set
  # CONFIG_MD is not set
  # CONFIG_SCSI_NETLINK is not set
  # CONFIG_ATA is not set
  # CONFIG_MD is not set


@@ -27889,7 +28014,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/kilauea_defcon
  # CONFIG_MACINTOSH_DRIVERS is not set
  CONFIG_NETDEVICES=y
  # CONFIG_NETDEVICES_MULTIQUEUE is not set
  # CONFIG_MACINTOSH_DRIVERS is not set
  CONFIG_NETDEVICES=y
  # CONFIG_NETDEVICES_MULTIQUEUE is not set

-@@ -426,9 +451,33 @@
+@@ -426,9 +451,33 @@ CONFIG_NETDEVICES=y

  # CONFIG_EQUALIZER is not set
  # CONFIG_TUN is not set
  # CONFIG_VETH is not set
  # CONFIG_EQUALIZER is not set
  # CONFIG_TUN is not set
  # CONFIG_VETH is not set


@@ -27924,7 +28049,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/kilauea_defcon
  
  #
  # Wireless LAN
  
  #
  # Wireless LAN

-@@ -436,6 +485,8 @@
+@@ -436,6 +485,8 @@ CONFIG_NETDEVICES=y

  # CONFIG_WLAN_PRE80211 is not set
  # CONFIG_WLAN_80211 is not set
  # CONFIG_WAN is not set
  # CONFIG_WLAN_PRE80211 is not set
  # CONFIG_WLAN_80211 is not set
  # CONFIG_WAN is not set


@@ -27933,7 +28058,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/kilauea_defcon
  # CONFIG_PPP is not set
  # CONFIG_SLIP is not set
  # CONFIG_SHAPER is not set
  # CONFIG_PPP is not set
  # CONFIG_SLIP is not set
  # CONFIG_SHAPER is not set

-@@ -467,6 +518,7 @@
+@@ -467,6 +518,7 @@ CONFIG_NETDEVICES=y

  #
  CONFIG_SERIAL_8250=y
  CONFIG_SERIAL_8250_CONSOLE=y
  #
  CONFIG_SERIAL_8250=y
  CONFIG_SERIAL_8250_CONSOLE=y


@@ -27941,7 +28066,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/kilauea_defcon
  CONFIG_SERIAL_8250_NR_UARTS=4
  CONFIG_SERIAL_8250_RUNTIME_UARTS=4
  CONFIG_SERIAL_8250_EXTENDED=y
  CONFIG_SERIAL_8250_NR_UARTS=4
  CONFIG_SERIAL_8250_RUNTIME_UARTS=4
  CONFIG_SERIAL_8250_EXTENDED=y

-@@ -481,6 +533,7 @@
+@@ -481,6 +533,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y

  # CONFIG_SERIAL_UARTLITE is not set
  CONFIG_SERIAL_CORE=y
  CONFIG_SERIAL_CORE_CONSOLE=y
  # CONFIG_SERIAL_UARTLITE is not set
  CONFIG_SERIAL_CORE=y
  CONFIG_SERIAL_CORE_CONSOLE=y


@@ -27949,7 +28074,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/kilauea_defcon
  CONFIG_SERIAL_OF_PLATFORM=y
  CONFIG_UNIX98_PTYS=y
  CONFIG_LEGACY_PTYS=y
  CONFIG_SERIAL_OF_PLATFORM=y
  CONFIG_UNIX98_PTYS=y
  CONFIG_LEGACY_PTYS=y

-@@ -490,8 +543,10 @@
+@@ -490,8 +543,10 @@ CONFIG_LEGACY_PTY_COUNT=256

  # CONFIG_NVRAM is not set
  # CONFIG_GEN_RTC is not set
  # CONFIG_R3964 is not set
  # CONFIG_NVRAM is not set
  # CONFIG_GEN_RTC is not set
  # CONFIG_R3964 is not set


@@ -27960,7 +28085,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/kilauea_defcon
  # CONFIG_I2C is not set
  
  #
  # CONFIG_I2C is not set
  
  #

-@@ -525,6 +580,8 @@
+@@ -525,6 +580,8 @@ CONFIG_SSB_POSSIBLE=y

  #
  # Graphics support
  #
  #
  # Graphics support
  #


@@ -27969,7 +28094,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/kilauea_defcon
  # CONFIG_VGASTATE is not set
  # CONFIG_VIDEO_OUTPUT_CONTROL is not set
  # CONFIG_FB is not set
  # CONFIG_VGASTATE is not set
  # CONFIG_VIDEO_OUTPUT_CONTROL is not set
  # CONFIG_FB is not set

-@@ -542,6 +599,7 @@
+@@ -542,6 +599,7 @@ CONFIG_SSB_POSSIBLE=y

  # CONFIG_USB_SUPPORT is not set
  # CONFIG_MMC is not set
  # CONFIG_NEW_LEDS is not set
  # CONFIG_USB_SUPPORT is not set
  # CONFIG_MMC is not set
  # CONFIG_NEW_LEDS is not set


@@ -27977,9 +28102,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/kilauea_defcon
  # CONFIG_EDAC is not set
  # CONFIG_RTC_CLASS is not set
  
  # CONFIG_EDAC is not set
  # CONFIG_RTC_CLASS is not set
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/lite5200_defconfig powerpc.git/arch/powerpc/configs/lite5200_defconfig
---- linux-2.6.24/arch/powerpc/configs/lite5200_defconfig       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/lite5200_defconfig        1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/configs/lite5200_defconfig
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/configs/lite5200_defconfig
++++ /dev/null

 @@ -1,847 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,847 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -28828,9 +28954,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/lite5200_defco
 -# CONFIG_CRYPTO is not set
 -CONFIG_PPC_CLOCK=y
 -CONFIG_PPC_LIB_RHEAP=y
 -# CONFIG_CRYPTO is not set
 -CONFIG_PPC_CLOCK=y
 -CONFIG_PPC_LIB_RHEAP=y

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/makalu_defconfig powerpc.git/arch/powerpc/configs/makalu_defconfig
---- linux-2.6.24/arch/powerpc/configs/makalu_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/makalu_defconfig  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/configs/makalu_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/configs/makalu_defconfig

 @@ -0,0 +1,812 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,812 @@
 +#
 +# Automatically generated make config: don't edit


@@ -29644,9 +29771,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/makalu_defconf
 +# CONFIG_CRYPTO_AUTHENC is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set
 +# CONFIG_CRYPTO_AUTHENC is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/mpc5200_defconfig powerpc.git/arch/powerpc/configs/mpc5200_defconfig
---- linux-2.6.24/arch/powerpc/configs/mpc5200_defconfig        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/mpc5200_defconfig 2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/configs/mpc5200_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/configs/mpc5200_defconfig

 @@ -0,0 +1,1286 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,1286 @@
 +#
 +# Automatically generated make config: don't edit


@@ -30934,9 +31062,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/mpc5200_defcon
 +CONFIG_CRYPTO_HW=y
 +CONFIG_PPC_CLOCK=y
 +CONFIG_PPC_LIB_RHEAP=y
 +CONFIG_CRYPTO_HW=y
 +CONFIG_PPC_CLOCK=y
 +CONFIG_PPC_LIB_RHEAP=y

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/mpc8313_rdb_defconfig powerpc.git/arch/powerpc/configs/mpc8313_rdb_defconfig
---- linux-2.6.24/arch/powerpc/configs/mpc8313_rdb_defconfig    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/mpc8313_rdb_defconfig     2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/configs/mpc8313_rdb_defconfig
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/configs/mpc8313_rdb_defconfig
++++ linux-2.6.24.7/arch/powerpc/configs/mpc8313_rdb_defconfig

 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit


@@ -30947,7 +31076,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/mpc8313_rdb_de
  #
  # CONFIG_PPC64 is not set
  
  #
  # CONFIG_PPC64 is not set
  

-@@ -144,6 +144,7 @@
+@@ -144,6 +144,7 @@ CONFIG_MPC8313_RDB=y

  # CONFIG_MPC834x_MDS is not set
  # CONFIG_MPC834x_ITX is not set
  # CONFIG_MPC836x_MDS is not set
  # CONFIG_MPC834x_MDS is not set
  # CONFIG_MPC834x_ITX is not set
  # CONFIG_MPC836x_MDS is not set


@@ -30955,7 +31084,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/mpc8313_rdb_de
  CONFIG_PPC_MPC831x=y
  # CONFIG_MPIC is not set
  # CONFIG_MPIC_WEIRD is not set
  CONFIG_PPC_MPC831x=y
  # CONFIG_MPIC is not set
  # CONFIG_MPIC_WEIRD is not set

-@@ -336,15 +337,16 @@
+@@ -336,15 +337,16 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y

  CONFIG_MTD=y
  # CONFIG_MTD_DEBUG is not set
  # CONFIG_MTD_CONCAT is not set
  CONFIG_MTD=y
  # CONFIG_MTD_DEBUG is not set
  # CONFIG_MTD_CONCAT is not set


@@ -30976,7 +31105,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/mpc8313_rdb_de
  # CONFIG_FTL is not set
  # CONFIG_NFTL is not set
  # CONFIG_INFTL is not set
  # CONFIG_FTL is not set
  # CONFIG_NFTL is not set
  # CONFIG_INFTL is not set

-@@ -381,11 +383,8 @@
+@@ -381,11 +383,8 @@ CONFIG_MTD_CFI_UTIL=y

  # Mapping drivers for chip access
  #
  # CONFIG_MTD_COMPLEX_MAPPINGS is not set
  # Mapping drivers for chip access
  #
  # CONFIG_MTD_COMPLEX_MAPPINGS is not set


@@ -30990,7 +31119,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/mpc8313_rdb_de
  # CONFIG_MTD_INTEL_VR_NOR is not set
  # CONFIG_MTD_PLATRAM is not set
  
  # CONFIG_MTD_INTEL_VR_NOR is not set
  # CONFIG_MTD_PLATRAM is not set
  

-@@ -406,7 +405,16 @@
+@@ -406,7 +405,16 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2

  # CONFIG_MTD_DOC2000 is not set
  # CONFIG_MTD_DOC2001 is not set
  # CONFIG_MTD_DOC2001PLUS is not set
  # CONFIG_MTD_DOC2000 is not set
  # CONFIG_MTD_DOC2001 is not set
  # CONFIG_MTD_DOC2001PLUS is not set


@@ -31008,7 +31137,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/mpc8313_rdb_de
  # CONFIG_MTD_ONENAND is not set
  
  #
  # CONFIG_MTD_ONENAND is not set
  
  #

-@@ -1178,7 +1186,17 @@
+@@ -1178,7 +1186,17 @@ CONFIG_TMPFS=y

  # CONFIG_BEFS_FS is not set
  # CONFIG_BFS_FS is not set
  # CONFIG_EFS_FS is not set
  # CONFIG_BEFS_FS is not set
  # CONFIG_BFS_FS is not set
  # CONFIG_EFS_FS is not set


@@ -31027,7 +31156,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/mpc8313_rdb_de
  # CONFIG_CRAMFS is not set
  # CONFIG_VXFS_FS is not set
  # CONFIG_HPFS_FS is not set
  # CONFIG_CRAMFS is not set
  # CONFIG_VXFS_FS is not set
  # CONFIG_HPFS_FS is not set

-@@ -1242,6 +1260,8 @@
+@@ -1242,6 +1260,8 @@ CONFIG_BITREVERSE=y

  CONFIG_CRC32=y
  # CONFIG_CRC7 is not set
  # CONFIG_LIBCRC32C is not set
  CONFIG_CRC32=y
  # CONFIG_CRC7 is not set
  # CONFIG_LIBCRC32C is not set


@@ -31036,10 +31165,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/mpc8313_rdb_de
  CONFIG_PLIST=y
  CONFIG_HAS_IOMEM=y
  CONFIG_HAS_IOPORT=y
  CONFIG_PLIST=y
  CONFIG_HAS_IOMEM=y
  CONFIG_HAS_IOPORT=y

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/mpc834x_itx_defconfig powerpc.git/arch/powerpc/configs/mpc834x_itx_defconfig
---- linux-2.6.24/arch/powerpc/configs/mpc834x_itx_defconfig    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/mpc834x_itx_defconfig     2008-01-28 20:25:49.000000000 +0100
-@@ -570,7 +570,8 @@
+Index: linux-2.6.24.7/arch/powerpc/configs/mpc834x_itx_defconfig
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/configs/mpc834x_itx_defconfig
++++ linux-2.6.24.7/arch/powerpc/configs/mpc834x_itx_defconfig
+@@ -570,7 +570,8 @@ CONFIG_SATA_SIL=y

  # CONFIG_PATA_SIS is not set
  # CONFIG_PATA_VIA is not set
  # CONFIG_PATA_WINBOND is not set
  # CONFIG_PATA_SIS is not set
  # CONFIG_PATA_VIA is not set
  # CONFIG_PATA_WINBOND is not set


@@ -31049,9 +31179,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/mpc834x_itx_de
  CONFIG_MD=y
  CONFIG_BLK_DEV_MD=y
  CONFIG_MD_LINEAR=y
  CONFIG_MD=y
  CONFIG_BLK_DEV_MD=y
  CONFIG_MD_LINEAR=y

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/mpc837x_mds_defconfig powerpc.git/arch/powerpc/configs/mpc837x_mds_defconfig
---- linux-2.6.24/arch/powerpc/configs/mpc837x_mds_defconfig    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/mpc837x_mds_defconfig     2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/configs/mpc837x_mds_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/configs/mpc837x_mds_defconfig

 @@ -0,0 +1,878 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,878 @@
 +#
 +# Automatically generated make config: don't edit


@@ -31931,10 +32062,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/mpc837x_mds_de
 +# CONFIG_CRYPTO_CAMELLIA is not set
 +# CONFIG_CRYPTO_TEST is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_CAMELLIA is not set
 +# CONFIG_CRYPTO_TEST is not set
 +CONFIG_CRYPTO_HW=y

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/mpc8610_hpcd_defconfig powerpc.git/arch/powerpc/configs/mpc8610_hpcd_defconfig
---- linux-2.6.24/arch/powerpc/configs/mpc8610_hpcd_defconfig   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/mpc8610_hpcd_defconfig    2008-01-28 20:25:49.000000000 +0100
-@@ -696,7 +696,7 @@
+Index: linux-2.6.24.7/arch/powerpc/configs/mpc8610_hpcd_defconfig
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/configs/mpc8610_hpcd_defconfig
++++ linux-2.6.24.7/arch/powerpc/configs/mpc8610_hpcd_defconfig
+@@ -696,7 +696,7 @@ CONFIG_SERIAL_8250_RSA=y

  CONFIG_SERIAL_CORE=y
  CONFIG_SERIAL_CORE_CONSOLE=y
  # CONFIG_SERIAL_JSM is not set
  CONFIG_SERIAL_CORE=y
  CONFIG_SERIAL_CORE_CONSOLE=y
  # CONFIG_SERIAL_JSM is not set


@@ -31943,7 +32075,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/mpc8610_hpcd_d
  CONFIG_UNIX98_PTYS=y
  # CONFIG_LEGACY_PTYS is not set
  # CONFIG_IPMI_HANDLER is not set
  CONFIG_UNIX98_PTYS=y
  # CONFIG_LEGACY_PTYS is not set
  # CONFIG_IPMI_HANDLER is not set

-@@ -708,7 +708,60 @@
+@@ -708,7 +708,60 @@ CONFIG_UNIX98_PTYS=y

  # CONFIG_RAW_DRIVER is not set
  # CONFIG_TCG_TPM is not set
  CONFIG_DEVPORT=y
  # CONFIG_RAW_DRIVER is not set
  # CONFIG_TCG_TPM is not set
  CONFIG_DEVPORT=y


@@ -32005,7 +32137,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/mpc8610_hpcd_d
  
  #
  # SPI support
  
  #
  # SPI support

-@@ -763,7 +816,119 @@
+@@ -763,7 +816,119 @@ CONFIG_DUMMY_CONSOLE=y

  #
  # Sound
  #
  #
  # Sound
  #


@@ -32126,9 +32258,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/mpc8610_hpcd_d
  CONFIG_HID_SUPPORT=y
  CONFIG_HID=y
  # CONFIG_HID_DEBUG is not set
  CONFIG_HID_SUPPORT=y
  CONFIG_HID=y
  # CONFIG_HID_DEBUG is not set

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/pasemi_defconfig powerpc.git/arch/powerpc/configs/pasemi_defconfig
---- linux-2.6.24/arch/powerpc/configs/pasemi_defconfig 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/pasemi_defconfig  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/configs/pasemi_defconfig
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/configs/pasemi_defconfig
++++ linux-2.6.24.7/arch/powerpc/configs/pasemi_defconfig

 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit


@@ -32139,7 +32272,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/pasemi_defconf
  #
  CONFIG_PPC64=y
  
  #
  CONFIG_PPC64=y
  

-@@ -152,7 +152,6 @@
+@@ -152,7 +152,6 @@ CONFIG_PPC_PASEMI=y

  CONFIG_PPC_PASEMI_IOMMU=y
  # CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set
  CONFIG_PPC_PASEMI_MDIO=y
  CONFIG_PPC_PASEMI_IOMMU=y
  # CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set
  CONFIG_PPC_PASEMI_MDIO=y


@@ -32147,7 +32280,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/pasemi_defconf
  # CONFIG_PPC_CELLEB is not set
  # CONFIG_PPC_PS3 is not set
  # CONFIG_PPC_CELL is not set
  # CONFIG_PPC_CELLEB is not set
  # CONFIG_PPC_PS3 is not set
  # CONFIG_PPC_CELL is not set

-@@ -256,7 +255,7 @@
+@@ -256,7 +255,7 @@ CONFIG_PCI_DOMAINS=y

  CONFIG_PCI_SYSCALL=y
  # CONFIG_PCIEPORTBUS is not set
  CONFIG_ARCH_SUPPORTS_MSI=y
  CONFIG_PCI_SYSCALL=y
  # CONFIG_PCIEPORTBUS is not set
  CONFIG_ARCH_SUPPORTS_MSI=y


@@ -32156,7 +32289,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/pasemi_defconf
  CONFIG_PCI_LEGACY=y
  # CONFIG_PCI_DEBUG is not set
  CONFIG_PCCARD=y
  CONFIG_PCI_LEGACY=y
  # CONFIG_PCI_DEBUG is not set
  CONFIG_PCCARD=y

-@@ -663,7 +662,26 @@
+@@ -663,7 +662,26 @@ CONFIG_PATA_PCMCIA=y

  # CONFIG_PATA_VIA is not set
  # CONFIG_PATA_WINBOND is not set
  CONFIG_PATA_PLATFORM=y
  # CONFIG_PATA_VIA is not set
  # CONFIG_PATA_WINBOND is not set
  CONFIG_PATA_PLATFORM=y


@@ -32184,7 +32317,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/pasemi_defconf
  # CONFIG_FUSION is not set
  
  #
  # CONFIG_FUSION is not set
  
  #

-@@ -1686,6 +1704,10 @@
+@@ -1686,6 +1704,10 @@ CONFIG_XMON_DISASSEMBLY=y

  # CONFIG_KEYS is not set
  # CONFIG_SECURITY is not set
  # CONFIG_SECURITY_FILE_CAPABILITIES is not set
  # CONFIG_KEYS is not set
  # CONFIG_SECURITY is not set
  # CONFIG_SECURITY_FILE_CAPABILITIES is not set


@@ -32195,9 +32328,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/pasemi_defconf
  CONFIG_CRYPTO=y
  CONFIG_CRYPTO_ALGAPI=y
  CONFIG_CRYPTO_BLKCIPHER=y
  CONFIG_CRYPTO=y
  CONFIG_CRYPTO_ALGAPI=y
  CONFIG_CRYPTO_BLKCIPHER=y

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ppc64_defconfig powerpc.git/arch/powerpc/configs/ppc64_defconfig
---- linux-2.6.24/arch/powerpc/configs/ppc64_defconfig  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/ppc64_defconfig   2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/configs/ppc64_defconfig
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/configs/ppc64_defconfig
++++ linux-2.6.24.7/arch/powerpc/configs/ppc64_defconfig

 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit


@@ -32207,7 +32341,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ppc64_defconfi
  #
  CONFIG_PPC64=y
  
  #
  CONFIG_PPC64=y
  

-@@ -211,7 +211,7 @@
+@@ -211,7 +211,7 @@ CONFIG_MMIO_NVRAM=y

  CONFIG_MPIC_U3_HT_IRQS=y
  CONFIG_MPIC_BROKEN_REGREAD=y
  CONFIG_IBMVIO=y
  CONFIG_MPIC_U3_HT_IRQS=y
  CONFIG_MPIC_BROKEN_REGREAD=y
  CONFIG_IBMVIO=y


@@ -32216,7 +32350,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ppc64_defconfi
  # CONFIG_PPC_MPC106 is not set
  CONFIG_PPC_970_NAP=y
  CONFIG_PPC_INDIRECT_IO=y
  # CONFIG_PPC_MPC106 is not set
  CONFIG_PPC_970_NAP=y
  CONFIG_PPC_INDIRECT_IO=y

-@@ -375,7 +375,7 @@
+@@ -375,7 +375,7 @@ CONFIG_INET_TUNNEL=y

  CONFIG_INET_XFRM_MODE_TRANSPORT=y
  CONFIG_INET_XFRM_MODE_TUNNEL=y
  CONFIG_INET_XFRM_MODE_BEET=y
  CONFIG_INET_XFRM_MODE_TRANSPORT=y
  CONFIG_INET_XFRM_MODE_TUNNEL=y
  CONFIG_INET_XFRM_MODE_BEET=y


@@ -32225,7 +32359,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ppc64_defconfi
  CONFIG_INET_DIAG=y
  CONFIG_INET_TCP_DIAG=y
  # CONFIG_TCP_CONG_ADVANCED is not set
  CONFIG_INET_DIAG=y
  CONFIG_INET_TCP_DIAG=y
  # CONFIG_TCP_CONG_ADVANCED is not set

-@@ -929,6 +929,7 @@
+@@ -929,6 +929,7 @@ CONFIG_SPIDER_NET=m

  CONFIG_NETDEV_10000=y
  # CONFIG_CHELSIO_T1 is not set
  # CONFIG_CHELSIO_T3 is not set
  CONFIG_NETDEV_10000=y
  # CONFIG_CHELSIO_T1 is not set
  # CONFIG_CHELSIO_T3 is not set


@@ -32233,7 +32367,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ppc64_defconfi
  # CONFIG_IXGBE is not set
  CONFIG_IXGB=m
  # CONFIG_IXGB_NAPI is not set
  # CONFIG_IXGBE is not set
  CONFIG_IXGB=m
  # CONFIG_IXGB_NAPI is not set

-@@ -1558,6 +1559,7 @@
+@@ -1558,6 +1559,7 @@ CONFIG_INFINIBAND_ADDR_TRANS=y

  CONFIG_INFINIBAND_MTHCA=m
  CONFIG_INFINIBAND_MTHCA_DEBUG=y
  # CONFIG_INFINIBAND_IPATH is not set
  CONFIG_INFINIBAND_MTHCA=m
  CONFIG_INFINIBAND_MTHCA_DEBUG=y
  # CONFIG_INFINIBAND_IPATH is not set


@@ -32241,9 +32375,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ppc64_defconfi
  # CONFIG_INFINIBAND_AMSO1100 is not set
  # CONFIG_MLX4_INFINIBAND is not set
  CONFIG_INFINIBAND_IPOIB=m
  # CONFIG_INFINIBAND_AMSO1100 is not set
  # CONFIG_MLX4_INFINIBAND is not set
  CONFIG_INFINIBAND_IPOIB=m

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ps3_defconfig powerpc.git/arch/powerpc/configs/ps3_defconfig
---- linux-2.6.24/arch/powerpc/configs/ps3_defconfig    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/ps3_defconfig     2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/configs/ps3_defconfig
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/configs/ps3_defconfig
++++ linux-2.6.24.7/arch/powerpc/configs/ps3_defconfig

 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit


@@ -32254,7 +32389,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ps3_defconfig
  #
  CONFIG_PPC64=y
  
  #
  CONFIG_PPC64=y
  

-@@ -103,6 +103,7 @@
+@@ -103,6 +103,7 @@ CONFIG_VM_EVENT_COUNTERS=y

  CONFIG_SLAB=y
  # CONFIG_SLUB is not set
  # CONFIG_SLOB is not set
  CONFIG_SLAB=y
  # CONFIG_SLUB is not set
  # CONFIG_SLOB is not set


@@ -32262,7 +32397,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ps3_defconfig
  CONFIG_RT_MUTEXES=y
  # CONFIG_TINY_SHMEM is not set
  CONFIG_BASE_SMALL=0
  CONFIG_RT_MUTEXES=y
  # CONFIG_TINY_SHMEM is not set
  CONFIG_BASE_SMALL=0

-@@ -154,7 +155,6 @@
+@@ -154,7 +155,6 @@ CONFIG_PPC_PS3=y

  # CONFIG_PS3_ADVANCED is not set
  CONFIG_PS3_HTAB_SIZE=20
  # CONFIG_PS3_DYNAMIC_DMA is not set
  # CONFIG_PS3_ADVANCED is not set
  CONFIG_PS3_HTAB_SIZE=20
  # CONFIG_PS3_DYNAMIC_DMA is not set


@@ -32270,7 +32405,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ps3_defconfig
  CONFIG_PS3_VUART=y
  CONFIG_PS3_PS3AV=y
  CONFIG_PS3_SYS_MANAGER=y
  CONFIG_PS3_VUART=y
  CONFIG_PS3_PS3AV=y
  CONFIG_PS3_SYS_MANAGER=y

-@@ -162,6 +162,7 @@
+@@ -162,6 +162,7 @@ CONFIG_PS3_STORAGE=y

  CONFIG_PS3_DISK=y
  CONFIG_PS3_ROM=y
  CONFIG_PS3_FLASH=y
  CONFIG_PS3_DISK=y
  CONFIG_PS3_ROM=y
  CONFIG_PS3_FLASH=y


@@ -32278,7 +32413,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ps3_defconfig
  CONFIG_PPC_CELL=y
  # CONFIG_PPC_CELL_NATIVE is not set
  # CONFIG_PPC_IBM_CELL_BLADE is not set
  CONFIG_PPC_CELL=y
  # CONFIG_PPC_CELL_NATIVE is not set
  # CONFIG_PPC_IBM_CELL_BLADE is not set

-@@ -225,7 +226,7 @@
+@@ -225,7 +226,7 @@ CONFIG_HAVE_MEMORY_PRESENT=y

  # CONFIG_SPARSEMEM_STATIC is not set
  CONFIG_SPARSEMEM_EXTREME=y
  CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
  # CONFIG_SPARSEMEM_STATIC is not set
  CONFIG_SPARSEMEM_EXTREME=y
  CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y


@@ -32287,7 +32422,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ps3_defconfig
  CONFIG_MEMORY_HOTPLUG=y
  CONFIG_MEMORY_HOTPLUG_SPARSE=y
  CONFIG_SPLIT_PTLOCK_CPUS=4
  CONFIG_MEMORY_HOTPLUG=y
  CONFIG_MEMORY_HOTPLUG_SPARSE=y
  CONFIG_SPLIT_PTLOCK_CPUS=4

-@@ -338,7 +339,26 @@
+@@ -338,7 +339,26 @@ CONFIG_IPV6_SIT=y

  # CONFIG_NET_PKTGEN is not set
  # CONFIG_HAMRADIO is not set
  # CONFIG_IRDA is not set
  # CONFIG_NET_PKTGEN is not set
  # CONFIG_HAMRADIO is not set
  # CONFIG_IRDA is not set


@@ -32315,7 +32450,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ps3_defconfig
  # CONFIG_AF_RXRPC is not set
  
  #
  # CONFIG_AF_RXRPC is not set
  
  #

-@@ -666,14 +686,14 @@
+@@ -666,14 +686,14 @@ CONFIG_LOGO_LINUX_CLUT224=y

  #
  # Sound
  #
  #
  # Sound
  #


@@ -32334,7 +32469,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ps3_defconfig
  # CONFIG_SND_SEQUENCER is not set
  # CONFIG_SND_MIXER_OSS is not set
  # CONFIG_SND_PCM_OSS is not set
  # CONFIG_SND_SEQUENCER is not set
  # CONFIG_SND_MIXER_OSS is not set
  # CONFIG_SND_PCM_OSS is not set

-@@ -702,7 +722,7 @@
+@@ -702,7 +722,7 @@ CONFIG_SND_VERBOSE_PROCFS=y

  #
  # ALSA PowerPC devices
  #
  #
  # ALSA PowerPC devices
  #


@@ -32343,7 +32478,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ps3_defconfig
  CONFIG_SND_PS3_DEFAULT_START_DELAY=2000
  
  #
  CONFIG_SND_PS3_DEFAULT_START_DELAY=2000
  
  #

-@@ -747,7 +767,7 @@
+@@ -747,7 +767,7 @@ CONFIG_USB_SUPPORT=y

  CONFIG_USB_ARCH_HAS_HCD=y
  CONFIG_USB_ARCH_HAS_OHCI=y
  CONFIG_USB_ARCH_HAS_EHCI=y
  CONFIG_USB_ARCH_HAS_HCD=y
  CONFIG_USB_ARCH_HAS_OHCI=y
  CONFIG_USB_ARCH_HAS_EHCI=y


@@ -32352,7 +32487,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ps3_defconfig
  # CONFIG_USB_DEBUG is not set
  
  #
  # CONFIG_USB_DEBUG is not set
  
  #

-@@ -761,13 +781,13 @@
+@@ -761,13 +781,13 @@ CONFIG_USB_DEVICEFS=y

  #
  # USB Host Controller Drivers
  #
  #
  # USB Host Controller Drivers
  #


@@ -32368,7 +32503,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ps3_defconfig
  # CONFIG_USB_OHCI_HCD_PPC_OF is not set
  # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
  CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
  # CONFIG_USB_OHCI_HCD_PPC_OF is not set
  # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
  CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y

-@@ -1033,7 +1053,8 @@
+@@ -1033,7 +1053,8 @@ CONFIG_HAS_IOMEM=y

  CONFIG_HAS_IOPORT=y
  CONFIG_HAS_DMA=y
  CONFIG_INSTRUMENTATION=y
  CONFIG_HAS_IOPORT=y
  CONFIG_HAS_DMA=y
  CONFIG_INSTRUMENTATION=y


@@ -32378,9 +32513,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ps3_defconfig
  # CONFIG_KPROBES is not set
  # CONFIG_MARKERS is not set
  
  # CONFIG_KPROBES is not set
  # CONFIG_MARKERS is not set
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/rainier_defconfig powerpc.git/arch/powerpc/configs/rainier_defconfig
---- linux-2.6.24/arch/powerpc/configs/rainier_defconfig        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/rainier_defconfig 2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/configs/rainier_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/configs/rainier_defconfig

 @@ -0,0 +1,873 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,873 @@
 +#
 +# Automatically generated make config: don't edit


@@ -33255,9 +33391,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/rainier_defcon
 +# CONFIG_CRYPTO_AUTHENC is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set
 +# CONFIG_CRYPTO_AUTHENC is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/sequoia_defconfig powerpc.git/arch/powerpc/configs/sequoia_defconfig
---- linux-2.6.24/arch/powerpc/configs/sequoia_defconfig        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/sequoia_defconfig 2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/configs/sequoia_defconfig
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/configs/sequoia_defconfig
++++ linux-2.6.24.7/arch/powerpc/configs/sequoia_defconfig

 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit


@@ -33268,7 +33405,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/sequoia_defcon
  #
  # CONFIG_PPC64 is not set
  
  #
  # CONFIG_PPC64 is not set
  

-@@ -129,6 +129,7 @@
+@@ -129,6 +129,7 @@ CONFIG_DEFAULT_AS=y

  # CONFIG_DEFAULT_CFQ is not set
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="anticipatory"
  # CONFIG_DEFAULT_CFQ is not set
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="anticipatory"


@@ -33276,7 +33413,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/sequoia_defcon
  
  #
  # Platform support
  
  #
  # Platform support

-@@ -141,8 +142,10 @@
+@@ -141,8 +142,10 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"

  # CONFIG_BAMBOO is not set
  # CONFIG_EBONY is not set
  CONFIG_SEQUOIA=y
  # CONFIG_BAMBOO is not set
  # CONFIG_EBONY is not set
  CONFIG_SEQUOIA=y


@@ -33288,7 +33425,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/sequoia_defcon
  # CONFIG_MPIC is not set
  # CONFIG_MPIC_WEIRD is not set
  # CONFIG_PPC_I8259 is not set
  # CONFIG_MPIC is not set
  # CONFIG_MPIC_WEIRD is not set
  # CONFIG_PPC_I8259 is not set

-@@ -446,9 +449,7 @@
+@@ -446,9 +449,7 @@ CONFIG_MISC_DEVICES=y

  # CONFIG_FIREWIRE is not set
  # CONFIG_IEEE1394 is not set
  # CONFIG_I2O is not set
  # CONFIG_FIREWIRE is not set
  # CONFIG_IEEE1394 is not set
  # CONFIG_I2O is not set


@@ -33299,7 +33436,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/sequoia_defcon
  CONFIG_NETDEVICES=y
  # CONFIG_NETDEVICES_MULTIQUEUE is not set
  # CONFIG_DUMMY is not set
  CONFIG_NETDEVICES=y
  # CONFIG_NETDEVICES_MULTIQUEUE is not set
  # CONFIG_DUMMY is not set

-@@ -459,10 +460,28 @@
+@@ -459,10 +460,28 @@ CONFIG_NETDEVICES=y

  # CONFIG_VETH is not set
  # CONFIG_IP1000 is not set
  # CONFIG_ARCNET is not set
  # CONFIG_VETH is not set
  # CONFIG_IP1000 is not set
  # CONFIG_ARCNET is not set


@@ -33329,7 +33466,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/sequoia_defcon
  CONFIG_NETDEV_1000=y
  # CONFIG_ACENIC is not set
  # CONFIG_DL2K is not set
  CONFIG_NETDEV_1000=y
  # CONFIG_ACENIC is not set
  # CONFIG_DL2K is not set

-@@ -811,6 +830,7 @@
+@@ -811,6 +830,7 @@ CONFIG_PPC_EARLY_DEBUG=y

  # CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
  # CONFIG_PPC_EARLY_DEBUG_BEAT is not set
  CONFIG_PPC_EARLY_DEBUG_44x=y
  # CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
  # CONFIG_PPC_EARLY_DEBUG_BEAT is not set
  CONFIG_PPC_EARLY_DEBUG_44x=y


@@ -33337,9 +33474,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/sequoia_defcon
  # CONFIG_PPC_EARLY_DEBUG_CPM is not set
  CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300
  CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1
  # CONFIG_PPC_EARLY_DEBUG_CPM is not set
  CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300
  CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/storcenter_defconfig powerpc.git/arch/powerpc/configs/storcenter_defconfig
---- linux-2.6.24/arch/powerpc/configs/storcenter_defconfig     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/storcenter_defconfig      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/configs/storcenter_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/configs/storcenter_defconfig

 @@ -0,0 +1,1174 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,1174 @@
 +#
 +# Automatically generated make config: don't edit


@@ -34515,9 +34653,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/storcenter_def
 +CONFIG_ASYNC_XOR=y
 +# CONFIG_CRYPTO is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_ASYNC_XOR=y
 +# CONFIG_CRYPTO is not set
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/taishan_defconfig powerpc.git/arch/powerpc/configs/taishan_defconfig
---- linux-2.6.24/arch/powerpc/configs/taishan_defconfig        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/taishan_defconfig 2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/configs/taishan_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/configs/taishan_defconfig

 @@ -0,0 +1,790 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,790 @@
 +#
 +# Automatically generated make config: don't edit


@@ -35309,9 +35448,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/taishan_defcon
 +# CONFIG_CRYPTO_AUTHENC is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set
 +# CONFIG_CRYPTO_AUTHENC is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/walnut_defconfig powerpc.git/arch/powerpc/configs/walnut_defconfig
---- linux-2.6.24/arch/powerpc/configs/walnut_defconfig 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/walnut_defconfig  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/configs/walnut_defconfig
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/configs/walnut_defconfig
++++ linux-2.6.24.7/arch/powerpc/configs/walnut_defconfig

 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit


@@ -35322,7 +35462,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/walnut_defconf
  #
  # CONFIG_PPC64 is not set
  
  #
  # CONFIG_PPC64 is not set
  

-@@ -40,7 +40,7 @@
+@@ -40,7 +40,7 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

  CONFIG_ARCH_MAY_HAVE_PC_FDC=y
  CONFIG_PPC_OF=y
  CONFIG_OF=y
  CONFIG_ARCH_MAY_HAVE_PC_FDC=y
  CONFIG_PPC_OF=y
  CONFIG_OF=y


@@ -35331,7 +35471,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/walnut_defconf
  # CONFIG_GENERIC_TBSYNC is not set
  CONFIG_AUDIT_ARCH=y
  CONFIG_GENERIC_BUG=y
  # CONFIG_GENERIC_TBSYNC is not set
  CONFIG_AUDIT_ARCH=y
  CONFIG_GENERIC_BUG=y

-@@ -127,6 +127,7 @@
+@@ -127,6 +127,7 @@ CONFIG_DEFAULT_AS=y

  # CONFIG_DEFAULT_CFQ is not set
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="anticipatory"
  # CONFIG_DEFAULT_CFQ is not set
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="anticipatory"


@@ -35339,7 +35479,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/walnut_defconf
  
  #
  # Platform support
  
  #
  # Platform support

-@@ -136,7 +137,9 @@
+@@ -136,7 +137,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"

  # CONFIG_PPC_CELL is not set
  # CONFIG_PPC_CELL_NATIVE is not set
  # CONFIG_PQ2ADS is not set
  # CONFIG_PPC_CELL is not set
  # CONFIG_PPC_CELL_NATIVE is not set
  # CONFIG_PQ2ADS is not set


@@ -35349,7 +35489,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/walnut_defconf
  CONFIG_WALNUT=y
  # CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
  CONFIG_405GP=y
  CONFIG_WALNUT=y
  # CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
  CONFIG_405GP=y

-@@ -204,11 +207,17 @@
+@@ -204,11 +207,17 @@ CONFIG_ISA_DMA_API=y

  # Bus options
  #
  CONFIG_ZONE_DMA=y
  # Bus options
  #
  CONFIG_ZONE_DMA=y


@@ -35371,7 +35511,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/walnut_defconf
  
  #
  # Advanced setup
  
  #
  # Advanced setup

-@@ -373,11 +382,13 @@
+@@ -373,11 +382,13 @@ CONFIG_MTD_CFI_UTIL=y

  # CONFIG_MTD_COMPLEX_MAPPINGS is not set
  # CONFIG_MTD_PHYSMAP is not set
  CONFIG_MTD_PHYSMAP_OF=y
  # CONFIG_MTD_COMPLEX_MAPPINGS is not set
  # CONFIG_MTD_PHYSMAP is not set
  CONFIG_MTD_PHYSMAP_OF=y


@@ -35385,7 +35525,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/walnut_defconf
  # CONFIG_MTD_SLRAM is not set
  # CONFIG_MTD_PHRAM is not set
  # CONFIG_MTD_MTDRAM is not set
  # CONFIG_MTD_SLRAM is not set
  # CONFIG_MTD_PHRAM is not set
  # CONFIG_MTD_MTDRAM is not set

-@@ -400,9 +411,14 @@
+@@ -400,9 +411,14 @@ CONFIG_OF_DEVICE=y

  # CONFIG_PARPORT is not set
  CONFIG_BLK_DEV=y
  # CONFIG_BLK_DEV_FD is not set
  # CONFIG_PARPORT is not set
  CONFIG_BLK_DEV=y
  # CONFIG_BLK_DEV_FD is not set


@@ -35400,7 +35540,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/walnut_defconf
  CONFIG_BLK_DEV_RAM=y
  CONFIG_BLK_DEV_RAM_COUNT=16
  CONFIG_BLK_DEV_RAM_SIZE=35000
  CONFIG_BLK_DEV_RAM=y
  CONFIG_BLK_DEV_RAM_COUNT=16
  CONFIG_BLK_DEV_RAM_SIZE=35000

-@@ -411,7 +427,10 @@
+@@ -411,7 +427,10 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024

  # CONFIG_ATA_OVER_ETH is not set
  # CONFIG_XILINX_SYSACE is not set
  CONFIG_MISC_DEVICES=y
  # CONFIG_ATA_OVER_ETH is not set
  # CONFIG_XILINX_SYSACE is not set
  CONFIG_MISC_DEVICES=y


@@ -35411,7 +35551,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/walnut_defconf
  # CONFIG_IDE is not set
  
  #
  # CONFIG_IDE is not set
  
  #

-@@ -423,6 +442,14 @@
+@@ -423,6 +442,14 @@ CONFIG_MISC_DEVICES=y

  # CONFIG_SCSI_NETLINK is not set
  # CONFIG_ATA is not set
  # CONFIG_MD is not set
  # CONFIG_SCSI_NETLINK is not set
  # CONFIG_ATA is not set
  # CONFIG_MD is not set


@@ -35426,7 +35566,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/walnut_defconf
  # CONFIG_MACINTOSH_DRIVERS is not set
  CONFIG_NETDEVICES=y
  # CONFIG_NETDEVICES_MULTIQUEUE is not set
  # CONFIG_MACINTOSH_DRIVERS is not set
  CONFIG_NETDEVICES=y
  # CONFIG_NETDEVICES_MULTIQUEUE is not set

-@@ -432,9 +459,17 @@
+@@ -432,9 +459,17 @@ CONFIG_NETDEVICES=y

  # CONFIG_EQUALIZER is not set
  # CONFIG_TUN is not set
  # CONFIG_VETH is not set
  # CONFIG_EQUALIZER is not set
  # CONFIG_TUN is not set
  # CONFIG_VETH is not set


@@ -35444,7 +35584,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/walnut_defconf
  CONFIG_IBM_NEW_EMAC=y
  CONFIG_IBM_NEW_EMAC_RXB=128
  CONFIG_IBM_NEW_EMAC_TXB=64
  CONFIG_IBM_NEW_EMAC=y
  CONFIG_IBM_NEW_EMAC_RXB=128
  CONFIG_IBM_NEW_EMAC_TXB=64

-@@ -446,9 +481,38 @@
+@@ -446,9 +481,38 @@ CONFIG_IBM_NEW_EMAC_ZMII=y

  # CONFIG_IBM_NEW_EMAC_RGMII is not set
  # CONFIG_IBM_NEW_EMAC_TAH is not set
  # CONFIG_IBM_NEW_EMAC_EMAC4 is not set
  # CONFIG_IBM_NEW_EMAC_RGMII is not set
  # CONFIG_IBM_NEW_EMAC_TAH is not set
  # CONFIG_IBM_NEW_EMAC_EMAC4 is not set


@@ -35483,7 +35623,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/walnut_defconf
  
  #
  # Wireless LAN
  
  #
  # Wireless LAN

-@@ -456,6 +520,8 @@
+@@ -456,6 +520,8 @@ CONFIG_NETDEV_10000=y

  # CONFIG_WLAN_PRE80211 is not set
  # CONFIG_WLAN_80211 is not set
  # CONFIG_WAN is not set
  # CONFIG_WLAN_PRE80211 is not set
  # CONFIG_WLAN_80211 is not set
  # CONFIG_WAN is not set


@@ -35492,7 +35632,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/walnut_defconf
  # CONFIG_PPP is not set
  # CONFIG_SLIP is not set
  # CONFIG_SHAPER is not set
  # CONFIG_PPP is not set
  # CONFIG_SLIP is not set
  # CONFIG_SHAPER is not set

-@@ -487,6 +553,7 @@
+@@ -487,6 +553,7 @@ CONFIG_NETDEV_10000=y

  #
  CONFIG_SERIAL_8250=y
  CONFIG_SERIAL_8250_CONSOLE=y
  #
  CONFIG_SERIAL_8250=y
  CONFIG_SERIAL_8250_CONSOLE=y


@@ -35500,7 +35640,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/walnut_defconf
  CONFIG_SERIAL_8250_NR_UARTS=4
  CONFIG_SERIAL_8250_RUNTIME_UARTS=4
  CONFIG_SERIAL_8250_EXTENDED=y
  CONFIG_SERIAL_8250_NR_UARTS=4
  CONFIG_SERIAL_8250_RUNTIME_UARTS=4
  CONFIG_SERIAL_8250_EXTENDED=y

-@@ -501,6 +568,7 @@
+@@ -501,6 +568,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y

  # CONFIG_SERIAL_UARTLITE is not set
  CONFIG_SERIAL_CORE=y
  CONFIG_SERIAL_CORE_CONSOLE=y
  # CONFIG_SERIAL_UARTLITE is not set
  CONFIG_SERIAL_CORE=y
  CONFIG_SERIAL_CORE_CONSOLE=y


@@ -35508,7 +35648,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/walnut_defconf
  CONFIG_SERIAL_OF_PLATFORM=y
  CONFIG_UNIX98_PTYS=y
  CONFIG_LEGACY_PTYS=y
  CONFIG_SERIAL_OF_PLATFORM=y
  CONFIG_UNIX98_PTYS=y
  CONFIG_LEGACY_PTYS=y

-@@ -510,8 +578,10 @@
+@@ -510,8 +578,10 @@ CONFIG_LEGACY_PTY_COUNT=256

  # CONFIG_NVRAM is not set
  # CONFIG_GEN_RTC is not set
  # CONFIG_R3964 is not set
  # CONFIG_NVRAM is not set
  # CONFIG_GEN_RTC is not set
  # CONFIG_R3964 is not set


@@ -35519,7 +35659,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/walnut_defconf
  # CONFIG_I2C is not set
  
  #
  # CONFIG_I2C is not set
  
  #

-@@ -545,6 +615,8 @@
+@@ -545,6 +615,8 @@ CONFIG_SSB_POSSIBLE=y

  #
  # Graphics support
  #
  #
  # Graphics support
  #


@@ -35528,7 +35668,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/walnut_defconf
  # CONFIG_VGASTATE is not set
  CONFIG_VIDEO_OUTPUT_CONTROL=m
  # CONFIG_FB is not set
  # CONFIG_VGASTATE is not set
  CONFIG_VIDEO_OUTPUT_CONTROL=m
  # CONFIG_FB is not set

-@@ -560,9 +632,10 @@
+@@ -560,9 +632,10 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m

  #
  # CONFIG_SOUND is not set
  CONFIG_USB_SUPPORT=y
  #
  # CONFIG_SOUND is not set
  CONFIG_USB_SUPPORT=y


@@ -35542,7 +35682,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/walnut_defconf
  
  #
  # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
  
  #
  # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'

-@@ -574,6 +647,7 @@
+@@ -574,6 +647,7 @@ CONFIG_USB_SUPPORT=y

  # CONFIG_USB_GADGET is not set
  # CONFIG_MMC is not set
  # CONFIG_NEW_LEDS is not set
  # CONFIG_USB_GADGET is not set
  # CONFIG_MMC is not set
  # CONFIG_NEW_LEDS is not set


@@ -35550,9 +35690,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/walnut_defconf
  # CONFIG_EDAC is not set
  # CONFIG_RTC_CLASS is not set
  
  # CONFIG_EDAC is not set
  # CONFIG_RTC_CLASS is not set
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/warp_defconfig powerpc.git/arch/powerpc/configs/warp_defconfig
---- linux-2.6.24/arch/powerpc/configs/warp_defconfig   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/warp_defconfig    2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/configs/warp_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/configs/warp_defconfig

 @@ -0,0 +1,1057 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,1057 @@
 +#
 +# Automatically generated make config: don't edit


@@ -36611,9 +36752,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/warp_defconfig
 +# CONFIG_SECURITY_FILE_CAPABILITIES is not set
 +# CONFIG_CRYPTO is not set
 +# CONFIG_PPC_CLOCK is not set
 +# CONFIG_SECURITY_FILE_CAPABILITIES is not set
 +# CONFIG_CRYPTO is not set
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/Makefile powerpc.git/arch/powerpc/kernel/Makefile
---- linux-2.6.24/arch/powerpc/kernel/Makefile  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/Makefile   2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/kernel/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/Makefile
++++ linux-2.6.24.7/arch/powerpc/kernel/Makefile

 @@ -3,7 +3,7 @@
  #
  
 @@ -3,7 +3,7 @@
  #
  


@@ -36623,7 +36765,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/Makefile powerp
  endif
  ifeq ($(CONFIG_PPC32),y)
  CFLAGS_prom_init.o      += -fPIC
  endif
  ifeq ($(CONFIG_PPC32),y)
  CFLAGS_prom_init.o      += -fPIC

-@@ -70,6 +70,7 @@
+@@ -70,6 +70,7 @@ pci64-$(CONFIG_PPC64)                += pci_dn.o isa-b

  obj-$(CONFIG_PCI)             += pci_$(CONFIG_WORD_SIZE).o $(pci64-y) \
                                   pci-common.o
  obj-$(CONFIG_PCI_MSI)         += msi.o
  obj-$(CONFIG_PCI)             += pci_$(CONFIG_WORD_SIZE).o $(pci64-y) \
                                   pci-common.o
  obj-$(CONFIG_PCI_MSI)         += msi.o


@@ -36631,7 +36773,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/Makefile powerp
  obj-$(CONFIG_KEXEC)           += machine_kexec.o crash.o \
                                   machine_kexec_$(CONFIG_WORD_SIZE).o
  obj-$(CONFIG_AUDIT)           += audit.o
  obj-$(CONFIG_KEXEC)           += machine_kexec.o crash.o \
                                   machine_kexec_$(CONFIG_WORD_SIZE).o
  obj-$(CONFIG_AUDIT)           += audit.o

-@@ -91,3 +92,13 @@
+@@ -91,3 +92,13 @@ obj-$(CONFIG_PPC64)         += $(obj64-y)

  
  extra-$(CONFIG_PPC_FPU)               += fpu.o
  extra-$(CONFIG_PPC64)         += entry_64.o
  
  extra-$(CONFIG_PPC_FPU)               += fpu.o
  extra-$(CONFIG_PPC64)         += entry_64.o


@@ -36645,10 +36787,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/Makefile powerp
 +PHONY += systbl_chk
 +systbl_chk: $(src)/systbl_chk.sh $(obj)/systbl_chk.i
 +      $(call cmd,systbl_chk)
 +PHONY += systbl_chk
 +systbl_chk: $(src)/systbl_chk.sh $(obj)/systbl_chk.i
 +      $(call cmd,systbl_chk)

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/btext.c powerpc.git/arch/powerpc/kernel/btext.c
---- linux-2.6.24/arch/powerpc/kernel/btext.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/btext.c    2008-01-28 20:25:49.000000000 +0100
-@@ -236,7 +236,7 @@
+Index: linux-2.6.24.7/arch/powerpc/kernel/btext.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/btext.c
++++ linux-2.6.24.7/arch/powerpc/kernel/btext.c
+@@ -236,7 +236,7 @@ int __init btext_find_display(int allow_

        if (rc == 0 || !allow_nonstdout)
                return rc;
  
        if (rc == 0 || !allow_nonstdout)
                return rc;
  


@@ -36657,10 +36800,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/btext.c powerpc
                if (of_get_property(np, "linux,opened", NULL)) {
                        printk("trying %s ...\n", np->full_name);
                        rc = btext_initialize(np);
                if (of_get_property(np, "linux,opened", NULL)) {
                        printk("trying %s ...\n", np->full_name);
                        rc = btext_initialize(np);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cpu_setup_44x.S powerpc.git/arch/powerpc/kernel/cpu_setup_44x.S
---- linux-2.6.24/arch/powerpc/kernel/cpu_setup_44x.S   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/cpu_setup_44x.S    2008-01-28 20:25:49.000000000 +0100
-@@ -23,11 +23,24 @@
+Index: linux-2.6.24.7/arch/powerpc/kernel/cpu_setup_44x.S
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/cpu_setup_44x.S
++++ linux-2.6.24.7/arch/powerpc/kernel/cpu_setup_44x.S
+@@ -23,11 +23,24 @@ _GLOBAL(__setup_cpu_440epx)

        mflr    r4
        bl      __init_fpu_44x
        bl      __plb_disable_wrp
        mflr    r4
        bl      __init_fpu_44x
        bl      __plb_disable_wrp


@@ -36686,10 +36830,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cpu_setup_44x.S
  
  /* enable APU between CPU and FPU */
  _GLOBAL(__init_fpu_44x)
  
  /* enable APU between CPU and FPU */
  _GLOBAL(__init_fpu_44x)

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powerpc.git/arch/powerpc/kernel/cputable.c
---- linux-2.6.24/arch/powerpc/kernel/cputable.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/cputable.c 2008-01-28 20:25:49.000000000 +0100
-@@ -33,7 +33,9 @@
+Index: linux-2.6.24.7/arch/powerpc/kernel/cputable.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/cputable.c
++++ linux-2.6.24.7/arch/powerpc/kernel/cputable.c
+@@ -33,7 +33,9 @@ EXPORT_SYMBOL(cur_cpu_spec);

  #ifdef CONFIG_PPC32
  extern void __setup_cpu_440ep(unsigned long offset, struct cpu_spec* spec);
  extern void __setup_cpu_440epx(unsigned long offset, struct cpu_spec* spec);
  #ifdef CONFIG_PPC32
  extern void __setup_cpu_440ep(unsigned long offset, struct cpu_spec* spec);
  extern void __setup_cpu_440epx(unsigned long offset, struct cpu_spec* spec);


@@ -36699,7 +36844,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
  extern void __setup_cpu_603(unsigned long offset, struct cpu_spec* spec);
  extern void __setup_cpu_604(unsigned long offset, struct cpu_spec* spec);
  extern void __setup_cpu_750(unsigned long offset, struct cpu_spec* spec);
  extern void __setup_cpu_603(unsigned long offset, struct cpu_spec* spec);
  extern void __setup_cpu_604(unsigned long offset, struct cpu_spec* spec);
  extern void __setup_cpu_750(unsigned long offset, struct cpu_spec* spec);

-@@ -85,6 +87,7 @@
+@@ -85,6 +87,7 @@ static struct cpu_spec __initdata cpu_sp

                .pmc_type               = PPC_PMC_IBM,
                .oprofile_cpu_type      = "ppc64/power3",
                .oprofile_type          = PPC_OPROFILE_RS64,
                .pmc_type               = PPC_PMC_IBM,
                .oprofile_cpu_type      = "ppc64/power3",
                .oprofile_type          = PPC_OPROFILE_RS64,


@@ -36707,7 +36852,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "power3",
        },
        {       /* Power3+ */
                .platform               = "power3",
        },
        {       /* Power3+ */

-@@ -99,6 +102,7 @@
+@@ -99,6 +102,7 @@ static struct cpu_spec __initdata cpu_sp

                .pmc_type               = PPC_PMC_IBM,
                .oprofile_cpu_type      = "ppc64/power3",
                .oprofile_type          = PPC_OPROFILE_RS64,
                .pmc_type               = PPC_PMC_IBM,
                .oprofile_cpu_type      = "ppc64/power3",
                .oprofile_type          = PPC_OPROFILE_RS64,


@@ -36715,7 +36860,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "power3",
        },
        {       /* Northstar */
                .platform               = "power3",
        },
        {       /* Northstar */

-@@ -113,6 +117,7 @@
+@@ -113,6 +117,7 @@ static struct cpu_spec __initdata cpu_sp

                .pmc_type               = PPC_PMC_IBM,
                .oprofile_cpu_type      = "ppc64/rs64",
                .oprofile_type          = PPC_OPROFILE_RS64,
                .pmc_type               = PPC_PMC_IBM,
                .oprofile_cpu_type      = "ppc64/rs64",
                .oprofile_type          = PPC_OPROFILE_RS64,


@@ -36723,7 +36868,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "rs64",
        },
        {       /* Pulsar */
                .platform               = "rs64",
        },
        {       /* Pulsar */

-@@ -127,6 +132,7 @@
+@@ -127,6 +132,7 @@ static struct cpu_spec __initdata cpu_sp

                .pmc_type               = PPC_PMC_IBM,
                .oprofile_cpu_type      = "ppc64/rs64",
                .oprofile_type          = PPC_OPROFILE_RS64,
                .pmc_type               = PPC_PMC_IBM,
                .oprofile_cpu_type      = "ppc64/rs64",
                .oprofile_type          = PPC_OPROFILE_RS64,


@@ -36731,7 +36876,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "rs64",
        },
        {       /* I-star */
                .platform               = "rs64",
        },
        {       /* I-star */

-@@ -141,6 +147,7 @@
+@@ -141,6 +147,7 @@ static struct cpu_spec __initdata cpu_sp

                .pmc_type               = PPC_PMC_IBM,
                .oprofile_cpu_type      = "ppc64/rs64",
                .oprofile_type          = PPC_OPROFILE_RS64,
                .pmc_type               = PPC_PMC_IBM,
                .oprofile_cpu_type      = "ppc64/rs64",
                .oprofile_type          = PPC_OPROFILE_RS64,


@@ -36739,7 +36884,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "rs64",
        },
        {       /* S-star */
                .platform               = "rs64",
        },
        {       /* S-star */

-@@ -155,6 +162,7 @@
+@@ -155,6 +162,7 @@ static struct cpu_spec __initdata cpu_sp

                .pmc_type               = PPC_PMC_IBM,
                .oprofile_cpu_type      = "ppc64/rs64",
                .oprofile_type          = PPC_OPROFILE_RS64,
                .pmc_type               = PPC_PMC_IBM,
                .oprofile_cpu_type      = "ppc64/rs64",
                .oprofile_type          = PPC_OPROFILE_RS64,


@@ -36747,7 +36892,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "rs64",
        },
        {       /* Power4 */
                .platform               = "rs64",
        },
        {       /* Power4 */

-@@ -169,6 +177,7 @@
+@@ -169,6 +177,7 @@ static struct cpu_spec __initdata cpu_sp

                .pmc_type               = PPC_PMC_IBM,
                .oprofile_cpu_type      = "ppc64/power4",
                .oprofile_type          = PPC_OPROFILE_POWER4,
                .pmc_type               = PPC_PMC_IBM,
                .oprofile_cpu_type      = "ppc64/power4",
                .oprofile_type          = PPC_OPROFILE_POWER4,


@@ -36755,7 +36900,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "power4",
        },
        {       /* Power4+ */
                .platform               = "power4",
        },
        {       /* Power4+ */

-@@ -183,6 +192,7 @@
+@@ -183,6 +192,7 @@ static struct cpu_spec __initdata cpu_sp

                .pmc_type               = PPC_PMC_IBM,
                .oprofile_cpu_type      = "ppc64/power4",
                .oprofile_type          = PPC_OPROFILE_POWER4,
                .pmc_type               = PPC_PMC_IBM,
                .oprofile_cpu_type      = "ppc64/power4",
                .oprofile_type          = PPC_OPROFILE_POWER4,


@@ -36763,7 +36908,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "power4",
        },
        {       /* PPC970 */
                .platform               = "power4",
        },
        {       /* PPC970 */

-@@ -200,6 +210,7 @@
+@@ -200,6 +210,7 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_restore            = __restore_cpu_ppc970,
                .oprofile_cpu_type      = "ppc64/970",
                .oprofile_type          = PPC_OPROFILE_POWER4,
                .cpu_restore            = __restore_cpu_ppc970,
                .oprofile_cpu_type      = "ppc64/970",
                .oprofile_type          = PPC_OPROFILE_POWER4,


@@ -36771,7 +36916,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc970",
        },
        {       /* PPC970FX */
                .platform               = "ppc970",
        },
        {       /* PPC970FX */

-@@ -217,6 +228,7 @@
+@@ -217,6 +228,7 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_restore            = __restore_cpu_ppc970,
                .oprofile_cpu_type      = "ppc64/970",
                .oprofile_type          = PPC_OPROFILE_POWER4,
                .cpu_restore            = __restore_cpu_ppc970,
                .oprofile_cpu_type      = "ppc64/970",
                .oprofile_type          = PPC_OPROFILE_POWER4,


@@ -36779,7 +36924,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc970",
        },
        {       /* PPC970MP DD1.0 - no DEEPNAP, use regular 970 init */
                .platform               = "ppc970",
        },
        {       /* PPC970MP DD1.0 - no DEEPNAP, use regular 970 init */

-@@ -234,6 +246,7 @@
+@@ -234,6 +246,7 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_restore            = __restore_cpu_ppc970,
                .oprofile_cpu_type      = "ppc64/970MP",
                .oprofile_type          = PPC_OPROFILE_POWER4,
                .cpu_restore            = __restore_cpu_ppc970,
                .oprofile_cpu_type      = "ppc64/970MP",
                .oprofile_type          = PPC_OPROFILE_POWER4,


@@ -36787,7 +36932,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc970",
        },
        {       /* PPC970MP */
                .platform               = "ppc970",
        },
        {       /* PPC970MP */

-@@ -251,6 +264,7 @@
+@@ -251,6 +264,7 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_restore            = __restore_cpu_ppc970,
                .oprofile_cpu_type      = "ppc64/970MP",
                .oprofile_type          = PPC_OPROFILE_POWER4,
                .cpu_restore            = __restore_cpu_ppc970,
                .oprofile_cpu_type      = "ppc64/970MP",
                .oprofile_type          = PPC_OPROFILE_POWER4,


@@ -36795,7 +36940,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc970",
        },
        {       /* PPC970GX */
                .platform               = "ppc970",
        },
        {       /* PPC970GX */

-@@ -267,6 +281,7 @@
+@@ -267,6 +281,7 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_setup              = __setup_cpu_ppc970,
                .oprofile_cpu_type      = "ppc64/970",
                .oprofile_type          = PPC_OPROFILE_POWER4,
                .cpu_setup              = __setup_cpu_ppc970,
                .oprofile_cpu_type      = "ppc64/970",
                .oprofile_type          = PPC_OPROFILE_POWER4,


@@ -36803,7 +36948,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc970",
        },
        {       /* Power5 GR */
                .platform               = "ppc970",
        },
        {       /* Power5 GR */

-@@ -286,6 +301,7 @@
+@@ -286,6 +301,7 @@ static struct cpu_spec __initdata cpu_sp

                 */
                .oprofile_mmcra_sihv    = MMCRA_SIHV,
                .oprofile_mmcra_sipr    = MMCRA_SIPR,
                 */
                .oprofile_mmcra_sihv    = MMCRA_SIHV,
                .oprofile_mmcra_sipr    = MMCRA_SIPR,


@@ -36811,7 +36956,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "power5",
        },
        {       /* Power5++ */
                .platform               = "power5",
        },
        {       /* Power5++ */

-@@ -301,6 +317,7 @@
+@@ -301,6 +317,7 @@ static struct cpu_spec __initdata cpu_sp

                .oprofile_type          = PPC_OPROFILE_POWER4,
                .oprofile_mmcra_sihv    = MMCRA_SIHV,
                .oprofile_mmcra_sipr    = MMCRA_SIPR,
                .oprofile_type          = PPC_OPROFILE_POWER4,
                .oprofile_mmcra_sihv    = MMCRA_SIHV,
                .oprofile_mmcra_sipr    = MMCRA_SIPR,


@@ -36819,7 +36964,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "power5+",
        },
        {       /* Power5 GS */
                .platform               = "power5+",
        },
        {       /* Power5 GS */

-@@ -317,6 +334,7 @@
+@@ -317,6 +334,7 @@ static struct cpu_spec __initdata cpu_sp

                .oprofile_type          = PPC_OPROFILE_POWER4,
                .oprofile_mmcra_sihv    = MMCRA_SIHV,
                .oprofile_mmcra_sipr    = MMCRA_SIPR,
                .oprofile_type          = PPC_OPROFILE_POWER4,
                .oprofile_mmcra_sihv    = MMCRA_SIHV,
                .oprofile_mmcra_sipr    = MMCRA_SIPR,


@@ -36827,7 +36972,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "power5+",
        },
        {       /* POWER6 in P5+ mode; 2.04-compliant processor */
                .platform               = "power5+",
        },
        {       /* POWER6 in P5+ mode; 2.04-compliant processor */

-@@ -327,6 +345,7 @@
+@@ -327,6 +345,7 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_user_features      = COMMON_USER_POWER5_PLUS,
                .icache_bsize           = 128,
                .dcache_bsize           = 128,
                .cpu_user_features      = COMMON_USER_POWER5_PLUS,
                .icache_bsize           = 128,
                .dcache_bsize           = 128,


@@ -36835,7 +36980,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "power5+",
        },
        {       /* Power6 */
                .platform               = "power5+",
        },
        {       /* Power6 */

-@@ -346,6 +365,7 @@
+@@ -346,6 +365,7 @@ static struct cpu_spec __initdata cpu_sp

                .oprofile_mmcra_sipr    = POWER6_MMCRA_SIPR,
                .oprofile_mmcra_clear   = POWER6_MMCRA_THRM |
                        POWER6_MMCRA_OTHER,
                .oprofile_mmcra_sipr    = POWER6_MMCRA_SIPR,
                .oprofile_mmcra_clear   = POWER6_MMCRA_THRM |
                        POWER6_MMCRA_OTHER,


@@ -36843,7 +36988,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "power6x",
        },
        {       /* 2.05-compliant processor, i.e. Power6 "architected" mode */
                .platform               = "power6x",
        },
        {       /* 2.05-compliant processor, i.e. Power6 "architected" mode */

-@@ -356,6 +376,7 @@
+@@ -356,6 +376,7 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_user_features      = COMMON_USER_POWER6,
                .icache_bsize           = 128,
                .dcache_bsize           = 128,
                .cpu_user_features      = COMMON_USER_POWER6,
                .icache_bsize           = 128,
                .dcache_bsize           = 128,


@@ -36851,7 +36996,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "power6",
        },
        {       /* Cell Broadband Engine */
                .platform               = "power6",
        },
        {       /* Cell Broadband Engine */

-@@ -372,6 +393,7 @@
+@@ -372,6 +393,7 @@ static struct cpu_spec __initdata cpu_sp

                .pmc_type               = PPC_PMC_IBM,
                .oprofile_cpu_type      = "ppc64/cell-be",
                .oprofile_type          = PPC_OPROFILE_CELL,
                .pmc_type               = PPC_PMC_IBM,
                .oprofile_cpu_type      = "ppc64/cell-be",
                .oprofile_type          = PPC_OPROFILE_CELL,


@@ -36859,7 +37004,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc-cell-be",
        },
        {       /* PA Semi PA6T */
                .platform               = "ppc-cell-be",
        },
        {       /* PA Semi PA6T */

-@@ -388,6 +410,7 @@
+@@ -388,6 +410,7 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_restore            = __restore_cpu_pa6t,
                .oprofile_cpu_type      = "ppc64/pa6t",
                .oprofile_type          = PPC_OPROFILE_PA6T,
                .cpu_restore            = __restore_cpu_pa6t,
                .oprofile_cpu_type      = "ppc64/pa6t",
                .oprofile_type          = PPC_OPROFILE_PA6T,


@@ -36867,7 +37012,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "pa6t",
        },
        {       /* default match */
                .platform               = "pa6t",
        },
        {       /* default match */

-@@ -400,6 +423,7 @@
+@@ -400,6 +423,7 @@ static struct cpu_spec __initdata cpu_sp

                .dcache_bsize           = 128,
                .num_pmcs               = 6,
                .pmc_type               = PPC_PMC_IBM,
                .dcache_bsize           = 128,
                .num_pmcs               = 6,
                .pmc_type               = PPC_PMC_IBM,


@@ -36875,7 +37020,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "power4",
        }
  #endif        /* CONFIG_PPC64 */
                .platform               = "power4",
        }
  #endif        /* CONFIG_PPC64 */

-@@ -414,6 +438,7 @@
+@@ -414,6 +438,7 @@ static struct cpu_spec __initdata cpu_sp

                        PPC_FEATURE_UNIFIED_CACHE | PPC_FEATURE_NO_TB,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                        PPC_FEATURE_UNIFIED_CACHE | PPC_FEATURE_NO_TB,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,


@@ -36883,7 +37028,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc601",
        },
        {       /* 603 */
                .platform               = "ppc601",
        },
        {       /* 603 */

-@@ -425,6 +450,7 @@
+@@ -425,6 +450,7 @@ static struct cpu_spec __initdata cpu_sp

                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_setup              = __setup_cpu_603,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_setup              = __setup_cpu_603,


@@ -36891,7 +37036,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc603",
        },
        {       /* 603e */
                .platform               = "ppc603",
        },
        {       /* 603e */

-@@ -436,6 +462,7 @@
+@@ -436,6 +462,7 @@ static struct cpu_spec __initdata cpu_sp

                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_setup              = __setup_cpu_603,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_setup              = __setup_cpu_603,


@@ -36899,7 +37044,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc603",
        },
        {       /* 603ev */
                .platform               = "ppc603",
        },
        {       /* 603ev */

-@@ -447,6 +474,7 @@
+@@ -447,6 +474,7 @@ static struct cpu_spec __initdata cpu_sp

                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_setup              = __setup_cpu_603,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_setup              = __setup_cpu_603,


@@ -36907,7 +37052,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc603",
        },
        {       /* 604 */
                .platform               = "ppc603",
        },
        {       /* 604 */

-@@ -459,6 +487,7 @@
+@@ -459,6 +487,7 @@ static struct cpu_spec __initdata cpu_sp

                .dcache_bsize           = 32,
                .num_pmcs               = 2,
                .cpu_setup              = __setup_cpu_604,
                .dcache_bsize           = 32,
                .num_pmcs               = 2,
                .cpu_setup              = __setup_cpu_604,


@@ -36915,7 +37060,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc604",
        },
        {       /* 604e */
                .platform               = "ppc604",
        },
        {       /* 604e */

-@@ -471,6 +500,7 @@
+@@ -471,6 +500,7 @@ static struct cpu_spec __initdata cpu_sp

                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_604,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_604,


@@ -36923,7 +37068,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc604",
        },
        {       /* 604r */
                .platform               = "ppc604",
        },
        {       /* 604r */

-@@ -483,6 +513,7 @@
+@@ -483,6 +513,7 @@ static struct cpu_spec __initdata cpu_sp

                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_604,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_604,


@@ -36931,7 +37076,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc604",
        },
        {       /* 604ev */
                .platform               = "ppc604",
        },
        {       /* 604ev */

-@@ -495,6 +526,7 @@
+@@ -495,6 +526,7 @@ static struct cpu_spec __initdata cpu_sp

                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_604,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_604,


@@ -36939,7 +37084,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc604",
        },
        {       /* 740/750 (0x4202, don't support TAU ?) */
                .platform               = "ppc604",
        },
        {       /* 740/750 (0x4202, don't support TAU ?) */

-@@ -507,6 +539,7 @@
+@@ -507,6 +539,7 @@ static struct cpu_spec __initdata cpu_sp

                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_750,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_750,


@@ -36947,7 +37092,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc750",
        },
        {       /* 750CX (80100 and 8010x?) */
                .platform               = "ppc750",
        },
        {       /* 750CX (80100 and 8010x?) */

-@@ -519,6 +552,7 @@
+@@ -519,6 +552,7 @@ static struct cpu_spec __initdata cpu_sp

                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_750cx,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_750cx,


@@ -36955,7 +37100,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc750",
        },
        {       /* 750CX (82201 and 82202) */
                .platform               = "ppc750",
        },
        {       /* 750CX (82201 and 82202) */

-@@ -531,6 +565,7 @@
+@@ -531,6 +565,7 @@ static struct cpu_spec __initdata cpu_sp

                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_750cx,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_750cx,


@@ -36963,7 +37108,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc750",
        },
        {       /* 750CXe (82214) */
                .platform               = "ppc750",
        },
        {       /* 750CXe (82214) */

-@@ -543,6 +578,7 @@
+@@ -543,6 +578,7 @@ static struct cpu_spec __initdata cpu_sp

                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_750cx,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_750cx,


@@ -36971,7 +37116,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc750",
        },
        {       /* 750CXe "Gekko" (83214) */
                .platform               = "ppc750",
        },
        {       /* 750CXe "Gekko" (83214) */

-@@ -555,6 +591,7 @@
+@@ -555,6 +591,7 @@ static struct cpu_spec __initdata cpu_sp

                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_750cx,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_750cx,


@@ -36979,7 +37124,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc750",
        },
        {       /* 750CL */
                .platform               = "ppc750",
        },
        {       /* 750CL */

-@@ -567,6 +604,7 @@
+@@ -567,6 +604,7 @@ static struct cpu_spec __initdata cpu_sp

                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_750,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_750,


@@ -36987,7 +37132,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc750",
        },
        {       /* 745/755 */
                .platform               = "ppc750",
        },
        {       /* 745/755 */

-@@ -579,6 +617,7 @@
+@@ -579,6 +617,7 @@ static struct cpu_spec __initdata cpu_sp

                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_750,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_750,


@@ -36995,7 +37140,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc750",
        },
        {       /* 750FX rev 1.x */
                .platform               = "ppc750",
        },
        {       /* 750FX rev 1.x */

-@@ -591,6 +630,7 @@
+@@ -591,6 +630,7 @@ static struct cpu_spec __initdata cpu_sp

                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_750,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_750,


@@ -37003,7 +37148,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc750",
        },
        {       /* 750FX rev 2.0 must disable HID0[DPM] */
                .platform               = "ppc750",
        },
        {       /* 750FX rev 2.0 must disable HID0[DPM] */

-@@ -603,6 +643,7 @@
+@@ -603,6 +643,7 @@ static struct cpu_spec __initdata cpu_sp

                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_750,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_750,


@@ -37011,7 +37156,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc750",
        },
        {       /* 750FX (All revs except 2.0) */
                .platform               = "ppc750",
        },
        {       /* 750FX (All revs except 2.0) */

-@@ -615,6 +656,7 @@
+@@ -615,6 +656,7 @@ static struct cpu_spec __initdata cpu_sp

                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_750fx,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_750fx,


@@ -37019,7 +37164,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc750",
        },
        {       /* 750GX */
                .platform               = "ppc750",
        },
        {       /* 750GX */

-@@ -627,6 +669,7 @@
+@@ -627,6 +669,7 @@ static struct cpu_spec __initdata cpu_sp

                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_750fx,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_750fx,


@@ -37027,7 +37172,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc750",
        },
        {       /* 740/750 (L2CR bit need fixup for 740) */
                .platform               = "ppc750",
        },
        {       /* 740/750 (L2CR bit need fixup for 740) */

-@@ -639,6 +682,7 @@
+@@ -639,6 +682,7 @@ static struct cpu_spec __initdata cpu_sp

                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_750,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_750,


@@ -37035,7 +37180,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc750",
        },
        {       /* 7400 rev 1.1 ? (no TAU) */
                .platform               = "ppc750",
        },
        {       /* 7400 rev 1.1 ? (no TAU) */

-@@ -652,6 +696,7 @@
+@@ -652,6 +696,7 @@ static struct cpu_spec __initdata cpu_sp

                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_7400,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_7400,


@@ -37043,7 +37188,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc7400",
        },
        {       /* 7400 */
                .platform               = "ppc7400",
        },
        {       /* 7400 */

-@@ -665,6 +710,7 @@
+@@ -665,6 +710,7 @@ static struct cpu_spec __initdata cpu_sp

                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_7400,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_7400,


@@ -37051,7 +37196,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc7400",
        },
        {       /* 7410 */
                .platform               = "ppc7400",
        },
        {       /* 7410 */

-@@ -678,6 +724,7 @@
+@@ -678,6 +724,7 @@ static struct cpu_spec __initdata cpu_sp

                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_7410,
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .cpu_setup              = __setup_cpu_7410,


@@ -37059,7 +37204,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc7400",
        },
        {       /* 7450 2.0 - no doze/nap */
                .platform               = "ppc7400",
        },
        {       /* 7450 2.0 - no doze/nap */

-@@ -693,6 +740,7 @@
+@@ -693,6 +740,7 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
                .oprofile_type          = PPC_OPROFILE_G4,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
                .oprofile_type          = PPC_OPROFILE_G4,


@@ -37067,7 +37212,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc7450",
        },
        {       /* 7450 2.1 */
                .platform               = "ppc7450",
        },
        {       /* 7450 2.1 */

-@@ -708,6 +756,7 @@
+@@ -708,6 +756,7 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
                .oprofile_type          = PPC_OPROFILE_G4,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
                .oprofile_type          = PPC_OPROFILE_G4,


@@ -37075,7 +37220,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc7450",
        },
        {       /* 7450 2.3 and newer */
                .platform               = "ppc7450",
        },
        {       /* 7450 2.3 and newer */

-@@ -723,6 +772,7 @@
+@@ -723,6 +772,7 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
                .oprofile_type          = PPC_OPROFILE_G4,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
                .oprofile_type          = PPC_OPROFILE_G4,


@@ -37083,7 +37228,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc7450",
        },
        {       /* 7455 rev 1.x */
                .platform               = "ppc7450",
        },
        {       /* 7455 rev 1.x */

-@@ -738,6 +788,7 @@
+@@ -738,6 +788,7 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
                .oprofile_type          = PPC_OPROFILE_G4,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
                .oprofile_type          = PPC_OPROFILE_G4,


@@ -37091,7 +37236,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc7450",
        },
        {       /* 7455 rev 2.0 */
                .platform               = "ppc7450",
        },
        {       /* 7455 rev 2.0 */

-@@ -753,6 +804,7 @@
+@@ -753,6 +804,7 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
                .oprofile_type          = PPC_OPROFILE_G4,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
                .oprofile_type          = PPC_OPROFILE_G4,


@@ -37099,7 +37244,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc7450",
        },
        {       /* 7455 others */
                .platform               = "ppc7450",
        },
        {       /* 7455 others */

-@@ -768,6 +820,7 @@
+@@ -768,6 +820,7 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
                .oprofile_type          = PPC_OPROFILE_G4,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
                .oprofile_type          = PPC_OPROFILE_G4,


@@ -37107,7 +37252,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc7450",
        },
        {       /* 7447/7457 Rev 1.0 */
                .platform               = "ppc7450",
        },
        {       /* 7447/7457 Rev 1.0 */

-@@ -783,6 +836,7 @@
+@@ -783,6 +836,7 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
                .oprofile_type          = PPC_OPROFILE_G4,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
                .oprofile_type          = PPC_OPROFILE_G4,


@@ -37115,7 +37260,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc7450",
        },
        {       /* 7447/7457 Rev 1.1 */
                .platform               = "ppc7450",
        },
        {       /* 7447/7457 Rev 1.1 */

-@@ -798,6 +852,7 @@
+@@ -798,6 +852,7 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
                .oprofile_type          = PPC_OPROFILE_G4,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
                .oprofile_type          = PPC_OPROFILE_G4,


@@ -37123,7 +37268,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc7450",
        },
        {       /* 7447/7457 Rev 1.2 and later */
                .platform               = "ppc7450",
        },
        {       /* 7447/7457 Rev 1.2 and later */

-@@ -812,6 +867,7 @@
+@@ -812,6 +867,7 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
                .oprofile_type          = PPC_OPROFILE_G4,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
                .oprofile_type          = PPC_OPROFILE_G4,


@@ -37131,7 +37276,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc7450",
        },
        {       /* 7447A */
                .platform               = "ppc7450",
        },
        {       /* 7447A */

-@@ -827,6 +883,7 @@
+@@ -827,6 +883,7 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
                .oprofile_type          = PPC_OPROFILE_G4,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
                .oprofile_type          = PPC_OPROFILE_G4,


@@ -37139,7 +37284,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc7450",
        },
        {       /* 7448 */
                .platform               = "ppc7450",
        },
        {       /* 7448 */

-@@ -842,6 +899,7 @@
+@@ -842,6 +899,7 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
                .oprofile_type          = PPC_OPROFILE_G4,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
                .oprofile_type          = PPC_OPROFILE_G4,


@@ -37147,7 +37292,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc7450",
        },
        {       /* 82xx (8240, 8245, 8260 are all 603e cores) */
                .platform               = "ppc7450",
        },
        {       /* 82xx (8240, 8245, 8260 are all 603e cores) */

-@@ -853,6 +911,7 @@
+@@ -853,6 +911,7 @@ static struct cpu_spec __initdata cpu_sp

                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_setup              = __setup_cpu_603,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_setup              = __setup_cpu_603,


@@ -37155,7 +37300,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc603",
        },
        {       /* All G2_LE (603e core, plus some) have the same pvr */
                .platform               = "ppc603",
        },
        {       /* All G2_LE (603e core, plus some) have the same pvr */

-@@ -864,6 +923,7 @@
+@@ -864,6 +923,7 @@ static struct cpu_spec __initdata cpu_sp

                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_setup              = __setup_cpu_603,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_setup              = __setup_cpu_603,


@@ -37163,7 +37308,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc603",
        },
        {       /* e300c1 (a 603e core, plus some) on 83xx */
                .platform               = "ppc603",
        },
        {       /* e300c1 (a 603e core, plus some) on 83xx */

-@@ -875,6 +935,7 @@
+@@ -875,6 +935,7 @@ static struct cpu_spec __initdata cpu_sp

                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_setup              = __setup_cpu_603,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_setup              = __setup_cpu_603,


@@ -37171,7 +37316,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc603",
        },
        {       /* e300c2 (an e300c1 core, plus some, minus FPU) on 83xx */
                .platform               = "ppc603",
        },
        {       /* e300c2 (an e300c1 core, plus some, minus FPU) on 83xx */

-@@ -886,9 +947,10 @@
+@@ -886,9 +947,10 @@ static struct cpu_spec __initdata cpu_sp

                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_setup              = __setup_cpu_603,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_setup              = __setup_cpu_603,


@@ -37183,7 +37328,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .pvr_mask               = 0x7fff0000,
                .pvr_value              = 0x00850000,
                .cpu_name               = "e300c3",
                .pvr_mask               = 0x7fff0000,
                .pvr_value              = 0x00850000,
                .cpu_name               = "e300c3",

-@@ -899,6 +961,18 @@
+@@ -899,6 +961,18 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_setup              = __setup_cpu_603,
                .platform               = "ppc603",
        },
                .cpu_setup              = __setup_cpu_603,
                .platform               = "ppc603",
        },


@@ -37202,7 +37347,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
        {       /* default match, we assume split I/D cache & TB (non-601)... */
                .pvr_mask               = 0x00000000,
                .pvr_value              = 0x00000000,
        {       /* default match, we assume split I/D cache & TB (non-601)... */
                .pvr_mask               = 0x00000000,
                .pvr_value              = 0x00000000,

-@@ -907,6 +981,7 @@
+@@ -907,6 +981,7 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_user_features      = COMMON_USER,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_user_features      = COMMON_USER,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,


@@ -37210,7 +37355,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc603",
        },
  #endif /* CLASSIC_PPC */
                .platform               = "ppc603",
        },
  #endif /* CLASSIC_PPC */

-@@ -933,6 +1008,7 @@
+@@ -933,6 +1008,7 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_user_features      = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU,
                .icache_bsize           = 16,
                .dcache_bsize           = 16,
                .cpu_user_features      = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU,
                .icache_bsize           = 16,
                .dcache_bsize           = 16,


@@ -37218,7 +37363,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc403",
        },
        {       /* 403GCX */
                .platform               = "ppc403",
        },
        {       /* 403GCX */

-@@ -944,6 +1020,7 @@
+@@ -944,6 +1020,7 @@ static struct cpu_spec __initdata cpu_sp

                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_NO_TB,
                .icache_bsize           = 16,
                .dcache_bsize           = 16,
                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_NO_TB,
                .icache_bsize           = 16,
                .dcache_bsize           = 16,


@@ -37226,7 +37371,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc403",
        },
        {       /* 403G ?? */
                .platform               = "ppc403",
        },
        {       /* 403G ?? */

-@@ -954,6 +1031,7 @@
+@@ -954,6 +1031,7 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_user_features      = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU,
                .icache_bsize           = 16,
                .dcache_bsize           = 16,
                .cpu_user_features      = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU,
                .icache_bsize           = 16,
                .dcache_bsize           = 16,


@@ -37234,7 +37379,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc403",
        },
        {       /* 405GP */
                .platform               = "ppc403",
        },
        {       /* 405GP */

-@@ -965,6 +1043,7 @@
+@@ -965,6 +1043,7 @@ static struct cpu_spec __initdata cpu_sp

                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,


@@ -37242,7 +37387,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc405",
        },
        {       /* STB 03xxx */
                .platform               = "ppc405",
        },
        {       /* STB 03xxx */

-@@ -976,6 +1055,7 @@
+@@ -976,6 +1055,7 @@ static struct cpu_spec __initdata cpu_sp

                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,


@@ -37250,7 +37395,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc405",
        },
        {       /* STB 04xxx */
                .platform               = "ppc405",
        },
        {       /* STB 04xxx */

-@@ -987,6 +1067,7 @@
+@@ -987,6 +1067,7 @@ static struct cpu_spec __initdata cpu_sp

                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,


@@ -37258,7 +37403,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc405",
        },
        {       /* NP405L */
                .platform               = "ppc405",
        },
        {       /* NP405L */

-@@ -998,6 +1079,7 @@
+@@ -998,6 +1079,7 @@ static struct cpu_spec __initdata cpu_sp

                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,


@@ -37266,7 +37411,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc405",
        },
        {       /* NP4GS3 */
                .platform               = "ppc405",
        },
        {       /* NP4GS3 */

-@@ -1009,6 +1091,7 @@
+@@ -1009,6 +1091,7 @@ static struct cpu_spec __initdata cpu_sp

                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,


@@ -37274,7 +37419,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc405",
        },
        {   /* NP405H */
                .platform               = "ppc405",
        },
        {   /* NP405H */

-@@ -1020,6 +1103,7 @@
+@@ -1020,6 +1103,7 @@ static struct cpu_spec __initdata cpu_sp

                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,


@@ -37282,7 +37427,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc405",
        },
        {       /* 405GPr */
                .platform               = "ppc405",
        },
        {       /* 405GPr */

-@@ -1031,6 +1115,7 @@
+@@ -1031,6 +1115,7 @@ static struct cpu_spec __initdata cpu_sp

                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,


@@ -37290,7 +37435,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc405",
        },
        {   /* STBx25xx */
                .platform               = "ppc405",
        },
        {   /* STBx25xx */

-@@ -1042,6 +1127,7 @@
+@@ -1042,6 +1127,7 @@ static struct cpu_spec __initdata cpu_sp

                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,


@@ -37298,7 +37443,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc405",
        },
        {       /* 405LP */
                .platform               = "ppc405",
        },
        {       /* 405LP */

-@@ -1052,6 +1138,7 @@
+@@ -1052,6 +1138,7 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_user_features      = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_user_features      = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,


@@ -37306,7 +37451,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc405",
        },
        {       /* Xilinx Virtex-II Pro  */
                .platform               = "ppc405",
        },
        {       /* Xilinx Virtex-II Pro  */

-@@ -1063,6 +1150,7 @@
+@@ -1063,6 +1150,7 @@ static struct cpu_spec __initdata cpu_sp

                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,


@@ -37314,7 +37459,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc405",
        },
        {       /* Xilinx Virtex-4 FX */
                .platform               = "ppc405",
        },
        {       /* Xilinx Virtex-4 FX */

-@@ -1074,6 +1162,7 @@
+@@ -1074,6 +1162,7 @@ static struct cpu_spec __initdata cpu_sp

                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,


@@ -37322,7 +37467,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc405",
        },
        {       /* 405EP */
                .platform               = "ppc405",
        },
        {       /* 405EP */

-@@ -1085,17 +1174,31 @@
+@@ -1085,17 +1174,31 @@ static struct cpu_spec __initdata cpu_sp

                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,


@@ -37356,7 +37501,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc405",
        },
  
                .platform               = "ppc405",
        },
  

-@@ -1109,6 +1212,7 @@
+@@ -1109,6 +1212,7 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_user_features      = COMMON_USER_BOOKE,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_user_features      = COMMON_USER_BOOKE,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,


@@ -37364,7 +37509,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc440",
        },
        { /* Use logical PVR for 440EP (logical pvr = pvr | 0x8) */
                .platform               = "ppc440",
        },
        { /* Use logical PVR for 440EP (logical pvr = pvr | 0x8) */

-@@ -1120,6 +1224,7 @@
+@@ -1120,6 +1224,7 @@ static struct cpu_spec __initdata cpu_sp

                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_setup              = __setup_cpu_440ep,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_setup              = __setup_cpu_440ep,


@@ -37372,7 +37517,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc440",
        },
        {
                .platform               = "ppc440",
        },
        {

-@@ -1130,6 +1235,19 @@
+@@ -1130,6 +1235,19 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_user_features      = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_user_features      = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,


@@ -37392,7 +37537,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc440",
        },
        { /* Use logical PVR for 440EP (logical pvr = pvr | 0x8) */
                .platform               = "ppc440",
        },
        { /* Use logical PVR for 440EP (logical pvr = pvr | 0x8) */

-@@ -1141,6 +1259,7 @@
+@@ -1141,6 +1259,7 @@ static struct cpu_spec __initdata cpu_sp

                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_setup              = __setup_cpu_440ep,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_setup              = __setup_cpu_440ep,


@@ -37400,7 +37545,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc440",
        },
        { /* 440GRX */
                .platform               = "ppc440",
        },
        { /* 440GRX */

-@@ -1152,6 +1271,7 @@
+@@ -1152,6 +1271,7 @@ static struct cpu_spec __initdata cpu_sp

                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_setup              = __setup_cpu_440grx,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_setup              = __setup_cpu_440grx,


@@ -37408,7 +37553,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc440",
        },
        { /* Use logical PVR for 440EPx (logical pvr = pvr | 0x8) */
                .platform               = "ppc440",
        },
        { /* Use logical PVR for 440EPx (logical pvr = pvr | 0x8) */

-@@ -1163,6 +1283,7 @@
+@@ -1163,6 +1283,7 @@ static struct cpu_spec __initdata cpu_sp

                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_setup              = __setup_cpu_440epx,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_setup              = __setup_cpu_440epx,


@@ -37416,7 +37561,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc440",
        },
        {       /* 440GP Rev. B */
                .platform               = "ppc440",
        },
        {       /* 440GP Rev. B */

-@@ -1173,6 +1294,7 @@
+@@ -1173,6 +1294,7 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_user_features      = COMMON_USER_BOOKE,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_user_features      = COMMON_USER_BOOKE,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,


@@ -37424,7 +37569,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc440gp",
        },
        {       /* 440GP Rev. C */
                .platform               = "ppc440gp",
        },
        {       /* 440GP Rev. C */

-@@ -1183,6 +1305,7 @@
+@@ -1183,6 +1305,7 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_user_features      = COMMON_USER_BOOKE,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_user_features      = COMMON_USER_BOOKE,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,


@@ -37432,7 +37577,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc440gp",
        },
        { /* 440GX Rev. A */
                .platform               = "ppc440gp",
        },
        { /* 440GX Rev. A */

-@@ -1193,6 +1316,8 @@
+@@ -1193,6 +1316,8 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_user_features      = COMMON_USER_BOOKE,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_user_features      = COMMON_USER_BOOKE,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,


@@ -37441,7 +37586,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc440",
        },
        { /* 440GX Rev. B */
                .platform               = "ppc440",
        },
        { /* 440GX Rev. B */

-@@ -1203,6 +1328,8 @@
+@@ -1203,6 +1328,8 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_user_features      = COMMON_USER_BOOKE,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_user_features      = COMMON_USER_BOOKE,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,


@@ -37450,7 +37595,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc440",
        },
        { /* 440GX Rev. C */
                .platform               = "ppc440",
        },
        { /* 440GX Rev. C */

-@@ -1213,6 +1340,8 @@
+@@ -1213,6 +1340,8 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_user_features      = COMMON_USER_BOOKE,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_user_features      = COMMON_USER_BOOKE,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,


@@ -37459,7 +37604,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc440",
        },
        { /* 440GX Rev. F */
                .platform               = "ppc440",
        },
        { /* 440GX Rev. F */

-@@ -1223,6 +1352,8 @@
+@@ -1223,6 +1352,8 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_user_features      = COMMON_USER_BOOKE,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_user_features      = COMMON_USER_BOOKE,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,


@@ -37468,7 +37613,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc440",
        },
        { /* 440SP Rev. A */
                .platform               = "ppc440",
        },
        { /* 440SP Rev. A */

-@@ -1233,6 +1364,7 @@
+@@ -1233,6 +1364,7 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_user_features      = COMMON_USER_BOOKE,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_user_features      = COMMON_USER_BOOKE,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,


@@ -37476,7 +37621,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc440",
        },
        { /* 440SPe Rev. A */
                .platform               = "ppc440",
        },
        { /* 440SPe Rev. A */

-@@ -1243,6 +1375,8 @@
+@@ -1243,6 +1375,8 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_user_features      = COMMON_USER_BOOKE,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_user_features      = COMMON_USER_BOOKE,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,


@@ -37485,7 +37630,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc440",
        },
        { /* 440SPe Rev. B */
                .platform               = "ppc440",
        },
        { /* 440SPe Rev. B */

-@@ -1253,10 +1387,13 @@
+@@ -1253,10 +1387,13 @@ static struct cpu_spec __initdata cpu_sp

                .cpu_user_features      = COMMON_USER_BOOKE,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
                .cpu_user_features      = COMMON_USER_BOOKE,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,


@@ -37499,7 +37644,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
        {       /* e200z5 */
                .pvr_mask               = 0xfff00000,
                .pvr_value              = 0x81000000,
        {       /* e200z5 */
                .pvr_mask               = 0xfff00000,
                .pvr_value              = 0x81000000,

-@@ -1267,6 +1404,7 @@
+@@ -1267,6 +1404,7 @@ static struct cpu_spec __initdata cpu_sp

                        PPC_FEATURE_HAS_EFP_SINGLE |
                        PPC_FEATURE_UNIFIED_CACHE,
                .dcache_bsize           = 32,
                        PPC_FEATURE_HAS_EFP_SINGLE |
                        PPC_FEATURE_UNIFIED_CACHE,
                .dcache_bsize           = 32,


@@ -37507,7 +37652,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc5554",
        },
        {       /* e200z6 */
                .platform               = "ppc5554",
        },
        {       /* e200z6 */

-@@ -1280,8 +1418,10 @@
+@@ -1280,8 +1418,10 @@ static struct cpu_spec __initdata cpu_sp

                        PPC_FEATURE_HAS_EFP_SINGLE_COMP |
                        PPC_FEATURE_UNIFIED_CACHE,
                .dcache_bsize           = 32,
                        PPC_FEATURE_HAS_EFP_SINGLE_COMP |
                        PPC_FEATURE_UNIFIED_CACHE,
                .dcache_bsize           = 32,


@@ -37518,7 +37663,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
        {       /* e500 */
                .pvr_mask               = 0xffff0000,
                .pvr_value              = 0x80200000,
        {       /* e500 */
                .pvr_mask               = 0xffff0000,
                .pvr_value              = 0x80200000,

-@@ -1296,6 +1436,7 @@
+@@ -1296,6 +1436,7 @@ static struct cpu_spec __initdata cpu_sp

                .num_pmcs               = 4,
                .oprofile_cpu_type      = "ppc/e500",
                .oprofile_type          = PPC_OPROFILE_BOOKE,
                .num_pmcs               = 4,
                .oprofile_cpu_type      = "ppc/e500",
                .oprofile_type          = PPC_OPROFILE_BOOKE,


@@ -37526,7 +37671,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
                .platform               = "ppc8540",
        },
        {       /* e500v2 */
                .platform               = "ppc8540",
        },
        {       /* e500v2 */

-@@ -1313,9 +1454,11 @@
+@@ -1313,9 +1454,11 @@ static struct cpu_spec __initdata cpu_sp

                .num_pmcs               = 4,
                .oprofile_cpu_type      = "ppc/e500",
                .oprofile_type          = PPC_OPROFILE_BOOKE,
                .num_pmcs               = 4,
                .oprofile_cpu_type      = "ppc/e500",
                .oprofile_type          = PPC_OPROFILE_BOOKE,


@@ -37538,9 +37683,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
  #if !CLASSIC_PPC
        {       /* default match */
                .pvr_mask               = 0x00000000,
  #if !CLASSIC_PPC
        {       /* default match */
                .pvr_mask               = 0x00000000,

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/crash.c powerpc.git/arch/powerpc/kernel/crash.c
---- linux-2.6.24/arch/powerpc/kernel/crash.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/crash.c    2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/kernel/crash.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/crash.c
++++ linux-2.6.24.7/arch/powerpc/kernel/crash.c

 @@ -32,6 +32,8 @@
  #include <asm/lmb.h>
  #include <asm/firmware.h>
 @@ -32,6 +32,8 @@
  #include <asm/lmb.h>
  #include <asm/firmware.h>


@@ -37550,7 +37696,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/crash.c powerpc
  
  #ifdef DEBUG
  #include <asm/udbg.h>
  
  #ifdef DEBUG
  #include <asm/udbg.h>

-@@ -45,6 +47,11 @@
+@@ -45,6 +47,11 @@ int crashing_cpu = -1;

  static cpumask_t cpus_in_crash = CPU_MASK_NONE;
  cpumask_t cpus_in_sr = CPU_MASK_NONE;
  
  static cpumask_t cpus_in_crash = CPU_MASK_NONE;
  cpumask_t cpus_in_sr = CPU_MASK_NONE;
  


@@ -37562,7 +37708,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/crash.c powerpc
  #ifdef CONFIG_SMP
  static atomic_t enter_on_soft_reset = ATOMIC_INIT(0);
  
  #ifdef CONFIG_SMP
  static atomic_t enter_on_soft_reset = ATOMIC_INIT(0);
  

-@@ -285,9 +292,72 @@
+@@ -285,9 +292,72 @@ static inline void crash_kexec_stop_spus

  }
  #endif /* CONFIG_SPU_BASE */
  
  }
  #endif /* CONFIG_SPU_BASE */
  


@@ -37636,7 +37782,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/crash.c powerpc
  
        /*
         * This function is only called after the system
  
        /*
         * This function is only called after the system

-@@ -301,15 +371,36 @@
+@@ -301,15 +371,36 @@ void default_machine_crash_shutdown(stru

         */
        hard_irq_disable();
  
         */
        hard_irq_disable();
  


@@ -37677,10 +37823,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/crash.c powerpc
  
        /*
         * Make a note of crashing cpu. Will be used in machine_kexec
  
        /*
         * Make a note of crashing cpu. Will be used in machine_kexec

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/dma_64.c powerpc.git/arch/powerpc/kernel/dma_64.c
---- linux-2.6.24/arch/powerpc/kernel/dma_64.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/dma_64.c   2008-01-28 20:25:49.000000000 +0100
-@@ -112,10 +112,16 @@
+Index: linux-2.6.24.7/arch/powerpc/kernel/dma_64.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/dma_64.c
++++ linux-2.6.24.7/arch/powerpc/kernel/dma_64.c
+@@ -112,10 +112,16 @@ EXPORT_SYMBOL(dma_iommu_ops);

  /*
   * Generic direct DMA implementation
   *
  /*
   * Generic direct DMA implementation
   *


@@ -37700,7 +37847,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/dma_64.c powerp
  
  static void *dma_direct_alloc_coherent(struct device *dev, size_t size,
                                       dma_addr_t *dma_handle, gfp_t flag)
  
  static void *dma_direct_alloc_coherent(struct device *dev, size_t size,
                                       dma_addr_t *dma_handle, gfp_t flag)

-@@ -124,13 +130,12 @@
+@@ -124,13 +130,12 @@ static void *dma_direct_alloc_coherent(s

        void *ret;
        int node = dev->archdata.numa_node;
  
        void *ret;
        int node = dev->archdata.numa_node;
  


@@ -37715,7 +37862,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/dma_64.c powerp
  
        return ret;
  }
  
        return ret;
  }

-@@ -145,7 +150,7 @@
+@@ -145,7 +150,7 @@ static dma_addr_t dma_direct_map_single(

                                        size_t size,
                                        enum dma_data_direction direction)
  {
                                        size_t size,
                                        enum dma_data_direction direction)
  {


@@ -37724,7 +37871,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/dma_64.c powerp
  }
  
  static void dma_direct_unmap_single(struct device *dev, dma_addr_t dma_addr,
  }
  
  static void dma_direct_unmap_single(struct device *dev, dma_addr_t dma_addr,

-@@ -161,7 +166,7 @@
+@@ -161,7 +166,7 @@ static int dma_direct_map_sg(struct devi

        int i;
  
        for_each_sg(sgl, sg, nents, i) {
        int i;
  
        for_each_sg(sgl, sg, nents, i) {


@@ -37733,10 +37880,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/dma_64.c powerp
                sg->dma_length = sg->length;
        }
  
                sg->dma_length = sg->length;
        }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/head_44x.S powerpc.git/arch/powerpc/kernel/head_44x.S
---- linux-2.6.24/arch/powerpc/kernel/head_44x.S        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/head_44x.S 2008-01-28 20:25:49.000000000 +0100
-@@ -289,11 +289,8 @@
+Index: linux-2.6.24.7/arch/powerpc/kernel/head_44x.S
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/head_44x.S
++++ linux-2.6.24.7/arch/powerpc/kernel/head_44x.S
+@@ -289,11 +289,8 @@ interrupt_base:

        CRITICAL_EXCEPTION(0x0100, CriticalInput, unknown_exception)
  
        /* Machine Check Interrupt */
        CRITICAL_EXCEPTION(0x0100, CriticalInput, unknown_exception)
  
        /* Machine Check Interrupt */


@@ -37749,7 +37897,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/head_44x.S powe
  
        /* Data Storage Interrupt */
        START_EXCEPTION(DataStorage)
  
        /* Data Storage Interrupt */
        START_EXCEPTION(DataStorage)

-@@ -674,6 +671,15 @@
+@@ -674,6 +671,15 @@ finish_tlb_load:

   */
  
  /*
   */
  
  /*


@@ -37765,10 +37913,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/head_44x.S powe
   * extern void giveup_altivec(struct task_struct *prev)
   *
   * The 44x core does not have an AltiVec unit.
   * extern void giveup_altivec(struct task_struct *prev)
   *
   * The 44x core does not have an AltiVec unit.

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/head_booke.h powerpc.git/arch/powerpc/kernel/head_booke.h
---- linux-2.6.24/arch/powerpc/kernel/head_booke.h      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/head_booke.h       2008-01-28 20:25:49.000000000 +0100
-@@ -166,7 +166,7 @@
+Index: linux-2.6.24.7/arch/powerpc/kernel/head_booke.h
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/head_booke.h
++++ linux-2.6.24.7/arch/powerpc/kernel/head_booke.h
+@@ -166,7 +166,7 @@ label:

        mfspr   r5,SPRN_ESR;                                    \
        stw     r5,_ESR(r11);                                   \
        addi    r3,r1,STACK_FRAME_OVERHEAD;                     \
        mfspr   r5,SPRN_ESR;                                    \
        stw     r5,_ESR(r11);                                   \
        addi    r3,r1,STACK_FRAME_OVERHEAD;                     \


@@ -37777,10 +37926,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/head_booke.h po
                          NOCOPY, mcheck_transfer_to_handler,   \
                          ret_from_mcheck_exc)
  
                          NOCOPY, mcheck_transfer_to_handler,   \
                          ret_from_mcheck_exc)
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/head_fsl_booke.S powerpc.git/arch/powerpc/kernel/head_fsl_booke.S
---- linux-2.6.24/arch/powerpc/kernel/head_fsl_booke.S  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/head_fsl_booke.S   2008-01-28 20:25:49.000000000 +0100
-@@ -73,8 +73,8 @@
+Index: linux-2.6.24.7/arch/powerpc/kernel/head_fsl_booke.S
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/head_fsl_booke.S
++++ linux-2.6.24.7/arch/powerpc/kernel/head_fsl_booke.S
+@@ -73,8 +73,8 @@ _ENTRY(_start);

  /* We try to not make any assumptions about how the boot loader
   * setup or used the TLBs.  We invalidate all mappings from the
   * boot loader and load a single entry in TLB1[0] to map the
  /* We try to not make any assumptions about how the boot loader
   * setup or used the TLBs.  We invalidate all mappings from the
   * boot loader and load a single entry in TLB1[0] to map the


@@ -37791,7 +37941,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/head_fsl_booke.
   *
   * Requirement on bootloader:
   *  - The page we're executing in needs to reside in TLB1 and
   *
   * Requirement on bootloader:
   *  - The page we're executing in needs to reside in TLB1 and

-@@ -167,7 +167,7 @@
+@@ -167,7 +167,7 @@ skpinv:    addi    r6,r6,1                         /* Increment */

        mtspr   SPRN_MAS0,r7
        tlbre
  
        mtspr   SPRN_MAS0,r7
        tlbre
  


@@ -37800,7 +37950,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/head_fsl_booke.
        lis     r7,0x1000       /* Set MAS0(TLBSEL) = 1 */
        rlwimi  r7,r5,16,4,15   /* Setup MAS0 = TLBSEL | ESEL(r5) */
        mtspr   SPRN_MAS0,r7
        lis     r7,0x1000       /* Set MAS0(TLBSEL) = 1 */
        rlwimi  r7,r5,16,4,15   /* Setup MAS0 = TLBSEL | ESEL(r5) */
        mtspr   SPRN_MAS0,r7

-@@ -177,9 +177,12 @@
+@@ -177,9 +177,12 @@ skpinv:   addi    r6,r6,1                         /* Increment */

        ori     r6,r6,(MAS1_TSIZE(BOOKE_PAGESZ_4K))@l
        mtspr   SPRN_MAS1,r6
        mfspr   r6,SPRN_MAS2
        ori     r6,r6,(MAS1_TSIZE(BOOKE_PAGESZ_4K))@l
        mtspr   SPRN_MAS1,r6
        mfspr   r6,SPRN_MAS2


@@ -37814,7 +37964,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/head_fsl_booke.
        tlbwe
  
        xori    r6,r4,1
        tlbwe
  
        xori    r6,r4,1

-@@ -222,11 +225,11 @@
+@@ -222,11 +225,11 @@ skpinv:  addi    r6,r6,1                         /* Increment */

        lis     r6,0x1000               /* Set MAS0(TLBSEL) = TLB1(1), ESEL = 0 */
        mtspr   SPRN_MAS0,r6
        lis     r6,(MAS1_VALID|MAS1_IPROT)@h
        lis     r6,0x1000               /* Set MAS0(TLBSEL) = TLB1(1), ESEL = 0 */
        mtspr   SPRN_MAS0,r6
        lis     r6,(MAS1_VALID|MAS1_IPROT)@h


@@ -37829,7 +37979,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/head_fsl_booke.
        rlwimi  r6,r7,0,20,31
        mtspr   SPRN_MAS2,r6
        li      r7,(MAS3_SX|MAS3_SW|MAS3_SR)
        rlwimi  r6,r7,0,20,31
        mtspr   SPRN_MAS2,r6
        li      r7,(MAS3_SX|MAS3_SW|MAS3_SR)

-@@ -234,6 +237,9 @@
+@@ -234,6 +237,9 @@ skpinv:    addi    r6,r6,1                         /* Increment */

        tlbwe
  
  /* 7. Jump to KERNELBASE mapping */
        tlbwe
  
  /* 7. Jump to KERNELBASE mapping */


@@ -37839,9 +37989,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/head_fsl_booke.
        lis     r7,MSR_KERNEL@h
        ori     r7,r7,MSR_KERNEL@l
        bl      1f                      /* Find our address */
        lis     r7,MSR_KERNEL@h
        ori     r7,r7,MSR_KERNEL@l
        bl      1f                      /* Find our address */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/ibmebus.c powerpc.git/arch/powerpc/kernel/ibmebus.c
---- linux-2.6.24/arch/powerpc/kernel/ibmebus.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/ibmebus.c  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/kernel/ibmebus.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/ibmebus.c
++++ linux-2.6.24.7/arch/powerpc/kernel/ibmebus.c

 @@ -41,6 +41,7 @@
  #include <linux/kobject.h>
  #include <linux/dma-mapping.h>
 @@ -41,6 +41,7 @@
  #include <linux/kobject.h>
  #include <linux/dma-mapping.h>


@@ -37850,7 +38001,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/ibmebus.c power
  #include <linux/of_platform.h>
  #include <asm/ibmebus.h>
  #include <asm/abs_addr.h>
  #include <linux/of_platform.h>
  #include <asm/ibmebus.h>
  #include <asm/abs_addr.h>

-@@ -52,7 +53,7 @@
+@@ -52,7 +53,7 @@ static struct device ibmebus_bus_device 

  struct bus_type ibmebus_bus_type;
  
  /* These devices will automatically be added to the bus during init */
  struct bus_type ibmebus_bus_type;
  
  /* These devices will automatically be added to the bus during init */


@@ -37859,7 +38010,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/ibmebus.c power
        { .compatible = "IBM,lhca" },
        { .compatible = "IBM,lhea" },
        {},
        { .compatible = "IBM,lhca" },
        { .compatible = "IBM,lhea" },
        {},

-@@ -171,7 +172,7 @@
+@@ -171,7 +172,7 @@ static int ibmebus_create_devices(const 

  
        root = of_find_node_by_path("/");
  
  
        root = of_find_node_by_path("/");
  


@@ -37868,7 +38019,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/ibmebus.c power
                if (!of_match_node(matches, child))
                        continue;
  
                if (!of_match_node(matches, child))
                        continue;
  

-@@ -197,16 +198,13 @@
+@@ -197,16 +198,13 @@ int ibmebus_register_driver(struct of_pl

        /* If the driver uses devices that ibmebus doesn't know, add them */
        ibmebus_create_devices(drv->match_table);
  
        /* If the driver uses devices that ibmebus doesn't know, add them */
        ibmebus_create_devices(drv->match_table);
  


@@ -37887,10 +38038,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/ibmebus.c power
  }
  EXPORT_SYMBOL(ibmebus_unregister_driver);
  
  }
  EXPORT_SYMBOL(ibmebus_unregister_driver);
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/iommu.c powerpc.git/arch/powerpc/kernel/iommu.c
---- linux-2.6.24/arch/powerpc/kernel/iommu.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/iommu.c    2008-01-28 20:25:49.000000000 +0100
-@@ -532,16 +532,14 @@
+Index: linux-2.6.24.7/arch/powerpc/kernel/iommu.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/iommu.c
++++ linux-2.6.24.7/arch/powerpc/kernel/iommu.c
+@@ -532,16 +532,14 @@ struct iommu_table *iommu_init_table(str

        return tbl;
  }
  
        return tbl;
  }
  


@@ -37909,7 +38061,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/iommu.c powerpc
                return;
        }
  
                return;
        }
  

-@@ -550,7 +548,7 @@
+@@ -550,7 +548,7 @@ void iommu_free_table(struct device_node

        for (i = 0; i < (tbl->it_size/64); i++) {
                if (tbl->it_map[i] != 0) {
                        printk(KERN_WARNING "%s: Unexpected TCEs for %s\n",
        for (i = 0; i < (tbl->it_size/64); i++) {
                if (tbl->it_map[i] != 0) {
                        printk(KERN_WARNING "%s: Unexpected TCEs for %s\n",


@@ -37918,10 +38070,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/iommu.c powerpc
                        break;
                }
        }
                        break;
                }
        }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/isa-bridge.c powerpc.git/arch/powerpc/kernel/isa-bridge.c
---- linux-2.6.24/arch/powerpc/kernel/isa-bridge.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/isa-bridge.c       2008-01-28 20:25:49.000000000 +0100
-@@ -108,7 +108,7 @@
+Index: linux-2.6.24.7/arch/powerpc/kernel/isa-bridge.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/isa-bridge.c
++++ linux-2.6.24.7/arch/powerpc/kernel/isa-bridge.c
+@@ -108,7 +108,7 @@ static void __devinit pci_process_ISA_OF

        if (size > 0x10000)
                size = 0x10000;
  
        if (size > 0x10000)
                size = 0x10000;
  


@@ -37930,7 +38083,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/isa-bridge.c po
               "mapping 64k\n");
  
        __ioremap_at(phb_io_base_phys, (void *)ISA_IO_BASE,
               "mapping 64k\n");
  
        __ioremap_at(phb_io_base_phys, (void *)ISA_IO_BASE,

-@@ -116,7 +116,7 @@
+@@ -116,7 +116,7 @@ static void __devinit pci_process_ISA_OF

        return;
  
  inval_range:
        return;
  
  inval_range:


@@ -37939,7 +38092,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/isa-bridge.c po
               "mapping 64k\n");
        __ioremap_at(phb_io_base_phys, (void *)ISA_IO_BASE,
                     0x10000, _PAGE_NO_CACHE|_PAGE_GUARDED);
               "mapping 64k\n");
        __ioremap_at(phb_io_base_phys, (void *)ISA_IO_BASE,
                     0x10000, _PAGE_NO_CACHE|_PAGE_GUARDED);

-@@ -145,7 +145,7 @@
+@@ -145,7 +145,7 @@ void __init isa_bridge_find_early(struct

        for_each_node_by_type(np, "isa") {
                /* Look for our hose being a parent */
                for (parent = of_get_parent(np); parent;) {
        for_each_node_by_type(np, "isa") {
                /* Look for our hose being a parent */
                for (parent = of_get_parent(np); parent;) {


@@ -37948,10 +38101,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/isa-bridge.c po
                                of_node_put(parent);
                                break;
                        }
                                of_node_put(parent);
                                break;
                        }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/legacy_serial.c powerpc.git/arch/powerpc/kernel/legacy_serial.c
---- linux-2.6.24/arch/powerpc/kernel/legacy_serial.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/legacy_serial.c    2008-01-28 20:25:49.000000000 +0100
-@@ -307,7 +307,7 @@
+Index: linux-2.6.24.7/arch/powerpc/kernel/legacy_serial.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/legacy_serial.c
++++ linux-2.6.24.7/arch/powerpc/kernel/legacy_serial.c
+@@ -307,7 +307,7 @@ void __init find_legacy_serial_ports(voi

        }
  
        /* First fill our array with SOC ports */
        }
  
        /* First fill our array with SOC ports */


@@ -37960,7 +38114,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/legacy_serial.c
                struct device_node *soc = of_get_parent(np);
                if (soc && !strcmp(soc->type, "soc")) {
                        index = add_legacy_soc_port(np, np);
                struct device_node *soc = of_get_parent(np);
                if (soc && !strcmp(soc->type, "soc")) {
                        index = add_legacy_soc_port(np, np);

-@@ -318,7 +318,7 @@
+@@ -318,7 +318,7 @@ void __init find_legacy_serial_ports(voi

        }
  
        /* First fill our array with ISA ports */
        }
  
        /* First fill our array with ISA ports */


@@ -37969,7 +38123,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/legacy_serial.c
                struct device_node *isa = of_get_parent(np);
                if (isa && !strcmp(isa->name, "isa")) {
                        index = add_legacy_isa_port(np, isa);
                struct device_node *isa = of_get_parent(np);
                if (isa && !strcmp(isa->name, "isa")) {
                        index = add_legacy_isa_port(np, isa);

-@@ -329,7 +329,7 @@
+@@ -329,7 +329,7 @@ void __init find_legacy_serial_ports(voi

        }
  
        /* First fill our array with tsi-bridge ports */
        }
  
        /* First fill our array with tsi-bridge ports */


@@ -37978,7 +38132,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/legacy_serial.c
                struct device_node *tsi = of_get_parent(np);
                if (tsi && !strcmp(tsi->type, "tsi-bridge")) {
                        index = add_legacy_soc_port(np, np);
                struct device_node *tsi = of_get_parent(np);
                if (tsi && !strcmp(tsi->type, "tsi-bridge")) {
                        index = add_legacy_soc_port(np, np);

-@@ -340,7 +340,7 @@
+@@ -340,7 +340,7 @@ void __init find_legacy_serial_ports(voi

        }
  
        /* First fill our array with opb bus ports */
        }
  
        /* First fill our array with opb bus ports */


@@ -37987,7 +38141,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/legacy_serial.c
                struct device_node *opb = of_get_parent(np);
                if (opb && (!strcmp(opb->type, "opb") ||
                            of_device_is_compatible(opb, "ibm,opb"))) {
                struct device_node *opb = of_get_parent(np);
                if (opb && (!strcmp(opb->type, "opb") ||
                            of_device_is_compatible(opb, "ibm,opb"))) {

-@@ -474,7 +474,7 @@
+@@ -474,7 +474,7 @@ static int __init serial_dev_init(void)

  
        /*
         * Before we register the platfrom serial devices, we need
  
        /*
         * Before we register the platfrom serial devices, we need


@@ -37996,9 +38150,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/legacy_serial.c
         */
        DBG("Fixing serial ports interrupts and IO ports ...\n");
  
         */
        DBG("Fixing serial ports interrupts and IO ports ...\n");
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/lparcfg.c powerpc.git/arch/powerpc/kernel/lparcfg.c
---- linux-2.6.24/arch/powerpc/kernel/lparcfg.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/lparcfg.c  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/kernel/lparcfg.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/lparcfg.c
++++ linux-2.6.24.7/arch/powerpc/kernel/lparcfg.c

 @@ -41,7 +41,6 @@
  /* #define LPARCFG_DEBUG */
  
 @@ -41,7 +41,6 @@
  /* #define LPARCFG_DEBUG */
  


@@ -38007,7 +38162,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/lparcfg.c power
  
  /*
   * Track sum of all purrs across all processors. This is used to further
  
  /*
   * Track sum of all purrs across all processors. This is used to further

-@@ -595,13 +594,6 @@
+@@ -595,13 +594,6 @@ int __init lparcfg_init(void)

        ent = create_proc_entry("ppc64/lparcfg", mode, NULL);
        if (ent) {
                ent->proc_fops = &lparcfg_fops;
        ent = create_proc_entry("ppc64/lparcfg", mode, NULL);
        if (ent) {
                ent->proc_fops = &lparcfg_fops;


@@ -38021,7 +38176,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/lparcfg.c power
        } else {
                printk(KERN_ERR "Failed to create ppc64/lparcfg\n");
                return -EIO;
        } else {
                printk(KERN_ERR "Failed to create ppc64/lparcfg\n");
                return -EIO;

-@@ -613,10 +605,8 @@
+@@ -613,10 +605,8 @@ int __init lparcfg_init(void)

  
  void __exit lparcfg_cleanup(void)
  {
  
  void __exit lparcfg_cleanup(void)
  {


@@ -38033,9 +38188,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/lparcfg.c power
  }
  
  module_init(lparcfg_init);
  }
  
  module_init(lparcfg_init);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/misc.S powerpc.git/arch/powerpc/kernel/misc.S
---- linux-2.6.24/arch/powerpc/kernel/misc.S    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/misc.S     2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/kernel/misc.S
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/misc.S
++++ linux-2.6.24.7/arch/powerpc/kernel/misc.S

 @@ -8,12 +8,17 @@
   * Adapted for iSeries by Mike Corrigan (mikejc@us.ibm.com)
   * PPC64 updates by Dave Engebretsen (engebret@us.ibm.com)
 @@ -8,12 +8,17 @@
   * Adapted for iSeries by Mike Corrigan (mikejc@us.ibm.com)
   * PPC64 updates by Dave Engebretsen (engebret@us.ibm.com)


@@ -38054,7 +38210,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/misc.S powerpc.
  
        .text
  
  
        .text
  

-@@ -43,3 +48,71 @@
+@@ -43,3 +48,71 @@ _GLOBAL(add_reloc_offset)

        add     r3,r3,r5
        mtlr    r0
        blr
        add     r3,r3,r5
        mtlr    r0
        blr


@@ -38126,10 +38282,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/misc.S powerpc.
 +      mtlr    r0
 +      mr      r3,r4
 +      blr
 +      mtlr    r0
 +      mr      r3,r4
 +      blr

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/misc_32.S powerpc.git/arch/powerpc/kernel/misc_32.S
---- linux-2.6.24/arch/powerpc/kernel/misc_32.S 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/misc_32.S  2008-01-28 20:25:49.000000000 +0100
-@@ -206,6 +206,45 @@
+Index: linux-2.6.24.7/arch/powerpc/kernel/misc_32.S
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/misc_32.S
++++ linux-2.6.24.7/arch/powerpc/kernel/misc_32.S
+@@ -206,6 +206,45 @@ _GLOBAL(_nmask_and_or_msr)

        isync
        blr                     /* Done */
  
        isync
        blr                     /* Done */
  


@@ -38175,7 +38332,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/misc_32.S power
  
  /*
   * Flush MMU TLB
  
  /*
   * Flush MMU TLB

-@@ -793,13 +832,6 @@
+@@ -793,13 +832,6 @@ _GLOBAL(kernel_thread)

        addi    r1,r1,16
        blr
  
        addi    r1,r1,16
        blr
  


@@ -38189,10 +38346,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/misc_32.S power
  /*
   * This routine is just here to keep GCC happy - sigh...
   */
  /*
   * This routine is just here to keep GCC happy - sigh...
   */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/misc_64.S powerpc.git/arch/powerpc/kernel/misc_64.S
---- linux-2.6.24/arch/powerpc/kernel/misc_64.S 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/misc_64.S  2008-01-28 20:25:49.000000000 +0100
-@@ -518,13 +518,6 @@
+Index: linux-2.6.24.7/arch/powerpc/kernel/misc_64.S
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/misc_64.S
++++ linux-2.6.24.7/arch/powerpc/kernel/misc_64.S
+@@ -518,13 +518,6 @@ _GLOBAL(giveup_altivec)

  
  #endif /* CONFIG_ALTIVEC */
  
  
  #endif /* CONFIG_ALTIVEC */
  


@@ -38206,9 +38364,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/misc_64.S power
  /* kexec_wait(phys_cpu)
   *
   * wait for the flag to change, indicating this kernel is going away but
  /* kexec_wait(phys_cpu)
   *
   * wait for the flag to change, indicating this kernel is going away but

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/module_32.c powerpc.git/arch/powerpc/kernel/module_32.c
---- linux-2.6.24/arch/powerpc/kernel/module_32.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/module_32.c        2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/kernel/module_32.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/module_32.c
++++ linux-2.6.24.7/arch/powerpc/kernel/module_32.c

 @@ -24,6 +24,7 @@
  #include <linux/kernel.h>
  #include <linux/cache.h>
 @@ -24,6 +24,7 @@
  #include <linux/kernel.h>
  #include <linux/cache.h>


@@ -38217,7 +38376,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/module_32.c pow
  
  #include "setup.h"
  
  
  #include "setup.h"
  

-@@ -54,22 +55,60 @@
+@@ -54,22 +55,60 @@ void module_free(struct module *mod, voi

     addend) */
  static unsigned int count_relocs(const Elf32_Rela *rela, unsigned int num)
  {
     addend) */
  static unsigned int count_relocs(const Elf32_Rela *rela, unsigned int num)
  {


@@ -38291,7 +38450,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/module_32.c pow
  }
  
  /* Get the potential trampolines size required of the init and
  }
  
  /* Get the potential trampolines size required of the init and

-@@ -100,6 +139,16 @@
+@@ -100,6 +139,16 @@ static unsigned long get_plt_size(const 

                        DEBUGP("Ptr: %p.  Number: %u\n",
                               (void *)hdr + sechdrs[i].sh_offset,
                               sechdrs[i].sh_size / sizeof(Elf32_Rela));
                        DEBUGP("Ptr: %p.  Number: %u\n",
                               (void *)hdr + sechdrs[i].sh_offset,
                               sechdrs[i].sh_size / sizeof(Elf32_Rela));


@@ -38308,9 +38467,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/module_32.c pow
                        ret += count_relocs((void *)hdr
                                             + sechdrs[i].sh_offset,
                                             sechdrs[i].sh_size
                        ret += count_relocs((void *)hdr
                                             + sechdrs[i].sh_offset,
                                             sechdrs[i].sh_size

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/module_64.c powerpc.git/arch/powerpc/kernel/module_64.c
---- linux-2.6.24/arch/powerpc/kernel/module_64.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/module_64.c        2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/kernel/module_64.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/module_64.c
++++ linux-2.6.24.7/arch/powerpc/kernel/module_64.c

 @@ -24,6 +24,7 @@
  #include <asm/module.h>
  #include <asm/uaccess.h>
 @@ -24,6 +24,7 @@
  #include <asm/module.h>
  #include <asm/uaccess.h>


@@ -38319,7 +38479,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/module_64.c pow
  
  #include "setup.h"
  
  
  #include "setup.h"
  

-@@ -81,25 +82,23 @@
+@@ -81,25 +82,23 @@ static struct ppc64_stub_entry ppc64_stu

     different addend) */
  static unsigned int count_relocs(const Elf64_Rela *rela, unsigned int num)
  {
     different addend) */
  static unsigned int count_relocs(const Elf64_Rela *rela, unsigned int num)
  {


@@ -38358,7 +38518,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/module_64.c pow
  }
  
  void *module_alloc(unsigned long size)
  }
  
  void *module_alloc(unsigned long size)

-@@ -118,6 +117,44 @@
+@@ -118,6 +117,44 @@ void module_free(struct module *mod, voi

             table entries. */
  }
  
             table entries. */
  }
  


@@ -38403,7 +38563,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/module_64.c pow
  /* Get size of potential trampolines required. */
  static unsigned long get_stubs_size(const Elf64_Ehdr *hdr,
                                    const Elf64_Shdr *sechdrs)
  /* Get size of potential trampolines required. */
  static unsigned long get_stubs_size(const Elf64_Ehdr *hdr,
                                    const Elf64_Shdr *sechdrs)

-@@ -133,6 +170,16 @@
+@@ -133,6 +170,16 @@ static unsigned long get_stubs_size(cons

                        DEBUGP("Ptr: %p.  Number: %lu\n",
                               (void *)sechdrs[i].sh_addr,
                               sechdrs[i].sh_size / sizeof(Elf64_Rela));
                        DEBUGP("Ptr: %p.  Number: %lu\n",
                               (void *)sechdrs[i].sh_addr,
                               sechdrs[i].sh_size / sizeof(Elf64_Rela));


@@ -38420,7 +38580,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/module_64.c pow
                        relocs += count_relocs((void *)sechdrs[i].sh_addr,
                                               sechdrs[i].sh_size
                                               / sizeof(Elf64_Rela));
                        relocs += count_relocs((void *)sechdrs[i].sh_addr,
                                               sechdrs[i].sh_size
                                               / sizeof(Elf64_Rela));

-@@ -343,7 +390,7 @@
+@@ -343,7 +390,7 @@ int apply_relocate_add(Elf64_Shdr *sechd

                        /* Simply set it */
                        *(u32 *)location = value;
                        break;
                        /* Simply set it */
                        *(u32 *)location = value;
                        break;


@@ -38429,7 +38589,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/module_64.c pow
                case R_PPC64_ADDR64:
                        /* Simply set it */
                        *(unsigned long *)location = value;
                case R_PPC64_ADDR64:
                        /* Simply set it */
                        *(unsigned long *)location = value;

-@@ -399,7 +446,7 @@
+@@ -399,7 +446,7 @@ int apply_relocate_add(Elf64_Shdr *sechd

                        }
  
                        /* Only replace bits 2 through 26 */
                        }
  
                        /* Only replace bits 2 through 26 */


@@ -38438,9 +38598,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/module_64.c pow
                                = (*(uint32_t *)location & ~0x03fffffc)
                                | (value & 0x03fffffc);
                        break;
                                = (*(uint32_t *)location & ~0x03fffffc)
                                | (value & 0x03fffffc);
                        break;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/of_device.c powerpc.git/arch/powerpc/kernel/of_device.c
---- linux-2.6.24/arch/powerpc/kernel/of_device.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/of_device.c        2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/kernel/of_device.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/of_device.c
++++ linux-2.6.24.7/arch/powerpc/kernel/of_device.c

 @@ -5,10 +5,10 @@
  #include <linux/module.h>
  #include <linux/mod_devicetable.h>
 @@ -5,10 +5,10 @@
  #include <linux/module.h>
  #include <linux/mod_devicetable.h>


@@ -38453,9 +38614,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/of_device.c pow
  
  static void of_device_make_bus_id(struct of_device *dev)
  {
  
  static void of_device_make_bus_id(struct of_device *dev)
  {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/of_platform.c powerpc.git/arch/powerpc/kernel/of_platform.c
---- linux-2.6.24/arch/powerpc/kernel/of_platform.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/of_platform.c      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/kernel/of_platform.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/of_platform.c
++++ linux-2.6.24.7/arch/powerpc/kernel/of_platform.c

 @@ -19,6 +19,7 @@
  #include <linux/mod_devicetable.h>
  #include <linux/slab.h>
 @@ -19,6 +19,7 @@
  #include <linux/mod_devicetable.h>
  #include <linux/slab.h>


@@ -38473,7 +38635,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/of_platform.c p
        { .type = "soc", },
        { .compatible = "soc", },
        { .type = "spider", },
        { .type = "soc", },
        { .compatible = "soc", },
        { .type = "spider", },

-@@ -64,26 +65,6 @@
+@@ -64,26 +65,6 @@ static int __init of_bus_driver_init(voi

  
  postcore_initcall(of_bus_driver_init);
  
  
  postcore_initcall(of_bus_driver_init);
  


@@ -38500,7 +38662,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/of_platform.c p
  struct of_device* of_platform_device_create(struct device_node *np,
                                            const char *bus_id,
                                            struct device *parent)
  struct of_device* of_platform_device_create(struct device_node *np,
                                            const char *bus_id,
                                            struct device *parent)

-@@ -120,15 +101,15 @@
+@@ -120,15 +101,15 @@ EXPORT_SYMBOL(of_platform_device_create)

   * @matches: match table, NULL to use the default, OF_NO_DEEP_PROBE to
   * disallow recursive creation of child busses
   */
   * @matches: match table, NULL to use the default, OF_NO_DEEP_PROBE to
   * disallow recursive creation of child busses
   */


@@ -38519,7 +38681,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/of_platform.c p
                pr_debug("   create child: %s\n", child->full_name);
                dev = of_platform_device_create(child, NULL, parent);
                if (dev == NULL)
                pr_debug("   create child: %s\n", child->full_name);
                dev = of_platform_device_create(child, NULL, parent);
                if (dev == NULL)

-@@ -157,7 +138,7 @@
+@@ -157,7 +138,7 @@ static int of_platform_bus_create(struct

   */
  
  int of_platform_bus_probe(struct device_node *root,
   */
  
  int of_platform_bus_probe(struct device_node *root,


@@ -38528,7 +38690,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/of_platform.c p
                          struct device *parent)
  {
        struct device_node *child;
                          struct device *parent)
  {
        struct device_node *child;

-@@ -190,7 +171,7 @@
+@@ -190,7 +171,7 @@ int of_platform_bus_probe(struct device_

                rc = of_platform_bus_create(root, matches, &dev->dev);
                goto bail;
        }
                rc = of_platform_bus_create(root, matches, &dev->dev);
                goto bail;
        }


@@ -38537,9 +38699,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/of_platform.c p
                if (!of_match_node(matches, child))
                        continue;
  
                if (!of_match_node(matches, child))
                        continue;
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci-common.c powerpc.git/arch/powerpc/kernel/pci-common.c
---- linux-2.6.24/arch/powerpc/kernel/pci-common.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/pci-common.c       2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/kernel/pci-common.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/pci-common.c
++++ linux-2.6.24.7/arch/powerpc/kernel/pci-common.c

 @@ -48,32 +48,26 @@
  static DEFINE_SPINLOCK(hose_spinlock);
  
 @@ -48,32 +48,26 @@
  static DEFINE_SPINLOCK(hose_spinlock);
  


@@ -38585,7 +38748,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci-common.c po
        phb->is_dynamic = mem_init_done;
  #ifdef CONFIG_PPC64
        if (dev) {
        phb->is_dynamic = mem_init_done;
  #ifdef CONFIG_PPC64
        if (dev) {

-@@ -126,15 +120,10 @@
+@@ -126,15 +120,10 @@ int pcibios_vaddr_is_ioport(void __iomem

   */
  int pci_domain_nr(struct pci_bus *bus)
  {
   */
  int pci_domain_nr(struct pci_bus *bus)
  {


@@ -38603,7 +38766,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci-common.c po
  EXPORT_SYMBOL(pci_domain_nr);
  
  #ifdef CONFIG_PPC_OF
  EXPORT_SYMBOL(pci_domain_nr);
  
  #ifdef CONFIG_PPC_OF

-@@ -153,7 +142,7 @@
+@@ -153,7 +142,7 @@ struct pci_controller* pci_find_hose_for

        while(node) {
                struct pci_controller *hose, *tmp;
                list_for_each_entry_safe(hose, tmp, &hose_list, list_node)
        while(node) {
                struct pci_controller *hose, *tmp;
                list_for_each_entry_safe(hose, tmp, &hose_list, list_node)


@@ -38612,7 +38775,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci-common.c po
                                return hose;
                node = node->parent;
        }
                                return hose;
                node = node->parent;
        }

-@@ -201,6 +190,20 @@
+@@ -201,6 +190,20 @@ int pci_read_irq_line(struct pci_dev *pc

        struct of_irq oirq;
        unsigned int virq;
  
        struct of_irq oirq;
        unsigned int virq;
  


@@ -38633,7 +38796,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci-common.c po
        DBG("Try to map irq for %s...\n", pci_name(pci_dev));
  
  #ifdef DEBUG
        DBG("Try to map irq for %s...\n", pci_name(pci_dev));
  
  #ifdef DEBUG

-@@ -222,10 +225,11 @@
+@@ -222,10 +225,11 @@ int pci_read_irq_line(struct pci_dev *pc

                if (pin == 0)
                        return -1;
                if (pci_read_config_byte(pci_dev, PCI_INTERRUPT_LINE, &line) ||
                if (pin == 0)
                        return -1;
                if (pci_read_config_byte(pci_dev, PCI_INTERRUPT_LINE, &line) ||


@@ -38647,7 +38810,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci-common.c po
  
                virq = irq_create_mapping(NULL, line);
                if (virq != NO_IRQ)
  
                virq = irq_create_mapping(NULL, line);
                if (virq != NO_IRQ)

-@@ -475,3 +479,717 @@
+@@ -475,3 +479,717 @@ void pci_resource_to_user(const struct p

        *start = rsrc->start - offset;
        *end = rsrc->end - offset;
  }
        *start = rsrc->start - offset;
        *end = rsrc->end - offset;
  }


@@ -39365,9 +39528,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci-common.c po
 +      return 0;
 +}
 +
 +      return 0;
 +}
 +

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_32.c powerpc.git/arch/powerpc/kernel/pci_32.c
---- linux-2.6.24/arch/powerpc/kernel/pci_32.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/pci_32.c   2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/kernel/pci_32.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/pci_32.c
++++ linux-2.6.24.7/arch/powerpc/kernel/pci_32.c

 @@ -13,6 +13,7 @@
  #include <linux/bootmem.h>
  #include <linux/irq.h>
 @@ -13,6 +13,7 @@
  #include <linux/bootmem.h>
  #include <linux/irq.h>


@@ -39396,7 +39560,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_32.c powerp
  static void fixup_cpc710_pci64(struct pci_dev* dev);
  #ifdef CONFIG_PPC_OF
  static u8* pci_to_OF_bus_map;
  static void fixup_cpc710_pci64(struct pci_dev* dev);
  #ifdef CONFIG_PPC_OF
  static u8* pci_to_OF_bus_map;

-@@ -53,7 +47,7 @@
+@@ -53,7 +47,7 @@ static u8* pci_to_OF_bus_map;

  /* By default, we don't re-assign bus numbers. We do this only on
   * some pmacs
   */
  /* By default, we don't re-assign bus numbers. We do this only on
   * some pmacs
   */


@@ -39405,7 +39569,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_32.c powerp
  
  LIST_HEAD(hose_list);
  
  
  LIST_HEAD(hose_list);
  

-@@ -100,505 +94,6 @@
+@@ -100,505 +94,6 @@ fixup_cpc710_pci64(struct pci_dev* dev)

  }
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_IBM,   PCI_DEVICE_ID_IBM_CPC710_PCI64, fixup_cpc710_pci64);
  
  }
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_IBM,   PCI_DEVICE_ID_IBM_CPC710_PCI64, fixup_cpc710_pci64);
  


@@ -39911,7 +40075,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_32.c powerp
  #ifdef CONFIG_PPC_OF
  /*
   * Functions below are used on OpenFirmware machines.
  #ifdef CONFIG_PPC_OF
  /*
   * Functions below are used on OpenFirmware machines.

-@@ -619,7 +114,7 @@
+@@ -619,7 +114,7 @@ make_one_node_map(struct device_node* no

        } else
                pci_to_OF_bus_map[pci_bus] = bus_range[0];
  
        } else
                pci_to_OF_bus_map[pci_bus] = bus_range[0];
  


@@ -39920,7 +40084,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_32.c powerp
                struct pci_dev* dev;
                const unsigned int *class_code, *reg;
        
                struct pci_dev* dev;
                const unsigned int *class_code, *reg;
        

-@@ -662,8 +157,8 @@
+@@ -662,8 +157,8 @@ pcibios_make_OF_bus_map(void)

  
        /* For each hose, we begin searching bridges */
        list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
  
        /* For each hose, we begin searching bridges */
        list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {


@@ -39931,7 +40095,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_32.c powerp
                if (!node)
                        continue;
                make_one_node_map(node, hose->first_busno);
                if (!node)
                        continue;
                make_one_node_map(node, hose->first_busno);

-@@ -688,15 +183,18 @@
+@@ -688,15 +183,18 @@ pcibios_make_OF_bus_map(void)

  typedef int (*pci_OF_scan_iterator)(struct device_node* node, void* data);
  
  static struct device_node*
  typedef int (*pci_OF_scan_iterator)(struct device_node* node, void* data);
  
  static struct device_node*


@@ -39953,7 +40117,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_32.c powerp
  
                /* For PCI<->PCI bridges or CardBus bridges, we go down
                 * Note: some OFs create a parent node "multifunc-device" as
  
                /* For PCI<->PCI bridges or CardBus bridges, we go down
                 * Note: some OFs create a parent node "multifunc-device" as

-@@ -708,9 +206,11 @@
+@@ -708,9 +206,11 @@ scan_OF_pci_childs(struct device_node* n

                        (*class_code >> 8) != PCI_CLASS_BRIDGE_CARDBUS)) &&
                        strcmp(node->name, "multifunc-device"))
                        continue;
                        (*class_code >> 8) != PCI_CLASS_BRIDGE_CARDBUS)) &&
                        strcmp(node->name, "multifunc-device"))
                        continue;


@@ -39967,7 +40131,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_32.c powerp
        }
        return NULL;
  }
        }
        return NULL;
  }

-@@ -718,11 +218,11 @@
+@@ -718,11 +218,11 @@ scan_OF_pci_childs(struct device_node* n

  static struct device_node *scan_OF_for_pci_dev(struct device_node *parent,
                                               unsigned int devfn)
  {
  static struct device_node *scan_OF_for_pci_dev(struct device_node *parent,
                                               unsigned int devfn)
  {


@@ -39981,7 +40145,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_32.c powerp
                reg = of_get_property(np, "reg", &psize);
                if (reg == NULL || psize < 4)
                        continue;
                reg = of_get_property(np, "reg", &psize);
                if (reg == NULL || psize < 4)
                        continue;

-@@ -742,7 +242,7 @@
+@@ -742,7 +242,7 @@ static struct device_node *scan_OF_for_p

                struct pci_controller *hose = pci_bus_to_host(bus);
                if (hose == NULL)
                        return NULL;
                struct pci_controller *hose = pci_bus_to_host(bus);
                if (hose == NULL)
                        return NULL;


@@ -39990,7 +40154,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_32.c powerp
        }
  
        /* not a root bus, we need to get our parent */
        }
  
        /* not a root bus, we need to get our parent */

-@@ -812,9 +312,9 @@
+@@ -812,9 +312,9 @@ pci_device_from_OF_node(struct device_no

                return -ENODEV;
        /* Make sure it's really a PCI device */
        hose = pci_find_hose_for_OF_device(node);
                return -ENODEV;
        /* Make sure it's really a PCI device */
        hose = pci_find_hose_for_OF_device(node);


@@ -40002,7 +40166,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_32.c powerp
                        find_OF_pci_device_filter, (void *)node))
                return -ENODEV;
        reg = of_get_property(node, "reg", NULL);
                        find_OF_pci_device_filter, (void *)node))
                return -ENODEV;
        reg = of_get_property(node, "reg", NULL);

-@@ -843,120 +343,6 @@
+@@ -843,120 +343,6 @@ pci_device_from_OF_node(struct device_no

  }
  EXPORT_SYMBOL(pci_device_from_OF_node);
  
  }
  EXPORT_SYMBOL(pci_device_from_OF_node);
  


@@ -40123,7 +40287,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_32.c powerp
  /* We create the "pci-OF-bus-map" property now so it appears in the
   * /proc device tree
   */
  /* We create the "pci-OF-bus-map" property now so it appears in the
   * /proc device tree
   */

-@@ -986,219 +372,7 @@
+@@ -986,219 +372,7 @@ void pcibios_make_OF_bus_map(void)

  }
  #endif /* CONFIG_PPC_OF */
  
  }
  #endif /* CONFIG_PPC_OF */
  


@@ -40344,7 +40508,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_32.c powerp
  {
        struct pci_controller *hose, *tmp;
        struct pci_bus *bus;
  {
        struct pci_controller *hose, *tmp;
        struct pci_bus *bus;

-@@ -1206,6 +380,9 @@
+@@ -1206,6 +380,9 @@ pcibios_init(void)

  
        printk(KERN_INFO "PCI: Probing PCI hardware\n");
  
  
        printk(KERN_INFO "PCI: Probing PCI hardware\n");
  


@@ -40354,7 +40518,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_32.c powerp
        /* Scan all of the recorded PCI controllers.  */
        list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
                if (pci_assign_all_buses)
        /* Scan all of the recorded PCI controllers.  */
        list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
                if (pci_assign_all_buses)

-@@ -1213,9 +390,10 @@
+@@ -1213,9 +390,10 @@ pcibios_init(void)

                hose->last_busno = 0xff;
                bus = pci_scan_bus_parented(hose->parent, hose->first_busno,
                                            hose->ops, hose);
                hose->last_busno = 0xff;
                bus = pci_scan_bus_parented(hose->parent, hose->first_busno,
                                            hose->ops, hose);


@@ -40367,7 +40531,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_32.c powerp
                if (pci_assign_all_buses || next_busno <= hose->last_busno)
                        next_busno = hose->last_busno + pcibios_assign_bus_offset;
        }
                if (pci_assign_all_buses || next_busno <= hose->last_busno)
                        next_busno = hose->last_busno + pcibios_assign_bus_offset;
        }

-@@ -1228,18 +406,8 @@
+@@ -1228,18 +406,8 @@ pcibios_init(void)

        if (pci_assign_all_buses && have_of)
                pcibios_make_OF_bus_map();
  
        if (pci_assign_all_buses && have_of)
                pcibios_make_OF_bus_map();
  


@@ -40388,7 +40552,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_32.c powerp
  
        /* Call machine dependent post-init code */
        if (ppc_md.pcibios_after_init)
  
        /* Call machine dependent post-init code */
        if (ppc_md.pcibios_after_init)

-@@ -1250,14 +418,14 @@
+@@ -1250,14 +418,14 @@ pcibios_init(void)

  
  subsys_initcall(pcibios_init);
  
  
  subsys_initcall(pcibios_init);
  


@@ -40405,7 +40569,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_32.c powerp
        io_offset = (unsigned long)hose->io_base_virt - isa_io_base;
        if (bus->parent == NULL) {
                /* This is a host bridge - fill in its resources */
        io_offset = (unsigned long)hose->io_base_virt - isa_io_base;
        if (bus->parent == NULL) {
                /* This is a host bridge - fill in its resources */

-@@ -1272,8 +440,8 @@
+@@ -1272,8 +440,8 @@ void pcibios_fixup_bus(struct pci_bus *b

                        res->end = IO_SPACE_LIMIT;
                        res->flags = IORESOURCE_IO;
                }
                        res->end = IO_SPACE_LIMIT;
                        res->flags = IORESOURCE_IO;
                }


@@ -40416,7 +40580,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_32.c powerp
  
                for (i = 0; i < 3; ++i) {
                        res = &hose->mem_resources[i];
  
                for (i = 0; i < 3; ++i) {
                        res = &hose->mem_resources[i];

-@@ -1288,35 +456,6 @@
+@@ -1288,35 +456,6 @@ void pcibios_fixup_bus(struct pci_bus *b

                        }
                        bus->resource[i+1] = res;
                }
                        }
                        bus->resource[i+1] = res;
                }


@@ -40452,7 +40616,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_32.c powerp
        }
  }
  
        }
  }
  

-@@ -1328,37 +467,6 @@
+@@ -1328,37 +467,6 @@ pcibios_update_irq(struct pci_dev *dev, 

        /* XXX FIXME - update OF device tree node interrupt property */
  }
  
        /* XXX FIXME - update OF device tree node interrupt property */
  }
  


@@ -40490,7 +40654,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_32.c powerp
  static struct pci_controller*
  pci_bus_to_hose(int bus)
  {
  static struct pci_controller*
  pci_bus_to_hose(int bus)
  {

-@@ -1381,17 +489,6 @@
+@@ -1381,17 +489,6 @@ long sys_pciconfig_iobase(long which, un

        struct pci_controller* hose;
        long result = -EOPNOTSUPP;
  
        struct pci_controller* hose;
        long result = -EOPNOTSUPP;
  


@@ -40508,9 +40672,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_32.c powerp
        hose = pci_bus_to_hose(bus);
        if (!hose)
                return -ENODEV;
        hose = pci_bus_to_hose(bus);
        if (!hose)
                return -ENODEV;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_64.c powerpc.git/arch/powerpc/kernel/pci_64.c
---- linux-2.6.24/arch/powerpc/kernel/pci_64.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/pci_64.c   2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/kernel/pci_64.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/pci_64.c
++++ linux-2.6.24.7/arch/powerpc/kernel/pci_64.c

 @@ -31,7 +31,6 @@
  #include <asm/byteorder.h>
  #include <asm/machdep.h>
 @@ -31,7 +31,6 @@
  #include <asm/byteorder.h>
  #include <asm/machdep.h>


@@ -40530,7 +40695,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_64.c powerp
  
  /* pci_io_base -- the base address from which io bars are offsets.
   * This is the lowest I/O base address (so bar values are always positive),
  
  /* pci_io_base -- the base address from which io bars are offsets.
   * This is the lowest I/O base address (so bar values are always positive),

-@@ -70,139 +65,31 @@
+@@ -70,139 +65,31 @@ struct dma_mapping_ops *get_pci_dma_ops(

  }
  EXPORT_SYMBOL(get_pci_dma_ops);
  
  }
  EXPORT_SYMBOL(get_pci_dma_ops);
  


@@ -40682,7 +40847,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_64.c powerp
  
  static u32 get_int_prop(struct device_node *np, const char *name, u32 def)
  {
  
  static u32 get_int_prop(struct device_node *np, const char *name, u32 def)
  {

-@@ -270,7 +157,6 @@
+@@ -270,7 +157,6 @@ static void pci_parse_of_addrs(struct de

                res->end = base + size - 1;
                res->flags = flags;
                res->name = pci_name(dev);
                res->end = base + size - 1;
                res->flags = flags;
                res->name = pci_name(dev);


@@ -40690,7 +40855,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_64.c powerp
        }
  }
  
        }
  }
  

-@@ -339,16 +225,17 @@
+@@ -339,16 +225,17 @@ struct pci_dev *of_create_pci_dev(struct

  EXPORT_SYMBOL(of_create_pci_dev);
  
  void __devinit of_scan_bus(struct device_node *node,
  EXPORT_SYMBOL(of_create_pci_dev);
  
  void __devinit of_scan_bus(struct device_node *node,


@@ -40711,7 +40876,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_64.c powerp
                DBG("  * %s\n", child->full_name);
                reg = of_get_property(child, "reg", &reglen);
                if (reg == NULL || reglen < 20)
                DBG("  * %s\n", child->full_name);
                reg = of_get_property(child, "reg", &reglen);
                if (reg == NULL || reglen < 20)

-@@ -359,19 +246,26 @@
+@@ -359,19 +246,26 @@ void __devinit of_scan_bus(struct device

                dev = of_create_pci_dev(child, bus, devfn);
                if (!dev)
                        continue;
                dev = of_create_pci_dev(child, bus, devfn);
                if (!dev)
                        continue;


@@ -40744,7 +40909,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_64.c powerp
  {
        struct pci_bus *bus;
        const u32 *busrange, *ranges;
  {
        struct pci_bus *bus;
        const u32 *busrange, *ranges;

-@@ -441,7 +335,6 @@
+@@ -441,7 +335,6 @@ void __devinit of_scan_pci_bridge(struct

                res->start = of_read_number(&ranges[1], 2);
                res->end = res->start + size - 1;
                res->flags = flags;
                res->start = of_read_number(&ranges[1], 2);
                res->end = res->start + size - 1;
                res->flags = flags;


@@ -40752,7 +40917,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_64.c powerp
        }
        sprintf(bus->name, "PCI Bus %04x:%02x", pci_domain_nr(bus),
                bus->number);
        }
        sprintf(bus->name, "PCI Bus %04x:%02x", pci_domain_nr(bus),
                bus->number);

-@@ -462,12 +355,12 @@
+@@ -462,12 +355,12 @@ EXPORT_SYMBOL(of_scan_pci_bridge);

  void __devinit scan_phb(struct pci_controller *hose)
  {
        struct pci_bus *bus;
  void __devinit scan_phb(struct pci_controller *hose)
  {
        struct pci_bus *bus;


@@ -40768,7 +40933,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_64.c powerp
        bus = pci_create_bus(hose->parent, hose->first_busno, hose->ops, node);
        if (bus == NULL) {
                printk(KERN_ERR "Failed to create bus for PCI domain %04x\n",
        bus = pci_create_bus(hose->parent, hose->first_busno, hose->ops, node);
        if (bus == NULL) {
                printk(KERN_ERR "Failed to create bus for PCI domain %04x\n",

-@@ -477,27 +370,27 @@
+@@ -477,27 +370,27 @@ void __devinit scan_phb(struct pci_contr

        bus->secondary = hose->first_busno;
        hose->bus = bus;
  
        bus->secondary = hose->first_busno;
        hose->bus = bus;
  


@@ -40813,7 +40978,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_64.c powerp
        if (node && ppc_md.pci_probe_mode)
                mode = ppc_md.pci_probe_mode(bus);
        DBG("    probe mode: %d\n", mode);
        if (node && ppc_md.pci_probe_mode)
                mode = ppc_md.pci_probe_mode(bus);
        DBG("    probe mode: %d\n", mode);

-@@ -514,15 +407,15 @@
+@@ -514,15 +407,15 @@ static int __init pcibios_init(void)

  {
        struct pci_controller *hose, *tmp;
  
  {
        struct pci_controller *hose, *tmp;
  


@@ -40833,7 +40998,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_64.c powerp
  
        /* Scan all of the recorded PCI controllers.  */
        list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
  
        /* Scan all of the recorded PCI controllers.  */
        list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {

-@@ -530,19 +423,8 @@
+@@ -530,19 +423,8 @@ static int __init pcibios_init(void)

                pci_bus_add_devices(hose->bus);
        }
  
                pci_bus_add_devices(hose->bus);
        }
  


@@ -40855,7 +41020,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_64.c powerp
  
        printk(KERN_DEBUG "PCI: Probing PCI hardware done\n");
  
  
        printk(KERN_DEBUG "PCI: Probing PCI hardware done\n");
  

-@@ -551,141 +433,6 @@
+@@ -551,141 +433,6 @@ static int __init pcibios_init(void)

  
  subsys_initcall(pcibios_init);
  
  
  subsys_initcall(pcibios_init);
  


@@ -40997,7 +41162,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_64.c powerp
  #ifdef CONFIG_HOTPLUG
  
  int pcibios_unmap_io_space(struct pci_bus *bus)
  #ifdef CONFIG_HOTPLUG
  
  int pcibios_unmap_io_space(struct pci_bus *bus)

-@@ -719,8 +466,7 @@
+@@ -719,8 +466,7 @@ int pcibios_unmap_io_space(struct pci_bu

        if (hose->io_base_alloc == 0)
                return 0;
  
        if (hose->io_base_alloc == 0)
                return 0;
  


@@ -41007,7 +41172,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_64.c powerp
        DBG("  alloc=0x%p\n", hose->io_base_alloc);
  
        /* This is a PHB, we fully unmap the IO area */
        DBG("  alloc=0x%p\n", hose->io_base_alloc);
  
        /* This is a PHB, we fully unmap the IO area */

-@@ -779,8 +525,7 @@
+@@ -779,8 +525,7 @@ int __devinit pcibios_map_io_space(struc

        hose->io_base_virt = (void __iomem *)(area->addr +
                                              hose->io_base_phys - phys_page);
  
        hose->io_base_virt = (void __iomem *)(area->addr +
                                              hose->io_base_phys - phys_page);
  


@@ -41017,7 +41182,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_64.c powerp
        DBG("  phys=0x%016lx, virt=0x%p (alloc=0x%p)\n",
            hose->io_base_phys, hose->io_base_virt, hose->io_base_alloc);
        DBG("  size=0x%016lx (alloc=0x%016lx)\n",
        DBG("  phys=0x%016lx, virt=0x%p (alloc=0x%p)\n",
            hose->io_base_phys, hose->io_base_virt, hose->io_base_alloc);
        DBG("  size=0x%016lx (alloc=0x%016lx)\n",

-@@ -803,51 +548,13 @@
+@@ -803,51 +548,13 @@ int __devinit pcibios_map_io_space(struc

  }
  EXPORT_SYMBOL_GPL(pcibios_map_io_space);
  
  }
  EXPORT_SYMBOL_GPL(pcibios_map_io_space);
  


@@ -41070,7 +41235,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_64.c powerp
            sd->of_node ? sd->of_node->full_name : "<none>");
  
        sd->dma_ops = pci_dma_ops;
            sd->of_node ? sd->of_node->full_name : "<none>");
  
        sd->dma_ops = pci_dma_ops;

-@@ -861,7 +568,7 @@
+@@ -861,7 +568,7 @@ void __devinit pcibios_setup_new_device(

  }
  EXPORT_SYMBOL(pcibios_setup_new_device);
  
  }
  EXPORT_SYMBOL(pcibios_setup_new_device);
  


@@ -41079,7 +41244,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_64.c powerp
  {
        struct pci_dev *dev;
  
  {
        struct pci_dev *dev;
  

-@@ -870,42 +577,7 @@
+@@ -870,42 +577,7 @@ static void __devinit do_bus_setup(struc

  
        list_for_each_entry(dev, &bus->devices, bus_list)
                pcibios_setup_new_device(dev);
  
        list_for_each_entry(dev, &bus->devices, bus_list)
                pcibios_setup_new_device(dev);


@@ -41122,10 +41287,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_64.c powerp
  
  unsigned long pci_address_to_pio(phys_addr_t address)
  {
  
  unsigned long pci_address_to_pio(phys_addr_t address)
  {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_dn.c powerpc.git/arch/powerpc/kernel/pci_dn.c
---- linux-2.6.24/arch/powerpc/kernel/pci_dn.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/pci_dn.c   2008-01-28 20:25:49.000000000 +0100
-@@ -56,11 +56,6 @@
+Index: linux-2.6.24.7/arch/powerpc/kernel/pci_dn.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/pci_dn.c
++++ linux-2.6.24.7/arch/powerpc/kernel/pci_dn.c
+@@ -56,11 +56,6 @@ static void * __devinit update_dn_pci_in

                pdn->busno = (regs[0] >> 16) & 0xff;
                pdn->devfn = (regs[0] >> 8) & 0xff;
        }
                pdn->busno = (regs[0] >> 16) & 0xff;
                pdn->devfn = (regs[0] >> 8) & 0xff;
        }


@@ -41137,7 +41303,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_dn.c powerp
  
        pdn->pci_ext_config_space = (type && *type == 1);
        return NULL;
  
        pdn->pci_ext_config_space = (type && *type == 1);
        return NULL;

-@@ -133,7 +128,7 @@
+@@ -133,7 +128,7 @@ void *traverse_pci_devices(struct device

   */
  void __devinit pci_devs_phb_init_dynamic(struct pci_controller *phb)
  {
   */
  void __devinit pci_devs_phb_init_dynamic(struct pci_controller *phb)
  {


@@ -41146,10 +41312,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_dn.c powerp
        struct pci_dn *pdn;
  
        /* PHB nodes themselves must not match */
        struct pci_dn *pdn;
  
        /* PHB nodes themselves must not match */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/ppc_ksyms.c powerpc.git/arch/powerpc/kernel/ppc_ksyms.c
---- linux-2.6.24/arch/powerpc/kernel/ppc_ksyms.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/ppc_ksyms.c        2008-01-28 20:25:49.000000000 +0100
-@@ -59,6 +59,7 @@
+Index: linux-2.6.24.7/arch/powerpc/kernel/ppc_ksyms.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/ppc_ksyms.c
++++ linux-2.6.24.7/arch/powerpc/kernel/ppc_ksyms.c
+@@ -59,6 +59,7 @@ extern void single_step_exception(struct

  extern int sys_sigreturn(struct pt_regs *regs);
  
  EXPORT_SYMBOL(clear_pages);
  extern int sys_sigreturn(struct pt_regs *regs);
  
  EXPORT_SYMBOL(clear_pages);


@@ -41157,10 +41324,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/ppc_ksyms.c pow
  EXPORT_SYMBOL(ISA_DMA_THRESHOLD);
  EXPORT_SYMBOL(DMA_MODE_READ);
  EXPORT_SYMBOL(DMA_MODE_WRITE);
  EXPORT_SYMBOL(ISA_DMA_THRESHOLD);
  EXPORT_SYMBOL(DMA_MODE_READ);
  EXPORT_SYMBOL(DMA_MODE_WRITE);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/prom.c powerpc.git/arch/powerpc/kernel/prom.c
---- linux-2.6.24/arch/powerpc/kernel/prom.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/prom.c     2008-01-28 20:25:49.000000000 +0100
-@@ -583,6 +583,20 @@
+Index: linux-2.6.24.7/arch/powerpc/kernel/prom.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/prom.c
++++ linux-2.6.24.7/arch/powerpc/kernel/prom.c
+@@ -583,6 +583,20 @@ static void __init check_cpu_pa_features

                      ibm_pa_features, ARRAY_SIZE(ibm_pa_features));
  }
  
                      ibm_pa_features, ARRAY_SIZE(ibm_pa_features));
  }
  


@@ -41181,7 +41349,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/prom.c powerpc.
  static struct feature_property {
        const char *name;
        u32 min_value;
  static struct feature_property {
        const char *name;
        u32 min_value;

-@@ -600,6 +614,29 @@
+@@ -600,6 +614,29 @@ static struct feature_property {

  #endif /* CONFIG_PPC64 */
  };
  
  #endif /* CONFIG_PPC64 */
  };
  


@@ -41211,7 +41379,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/prom.c powerpc.
  static void __init check_cpu_feature_properties(unsigned long node)
  {
        unsigned long i;
  static void __init check_cpu_feature_properties(unsigned long node)
  {
        unsigned long i;

-@@ -697,22 +734,13 @@
+@@ -697,22 +734,13 @@ static int __init early_init_dt_scan_cpu

                prop = of_get_flat_dt_prop(node, "cpu-version", NULL);
                if (prop && (*prop & 0xff000000) == 0x0f000000)
                        identify_cpu(0, *prop);
                prop = of_get_flat_dt_prop(node, "cpu-version", NULL);
                if (prop && (*prop & 0xff000000) == 0x0f000000)
                        identify_cpu(0, *prop);


@@ -41237,10 +41405,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/prom.c powerpc.
  
  #ifdef CONFIG_PPC_PSERIES
        if (nthreads > 1)
  
  #ifdef CONFIG_PPC_PSERIES
        if (nthreads > 1)

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/prom_parse.c powerpc.git/arch/powerpc/kernel/prom_parse.c
---- linux-2.6.24/arch/powerpc/kernel/prom_parse.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/prom_parse.c       2008-01-28 20:25:49.000000000 +0100
-@@ -273,7 +273,7 @@
+Index: linux-2.6.24.7/arch/powerpc/kernel/prom_parse.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/prom_parse.c
++++ linux-2.6.24.7/arch/powerpc/kernel/prom_parse.c
+@@ -273,7 +273,7 @@ int of_irq_map_pci(struct pci_dev *pdev,

  #else
                        struct pci_controller *host;
                        host = pci_bus_to_host(pdev->bus);
  #else
                        struct pci_controller *host;
                        host = pci_bus_to_host(pdev->bus);


@@ -41249,7 +41418,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/prom_parse.c po
  #endif
                        /* No node for host bridge ? give up */
                        if (ppnode == NULL)
  #endif
                        /* No node for host bridge ? give up */
                        if (ppnode == NULL)

-@@ -419,7 +419,7 @@
+@@ -419,7 +419,7 @@ static struct of_bus *of_match_bus(struc

  
  static int of_translate_one(struct device_node *parent, struct of_bus *bus,
                            struct of_bus *pbus, u32 *addr,
  
  static int of_translate_one(struct device_node *parent, struct of_bus *bus,
                            struct of_bus *pbus, u32 *addr,


@@ -41258,7 +41427,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/prom_parse.c po
  {
        const u32 *ranges;
        unsigned int rlen;
  {
        const u32 *ranges;
        unsigned int rlen;

-@@ -438,7 +438,7 @@
+@@ -438,7 +438,7 @@ static int of_translate_one(struct devic

         * to translate addresses that aren't supposed to be translated in
         * the first place. --BenH.
         */
         * to translate addresses that aren't supposed to be translated in
         * the first place. --BenH.
         */


@@ -41267,7 +41436,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/prom_parse.c po
        if (ranges == NULL || rlen == 0) {
                offset = of_read_number(addr, na);
                memset(addr, 0, pna * 4);
        if (ranges == NULL || rlen == 0) {
                offset = of_read_number(addr, na);
                memset(addr, 0, pna * 4);

-@@ -481,7 +481,8 @@
+@@ -481,7 +481,8 @@ static int of_translate_one(struct devic

   * that can be mapped to a cpu physical address). This is not really specified
   * that way, but this is traditionally the way IBM at least do things
   */
   * that can be mapped to a cpu physical address). This is not really specified
   * that way, but this is traditionally the way IBM at least do things
   */


@@ -41277,7 +41446,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/prom_parse.c po
  {
        struct device_node *parent = NULL;
        struct of_bus *bus, *pbus;
  {
        struct device_node *parent = NULL;
        struct of_bus *bus, *pbus;

-@@ -540,7 +541,7 @@
+@@ -540,7 +541,7 @@ u64 of_translate_address(struct device_n

                    pbus->name, pna, pns, parent->full_name);
  
                /* Apply bus translation */
                    pbus->name, pna, pns, parent->full_name);
  
                /* Apply bus translation */


@@ -41286,7 +41455,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/prom_parse.c po
                        break;
  
                /* Complete the move up one level */
                        break;
  
                /* Complete the move up one level */

-@@ -556,8 +557,19 @@
+@@ -556,8 +557,19 @@ u64 of_translate_address(struct device_n

  
        return result;
  }
  
        return result;
  }


@@ -41306,9 +41475,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/prom_parse.c po
  const u32 *of_get_address(struct device_node *dev, int index, u64 *size,
                    unsigned int *flags)
  {
  const u32 *of_get_address(struct device_node *dev, int index, u64 *size,
                    unsigned int *flags)
  {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/rio.c powerpc.git/arch/powerpc/kernel/rio.c
---- linux-2.6.24/arch/powerpc/kernel/rio.c     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/rio.c      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/kernel/rio.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/kernel/rio.c

 @@ -0,0 +1,52 @@
 +/*
 + * RapidIO PPC32 support
 @@ -0,0 +1,52 @@
 +/*
 + * RapidIO PPC32 support


@@ -41362,10 +41532,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/rio.c powerpc.g
 +}
 +
 +subsys_initcall(ppc_rio_init);
 +}
 +
 +subsys_initcall(ppc_rio_init);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/rtas_pci.c powerpc.git/arch/powerpc/kernel/rtas_pci.c
---- linux-2.6.24/arch/powerpc/kernel/rtas_pci.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/rtas_pci.c 2008-01-28 20:25:49.000000000 +0100
-@@ -260,7 +260,7 @@
+Index: linux-2.6.24.7/arch/powerpc/kernel/rtas_pci.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/rtas_pci.c
++++ linux-2.6.24.7/arch/powerpc/kernel/rtas_pci.c
+@@ -260,7 +260,7 @@ static int phb_set_bus_ranges(struct dev

  
  int __devinit rtas_setup_phb(struct pci_controller *phb)
  {
  
  int __devinit rtas_setup_phb(struct pci_controller *phb)
  {


@@ -41374,7 +41545,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/rtas_pci.c powe
  
        if (is_python(dev))
                python_countermeasures(dev);
  
        if (is_python(dev))
                python_countermeasures(dev);

-@@ -280,10 +280,7 @@
+@@ -280,10 +280,7 @@ void __init find_and_init_phbs(void)

        struct pci_controller *phb;
        struct device_node *root = of_find_node_by_path("/");
  
        struct pci_controller *phb;
        struct device_node *root = of_find_node_by_path("/");
  


@@ -41386,7 +41557,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/rtas_pci.c powe
                if (node->type == NULL || (strcmp(node->type, "pci") != 0 &&
                                           strcmp(node->type, "pciex") != 0))
                        continue;
                if (node->type == NULL || (strcmp(node->type, "pci") != 0 &&
                                           strcmp(node->type, "pciex") != 0))
                        continue;

-@@ -311,10 +308,12 @@
+@@ -311,10 +308,12 @@ void __init find_and_init_phbs(void)

                if (prop)
                        pci_probe_only = *prop;
  
                if (prop)
                        pci_probe_only = *prop;
  


@@ -41401,9 +41572,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/rtas_pci.c powe
        }
  }
  
        }
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/setup-common.c powerpc.git/arch/powerpc/kernel/setup-common.c
---- linux-2.6.24/arch/powerpc/kernel/setup-common.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/setup-common.c     2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/kernel/setup-common.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/setup-common.c
++++ linux-2.6.24.7/arch/powerpc/kernel/setup-common.c

 @@ -33,6 +33,7 @@
  #include <linux/serial.h>
  #include <linux/serial_8250.h>
 @@ -33,6 +33,7 @@
  #include <linux/serial.h>
  #include <linux/serial_8250.h>


@@ -41420,7 +41592,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/setup-common.c
  
  #include "setup.h"
  
  
  #include "setup.h"
  

-@@ -327,6 +329,31 @@
+@@ -327,6 +329,31 @@ void __init check_for_initrd(void)

  
  #ifdef CONFIG_SMP
  
  
  #ifdef CONFIG_SMP
  


@@ -41452,7 +41624,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/setup-common.c
  /**
   * setup_cpu_maps - initialize the following cpu maps:
   *                  cpu_possible_map
  /**
   * setup_cpu_maps - initialize the following cpu maps:
   *                  cpu_possible_map

-@@ -350,22 +377,32 @@
+@@ -350,22 +377,32 @@ void __init smp_setup_cpu_maps(void)

  {
        struct device_node *dn = NULL;
        int cpu = 0;
  {
        struct device_node *dn = NULL;
        int cpu = 0;


@@ -41488,7 +41660,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/setup-common.c
                        cpu_set(cpu, cpu_present_map);
                        set_hard_smp_processor_id(cpu, intserv[j]);
                        cpu_set(cpu, cpu_possible_map);
                        cpu_set(cpu, cpu_present_map);
                        set_hard_smp_processor_id(cpu, intserv[j]);
                        cpu_set(cpu, cpu_possible_map);

-@@ -373,6 +410,12 @@
+@@ -373,6 +410,12 @@ void __init smp_setup_cpu_maps(void)

                }
        }
  
                }
        }
  


@@ -41501,7 +41673,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/setup-common.c
  #ifdef CONFIG_PPC64
        /*
         * On pSeries LPAR, we need to know how many cpus
  #ifdef CONFIG_PPC64
        /*
         * On pSeries LPAR, we need to know how many cpus

-@@ -395,7 +438,7 @@
+@@ -395,7 +438,7 @@ void __init smp_setup_cpu_maps(void)

  
                /* Double maxcpus for processors which have SMT capability */
                if (cpu_has_feature(CPU_FTR_SMT))
  
                /* Double maxcpus for processors which have SMT capability */
                if (cpu_has_feature(CPU_FTR_SMT))


@@ -41510,7 +41682,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/setup-common.c
  
                if (maxcpus > NR_CPUS) {
                        printk(KERN_WARNING
  
                if (maxcpus > NR_CPUS) {
                        printk(KERN_WARNING

-@@ -412,9 +455,16 @@
+@@ -412,9 +455,16 @@ void __init smp_setup_cpu_maps(void)

        out:
                of_node_put(dn);
        }
        out:
                of_node_put(dn);
        }


@@ -41528,7 +41700,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/setup-common.c
  }
  
  /*
  }
  
  /*

-@@ -424,17 +474,19 @@
+@@ -424,17 +474,19 @@ void __init smp_setup_cpu_maps(void)

   */
  void __init smp_setup_cpu_sibling_map(void)
  {
   */
  void __init smp_setup_cpu_sibling_map(void)
  {


@@ -41556,9 +41728,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/setup-common.c
  #endif /* CONFIG_PPC64 */
  }
  #endif /* CONFIG_SMP */
  #endif /* CONFIG_PPC64 */
  }
  #endif /* CONFIG_SMP */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/signal_32.c powerpc.git/arch/powerpc/kernel/signal_32.c
---- linux-2.6.24/arch/powerpc/kernel/signal_32.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/signal_32.c        2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/kernel/signal_32.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/signal_32.c
++++ linux-2.6.24.7/arch/powerpc/kernel/signal_32.c

 @@ -24,13 +24,12 @@
  #include <linux/signal.h>
  #include <linux/errno.h>
 @@ -24,13 +24,12 @@
  #include <linux/signal.h>
  #include <linux/errno.h>


@@ -41574,10 +41747,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/signal_32.c pow
  #include <linux/unistd.h>
  #include <linux/stddef.h>
  #include <linux/tty.h>
  #include <linux/unistd.h>
  #include <linux/stddef.h>
  #include <linux/tty.h>

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/smp.c powerpc.git/arch/powerpc/kernel/smp.c
---- linux-2.6.24/arch/powerpc/kernel/smp.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/smp.c      2008-01-28 20:25:49.000000000 +0100
-@@ -76,6 +76,8 @@
+Index: linux-2.6.24.7/arch/powerpc/kernel/smp.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/smp.c
++++ linux-2.6.24.7/arch/powerpc/kernel/smp.c
+@@ -76,6 +76,8 @@ void smp_call_function_interrupt(void);

  
  int smt_enabled_at_boot = 1;
  
  
  int smt_enabled_at_boot = 1;
  


@@ -41586,7 +41760,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/smp.c powerpc.g
  static void (*crash_ipi_function_ptr)(struct pt_regs *) = NULL;
  
  #ifdef CONFIG_PPC64
  static void (*crash_ipi_function_ptr)(struct pt_regs *) = NULL;
  
  #ifdef CONFIG_PPC64

-@@ -181,12 +183,13 @@
+@@ -181,12 +183,13 @@ static struct call_data_struct {

   * <wait> If true, wait (atomically) until function has completed on other CPUs.
   * [RETURNS] 0 on success, else a negative status code. Does not return until
   * remote CPUs are nearly ready to execute <<func>> or are or have executed.
   * <wait> If true, wait (atomically) until function has completed on other CPUs.
   * [RETURNS] 0 on success, else a negative status code. Does not return until
   * remote CPUs are nearly ready to execute <<func>> or are or have executed.


@@ -41602,7 +41776,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/smp.c powerpc.g
  {
        struct call_data_struct data;
        int ret = -1, num_cpus;
  {
        struct call_data_struct data;
        int ret = -1, num_cpus;

-@@ -203,8 +206,6 @@
+@@ -203,8 +206,6 @@ int smp_call_function_map(void (*func) (

        if (wait)
                atomic_set(&data.finished, 0);
  
        if (wait)
                atomic_set(&data.finished, 0);
  


@@ -41611,7 +41785,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/smp.c powerpc.g
        /* remove 'self' from the map */
        if (cpu_isset(smp_processor_id(), map))
                cpu_clear(smp_processor_id(), map);
        /* remove 'self' from the map */
        if (cpu_isset(smp_processor_id(), map))
                cpu_clear(smp_processor_id(), map);

-@@ -231,7 +232,8 @@
+@@ -231,7 +232,8 @@ int smp_call_function_map(void (*func) (

                        printk("smp_call_function on cpu %d: other cpus not "
                                "responding (%d)\n", smp_processor_id(),
                                atomic_read(&data.started));
                        printk("smp_call_function on cpu %d: other cpus not "
                                "responding (%d)\n", smp_processor_id(),
                                atomic_read(&data.started));


@@ -41621,7 +41795,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/smp.c powerpc.g
                        goto out;
                }
        }
                        goto out;
                }
        }

-@@ -258,14 +260,18 @@
+@@ -258,14 +260,18 @@ int smp_call_function_map(void (*func) (

   out:
        call_data = NULL;
        HMT_medium();
   out:
        call_data = NULL;
        HMT_medium();


@@ -41642,7 +41816,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/smp.c powerpc.g
  }
  
  int smp_call_function(void (*func) (void *info), void *info, int nonatomic,
  }
  
  int smp_call_function(void (*func) (void *info), void *info, int nonatomic,

-@@ -278,8 +284,8 @@
+@@ -278,8 +284,8 @@ int smp_call_function(void (*func) (void

  }
  EXPORT_SYMBOL(smp_call_function);
  
  }
  EXPORT_SYMBOL(smp_call_function);
  


@@ -41653,7 +41827,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/smp.c powerpc.g
  {
        cpumask_t map = CPU_MASK_NONE;
        int ret = 0;
  {
        cpumask_t map = CPU_MASK_NONE;
        int ret = 0;

-@@ -291,9 +297,11 @@
+@@ -291,9 +297,11 @@ int smp_call_function_single(int cpu, vo

                return -EINVAL;
  
        cpu_set(cpu, map);
                return -EINVAL;
  
        cpu_set(cpu, map);


@@ -41668,7 +41842,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/smp.c powerpc.g
                local_irq_disable();
                func(info);
                local_irq_enable();
                local_irq_disable();
                func(info);
                local_irq_enable();

-@@ -305,7 +313,22 @@
+@@ -305,7 +313,22 @@ EXPORT_SYMBOL(smp_call_function_single);

  
  void smp_send_stop(void)
  {
  
  void smp_send_stop(void)
  {


@@ -41692,9 +41866,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/smp.c powerpc.g
  }
  
  void smp_call_function_interrupt(void)
  }
  
  void smp_call_function_interrupt(void)

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/systbl_chk.c powerpc.git/arch/powerpc/kernel/systbl_chk.c
---- linux-2.6.24/arch/powerpc/kernel/systbl_chk.c      1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/systbl_chk.c       2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/kernel/systbl_chk.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/kernel/systbl_chk.c

 @@ -0,0 +1,58 @@
 +/*
 + * This file, when run through CPP produces a list of syscall numbers
 @@ -0,0 +1,58 @@
 +/*
 + * This file, when run through CPP produces a list of syscall numbers


@@ -41754,9 +41929,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/systbl_chk.c po
 +START_TABLE
 +#include <asm/systbl.h>
 +END_TABLE __NR_syscalls
 +START_TABLE
 +#include <asm/systbl.h>
 +END_TABLE __NR_syscalls

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/systbl_chk.sh powerpc.git/arch/powerpc/kernel/systbl_chk.sh
---- linux-2.6.24/arch/powerpc/kernel/systbl_chk.sh     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/systbl_chk.sh      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/kernel/systbl_chk.sh
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/kernel/systbl_chk.sh

 @@ -0,0 +1,33 @@
 +#!/bin/sh
 +#
 @@ -0,0 +1,33 @@
 +#!/bin/sh
 +#


@@ -41791,10 +41967,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/systbl_chk.sh p
 +              };
 +              num++;
 +      }' "$1"
 +              };
 +              num++;
 +      }' "$1"

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/time.c powerpc.git/arch/powerpc/kernel/time.c
---- linux-2.6.24/arch/powerpc/kernel/time.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/time.c     2008-01-28 20:25:49.000000000 +0100
-@@ -116,9 +116,12 @@
+Index: linux-2.6.24.7/arch/powerpc/kernel/time.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/time.c
++++ linux-2.6.24.7/arch/powerpc/kernel/time.c
+@@ -116,9 +116,12 @@ static struct clock_event_device decreme

         .features       = CLOCK_EVT_FEAT_ONESHOT,
  };
  
         .features       = CLOCK_EVT_FEAT_ONESHOT,
  };
  


@@ -41810,7 +41987,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/time.c powerpc.
  
  #ifdef CONFIG_PPC_ISERIES
  static unsigned long __initdata iSeries_recal_titan;
  
  #ifdef CONFIG_PPC_ISERIES
  static unsigned long __initdata iSeries_recal_titan;

-@@ -216,7 +219,11 @@
+@@ -216,7 +219,11 @@ static u64 read_purr(void)

   */
  static u64 read_spurr(u64 purr)
  {
   */
  static u64 read_spurr(u64 purr)
  {


@@ -41823,7 +42000,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/time.c powerpc.
                return mfspr(SPRN_SPURR);
        return purr;
  }
                return mfspr(SPRN_SPURR);
        return purr;
  }

-@@ -227,29 +234,30 @@
+@@ -227,29 +234,30 @@ static u64 read_spurr(u64 purr)

   */
  void account_system_vtime(struct task_struct *tsk)
  {
   */
  void account_system_vtime(struct task_struct *tsk)
  {


@@ -41861,7 +42038,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/time.c powerpc.
        get_paca()->spurrdelta = deltascaled;
        local_irq_restore(flags);
  }
        get_paca()->spurrdelta = deltascaled;
        local_irq_restore(flags);
  }

-@@ -326,11 +334,9 @@
+@@ -326,11 +334,9 @@ void calculate_steal_time(void)

        s64 stolen;
        struct cpu_purr_data *pme;
  
        s64 stolen;
        struct cpu_purr_data *pme;
  


@@ -41875,7 +42052,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/time.c powerpc.
        tb = mftb();
        purr = mfspr(SPRN_PURR);
        stolen = (tb - pme->tb) - (purr - pme->purr);
        tb = mftb();
        purr = mfspr(SPRN_PURR);
        stolen = (tb - pme->tb) - (purr - pme->purr);

-@@ -353,7 +359,7 @@
+@@ -353,7 +359,7 @@ static void snapshot_purr(void)

        if (!cpu_has_feature(CPU_FTR_PURR))
                return;
        local_irq_save(flags);
        if (!cpu_has_feature(CPU_FTR_PURR))
                return;
        local_irq_save(flags);


@@ -41884,7 +42061,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/time.c powerpc.
        pme->tb = mftb();
        pme->purr = mfspr(SPRN_PURR);
        pme->initialized = 1;
        pme->tb = mftb();
        pme->purr = mfspr(SPRN_PURR);
        pme->initialized = 1;

-@@ -556,8 +562,8 @@
+@@ -556,8 +562,8 @@ void __init iSeries_time_init_early(void

  void timer_interrupt(struct pt_regs * regs)
  {
        struct pt_regs *old_regs;
  void timer_interrupt(struct pt_regs * regs)
  {
        struct pt_regs *old_regs;


@@ -41895,7 +42072,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/time.c powerpc.
        u64 now;
  
        /* Ensure a positive value is written to the decrementer, or else
        u64 now;
  
        /* Ensure a positive value is written to the decrementer, or else

-@@ -570,9 +576,9 @@
+@@ -570,9 +576,9 @@ void timer_interrupt(struct pt_regs * re

  #endif
  
        now = get_tb_or_rtc();
  #endif
  
        now = get_tb_or_rtc();


@@ -41907,7 +42084,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/time.c powerpc.
                if (now <= DECREMENTER_MAX)
                        set_dec((int)now);
                return;
                if (now <= DECREMENTER_MAX)
                        set_dec((int)now);
                return;

-@@ -623,6 +629,45 @@
+@@ -623,6 +629,45 @@ void wakeup_decrementer(void)

        set_dec(ticks);
  }
  
        set_dec(ticks);
  }
  


@@ -41953,7 +42130,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/time.c powerpc.
  #ifdef CONFIG_SMP
  void __init smp_space_timers(unsigned int max_cpus)
  {
  #ifdef CONFIG_SMP
  void __init smp_space_timers(unsigned int max_cpus)
  {

-@@ -811,7 +856,7 @@
+@@ -811,7 +856,7 @@ void __init clocksource_init(void)

  static int decrementer_set_next_event(unsigned long evt,
                                      struct clock_event_device *dev)
  {
  static int decrementer_set_next_event(unsigned long evt,
                                      struct clock_event_device *dev)
  {


@@ -41962,7 +42139,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/time.c powerpc.
        set_dec(evt);
        return 0;
  }
        set_dec(evt);
        return 0;
  }

-@@ -825,7 +870,7 @@
+@@ -825,7 +870,7 @@ static void decrementer_set_mode(enum cl

  
  static void register_decrementer_clockevent(int cpu)
  {
  
  static void register_decrementer_clockevent(int cpu)
  {


@@ -41971,7 +42148,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/time.c powerpc.
  
        *dec = decrementer_clockevent;
        dec->cpumask = cpumask_of_cpu(cpu);
  
        *dec = decrementer_clockevent;
        dec->cpumask = cpumask_of_cpu(cpu);

-@@ -836,7 +881,7 @@
+@@ -836,7 +881,7 @@ static void register_decrementer_clockev

        clockevents_register_device(dec);
  }
  
        clockevents_register_device(dec);
  }
  


@@ -41980,10 +42157,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/time.c powerpc.
  {
        int cpu = smp_processor_id();
  
  {
        int cpu = smp_processor_id();
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/traps.c powerpc.git/arch/powerpc/kernel/traps.c
---- linux-2.6.24/arch/powerpc/kernel/traps.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/traps.c    2008-01-28 20:25:49.000000000 +0100
-@@ -334,18 +334,25 @@
+Index: linux-2.6.24.7/arch/powerpc/kernel/traps.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/traps.c
++++ linux-2.6.24.7/arch/powerpc/kernel/traps.c
+@@ -334,18 +334,25 @@ static inline int check_io_access(struct

  #define clear_single_step(regs)       ((regs)->msr &= ~MSR_SE)
  #endif
  
  #define clear_single_step(regs)       ((regs)->msr &= ~MSR_SE)
  #endif
  


@@ -42012,7 +42190,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/traps.c powerpc
        printk("Machine check in kernel mode.\n");
        if (reason & ESR_IMCP){
                printk("Instruction Synchronous Machine Check exception\n");
        printk("Machine check in kernel mode.\n");
        if (reason & ESR_IMCP){
                printk("Instruction Synchronous Machine Check exception\n");

-@@ -375,7 +382,13 @@
+@@ -375,7 +382,13 @@ static int generic_machine_check_excepti

                /* Clear MCSR */
                mtspr(SPRN_MCSR, mcsr);
        }
                /* Clear MCSR */
                mtspr(SPRN_MCSR, mcsr);
        }


@@ -42027,7 +42205,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/traps.c powerpc
        printk("Machine check in kernel mode.\n");
        printk("Caused by (from MCSR=%lx): ", reason);
  
        printk("Machine check in kernel mode.\n");
        printk("Caused by (from MCSR=%lx): ", reason);
  

-@@ -403,7 +416,14 @@
+@@ -403,7 +416,14 @@ static int generic_machine_check_excepti

                printk("Bus - Instruction Parity Error\n");
        if (reason & MCSR_BUS_RPERR)
                printk("Bus - Read Parity Error\n");
                printk("Bus - Instruction Parity Error\n");
        if (reason & MCSR_BUS_RPERR)
                printk("Bus - Read Parity Error\n");


@@ -42043,7 +42221,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/traps.c powerpc
        printk("Machine check in kernel mode.\n");
        printk("Caused by (from MCSR=%lx): ", reason);
  
        printk("Machine check in kernel mode.\n");
        printk("Caused by (from MCSR=%lx): ", reason);
  

-@@ -421,7 +441,14 @@
+@@ -421,7 +441,14 @@ static int generic_machine_check_excepti

                printk("Bus - Read Bus Error on data load\n");
        if (reason & MCSR_BUS_WRERR)
                printk("Bus - Write Bus Error on buffered store or cache line push\n");
                printk("Bus - Read Bus Error on data load\n");
        if (reason & MCSR_BUS_WRERR)
                printk("Bus - Write Bus Error on buffered store or cache line push\n");


@@ -42059,7 +42237,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/traps.c powerpc
        printk("Machine check in kernel mode.\n");
        printk("Caused by (from SRR1=%lx): ", reason);
        switch (reason & 0x601F0000) {
        printk("Machine check in kernel mode.\n");
        printk("Caused by (from SRR1=%lx): ", reason);
        switch (reason & 0x601F0000) {

-@@ -451,22 +478,26 @@
+@@ -451,22 +478,26 @@ static int generic_machine_check_excepti

        default:
                printk("Unknown values in msr\n");
        }
        default:
                printk("Unknown values in msr\n");
        }


@@ -42092,7 +42270,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/traps.c powerpc
                return;
  
        if (user_mode(regs)) {
                return;
  
        if (user_mode(regs)) {

-@@ -476,7 +507,12 @@
+@@ -476,7 +507,12 @@ void machine_check_exception(struct pt_r

        }
  
  #if defined(CONFIG_8xx) && defined(CONFIG_PCI)
        }
  
  #if defined(CONFIG_8xx) && defined(CONFIG_PCI)


@@ -42106,7 +42284,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/traps.c powerpc
        bad_page_fault(regs, regs->dar, SIGBUS);
        return;
  #endif
        bad_page_fault(regs, regs->dar, SIGBUS);
        return;
  #endif

-@@ -622,6 +658,9 @@
+@@ -622,6 +658,9 @@ static void parse_fpe(struct pt_regs *re

  #define INST_POPCNTB          0x7c0000f4
  #define INST_POPCNTB_MASK     0xfc0007fe
  
  #define INST_POPCNTB          0x7c0000f4
  #define INST_POPCNTB_MASK     0xfc0007fe
  


@@ -42116,7 +42294,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/traps.c powerpc
  static int emulate_string_inst(struct pt_regs *regs, u32 instword)
  {
        u8 rT = (instword >> 21) & 0x1f;
  static int emulate_string_inst(struct pt_regs *regs, u32 instword)
  {
        u8 rT = (instword >> 21) & 0x1f;

-@@ -707,6 +746,23 @@
+@@ -707,6 +746,23 @@ static int emulate_popcntb_inst(struct p

        return 0;
  }
  
        return 0;
  }
  


@@ -42140,7 +42318,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/traps.c powerpc
  static int emulate_instruction(struct pt_regs *regs)
  {
        u32 instword;
  static int emulate_instruction(struct pt_regs *regs)
  {
        u32 instword;

-@@ -749,6 +805,11 @@
+@@ -749,6 +805,11 @@ static int emulate_instruction(struct pt

                return emulate_popcntb_inst(regs, instword);
        }
  
                return emulate_popcntb_inst(regs, instword);
        }
  


@@ -42152,10 +42330,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/traps.c powerpc
        return -EINVAL;
  }
  
        return -EINVAL;
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/udbg.c powerpc.git/arch/powerpc/kernel/udbg.c
---- linux-2.6.24/arch/powerpc/kernel/udbg.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/udbg.c     2008-01-28 20:25:49.000000000 +0100
-@@ -54,9 +54,16 @@
+Index: linux-2.6.24.7/arch/powerpc/kernel/udbg.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/udbg.c
++++ linux-2.6.24.7/arch/powerpc/kernel/udbg.c
+@@ -54,9 +54,16 @@ void __init udbg_early_init(void)

  #elif defined(CONFIG_PPC_EARLY_DEBUG_44x)
        /* PPC44x debug */
        udbg_init_44x_as1();
  #elif defined(CONFIG_PPC_EARLY_DEBUG_44x)
        /* PPC44x debug */
        udbg_init_44x_as1();


@@ -42172,10 +42351,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/udbg.c powerpc.
  }
  
  /* udbg library, used by xmon et al */
  }
  
  /* udbg library, used by xmon et al */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/udbg_16550.c powerpc.git/arch/powerpc/kernel/udbg_16550.c
---- linux-2.6.24/arch/powerpc/kernel/udbg_16550.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/udbg_16550.c       2008-01-28 20:25:49.000000000 +0100
-@@ -46,7 +46,7 @@
+Index: linux-2.6.24.7/arch/powerpc/kernel/udbg_16550.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/kernel/udbg_16550.c
++++ linux-2.6.24.7/arch/powerpc/kernel/udbg_16550.c
+@@ -46,7 +46,7 @@ struct NS16550 {

  
  #define LCR_DLAB 0x80
  
  
  #define LCR_DLAB 0x80
  


@@ -42184,7 +42364,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/udbg_16550.c po
  
  static void udbg_550_putc(char c)
  {
  
  static void udbg_550_putc(char c)
  {

-@@ -117,7 +117,7 @@
+@@ -117,7 +117,7 @@ unsigned int udbg_probe_uart_speed(void 

  {
        unsigned int dll, dlm, divisor, prescaler, speed;
        u8 old_lcr;
  {
        unsigned int dll, dlm, divisor, prescaler, speed;
        u8 old_lcr;


@@ -42193,7 +42373,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/udbg_16550.c po
  
        old_lcr = in_8(&port->lcr);
  
  
        old_lcr = in_8(&port->lcr);
  

-@@ -162,7 +162,7 @@
+@@ -162,7 +162,7 @@ void udbg_maple_real_putc(char c)

  
  void __init udbg_init_maple_realmode(void)
  {
  
  void __init udbg_init_maple_realmode(void)
  {


@@ -42202,7 +42382,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/udbg_16550.c po
  
        udbg_putc = udbg_maple_real_putc;
        udbg_getc = NULL;
  
        udbg_putc = udbg_maple_real_putc;
        udbg_getc = NULL;

-@@ -184,7 +184,7 @@
+@@ -184,7 +184,7 @@ void udbg_pas_real_putc(char c)

  
  void udbg_init_pas_realmode(void)
  {
  
  void udbg_init_pas_realmode(void)
  {


@@ -42211,7 +42391,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/udbg_16550.c po
  
        udbg_putc = udbg_pas_real_putc;
        udbg_getc = NULL;
  
        udbg_putc = udbg_pas_real_putc;
        udbg_getc = NULL;

-@@ -219,9 +219,42 @@
+@@ -219,9 +219,42 @@ static int udbg_44x_as1_getc(void)

  void __init udbg_init_44x_as1(void)
  {
        udbg_comport =
  void __init udbg_init_44x_as1(void)
  {
        udbg_comport =


@@ -42255,9 +42435,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/udbg_16550.c po
 +      udbg_getc_poll = NULL;
 +}
 +#endif /* CONFIG_PPC_EARLY_DEBUG_40x */
 +      udbg_getc_poll = NULL;
 +}
 +#endif /* CONFIG_PPC_EARLY_DEBUG_40x */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/math-emu/op-4.h powerpc.git/arch/powerpc/math-emu/op-4.h
---- linux-2.6.24/arch/powerpc/math-emu/op-4.h  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/math-emu/op-4.h   2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/math-emu/op-4.h
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/math-emu/op-4.h
++++ linux-2.6.24.7/arch/powerpc/math-emu/op-4.h

 @@ -194,19 +194,39 @@
    (X##_f[3] = I3, X##_f[2] = I2, X##_f[1] = I1, X##_f[0] = I0)
  
 @@ -194,19 +194,39 @@
    (X##_f[3] = I3, X##_f[2] = I2, X##_f[1] = I1, X##_f[0] = I0)
  


@@ -42308,10 +42489,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/math-emu/op-4.h powerp
  #endif
  
  #ifndef __FP_FRAC_ADDI_4
  #endif
  
  #ifndef __FP_FRAC_ADDI_4

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/fault.c powerpc.git/arch/powerpc/mm/fault.c
---- linux-2.6.24/arch/powerpc/mm/fault.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/mm/fault.c        2008-01-28 20:25:49.000000000 +0100
-@@ -167,10 +167,8 @@
+Index: linux-2.6.24.7/arch/powerpc/mm/fault.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/mm/fault.c
++++ linux-2.6.24.7/arch/powerpc/mm/fault.c
+@@ -167,10 +167,8 @@ int __kprobes do_page_fault(struct pt_re

        if (notify_page_fault(regs))
                return 0;
  
        if (notify_page_fault(regs))
                return 0;
  


@@ -42324,7 +42506,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/fault.c powerpc.git
  
        /* On a kernel SLB miss we can only check for a valid exception entry */
        if (!user_mode(regs) && (address >= TASK_SIZE))
  
        /* On a kernel SLB miss we can only check for a valid exception entry */
        if (!user_mode(regs) && (address >= TASK_SIZE))

-@@ -189,7 +187,7 @@
+@@ -189,7 +187,7 @@ int __kprobes do_page_fault(struct pt_re

                        return SIGSEGV;
                /* in_atomic() in user mode is really bad,
                   as is current->mm == NULL. */
                        return SIGSEGV;
                /* in_atomic() in user mode is really bad,
                   as is current->mm == NULL. */


@@ -42333,10 +42515,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/fault.c powerpc.git
                       "in_atomic() = %d mm = %p\n", in_atomic(), mm);
                printk(KERN_EMERG "NIP = %lx  MSR = %lx\n",
                       regs->nip, regs->msr);
                       "in_atomic() = %d mm = %p\n", in_atomic(), mm);
                printk(KERN_EMERG "NIP = %lx  MSR = %lx\n",
                       regs->nip, regs->msr);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/fsl_booke_mmu.c powerpc.git/arch/powerpc/mm/fsl_booke_mmu.c
---- linux-2.6.24/arch/powerpc/mm/fsl_booke_mmu.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/mm/fsl_booke_mmu.c        2008-01-28 20:25:49.000000000 +0100
-@@ -165,15 +165,15 @@
+Index: linux-2.6.24.7/arch/powerpc/mm/fsl_booke_mmu.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/mm/fsl_booke_mmu.c
++++ linux-2.6.24.7/arch/powerpc/mm/fsl_booke_mmu.c
+@@ -165,15 +165,15 @@ void invalidate_tlbcam_entry(int index)

  void __init cam_mapin_ram(unsigned long cam0, unsigned long cam1,
                unsigned long cam2)
  {
  void __init cam_mapin_ram(unsigned long cam0, unsigned long cam1,
                unsigned long cam2)
  {


@@ -42355,10 +42538,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/fsl_booke_mmu.c pow
        }
  }
  
        }
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/hash_utils_64.c powerpc.git/arch/powerpc/mm/hash_utils_64.c
---- linux-2.6.24/arch/powerpc/mm/hash_utils_64.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/mm/hash_utils_64.c        2008-01-28 21:37:04.000000000 +0100
-@@ -96,6 +96,7 @@
+Index: linux-2.6.24.7/arch/powerpc/mm/hash_utils_64.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/mm/hash_utils_64.c
++++ linux-2.6.24.7/arch/powerpc/mm/hash_utils_64.c
+@@ -96,6 +96,7 @@ int mmu_vmalloc_psize = MMU_PAGE_4K;

  int mmu_io_psize = MMU_PAGE_4K;
  int mmu_kernel_ssize = MMU_SEGSIZE_256M;
  int mmu_highuser_ssize = MMU_SEGSIZE_256M;
  int mmu_io_psize = MMU_PAGE_4K;
  int mmu_kernel_ssize = MMU_SEGSIZE_256M;
  int mmu_highuser_ssize = MMU_SEGSIZE_256M;


@@ -42366,7 +42550,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/hash_utils_64.c pow
  #ifdef CONFIG_HUGETLB_PAGE
  int mmu_huge_psize = MMU_PAGE_16M;
  unsigned int HPAGE_SHIFT;
  #ifdef CONFIG_HUGETLB_PAGE
  int mmu_huge_psize = MMU_PAGE_16M;
  unsigned int HPAGE_SHIFT;

-@@ -368,18 +369,11 @@
+@@ -368,18 +369,11 @@ static void __init htab_init_page_sizes(

         * on what is available
         */
        if (mmu_psize_defs[MMU_PAGE_16M].shift)
         * on what is available
         */
        if (mmu_psize_defs[MMU_PAGE_16M].shift)


@@ -42387,9 +42571,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/hash_utils_64.c pow
  #endif /* CONFIG_HUGETLB_PAGE */
  }
  
  #endif /* CONFIG_HUGETLB_PAGE */
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/hugetlbpage.c powerpc.git/arch/powerpc/mm/hugetlbpage.c
---- linux-2.6.24/arch/powerpc/mm/hugetlbpage.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/mm/hugetlbpage.c  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/mm/hugetlbpage.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/mm/hugetlbpage.c
++++ linux-2.6.24.7/arch/powerpc/mm/hugetlbpage.c

 @@ -24,18 +24,17 @@
  #include <asm/cputable.h>
  #include <asm/spu.h>
 @@ -24,18 +24,17 @@
  #include <asm/cputable.h>
  #include <asm/spu.h>


@@ -42416,7 +42601,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/hugetlbpage.c power
  #define HUGEPD_SIZE           (1UL << HUGEPD_SHIFT)
  #define HUGEPD_MASK           (~(HUGEPD_SIZE-1))
  
  #define HUGEPD_SIZE           (1UL << HUGEPD_SHIFT)
  #define HUGEPD_MASK           (~(HUGEPD_SIZE-1))
  

-@@ -82,11 +81,35 @@
+@@ -82,11 +81,35 @@ static int __hugepte_alloc(struct mm_str

        return 0;
  }
  
        return 0;
  }
  


@@ -42452,7 +42637,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/hugetlbpage.c power
  
        BUG_ON(get_slice_psize(mm, addr) != mmu_huge_psize);
  
  
        BUG_ON(get_slice_psize(mm, addr) != mmu_huge_psize);
  

-@@ -96,14 +119,9 @@
+@@ -96,14 +119,9 @@ pte_t *huge_pte_offset(struct mm_struct 

        if (!pgd_none(*pg)) {
                pu = pud_offset(pg, addr);
                if (!pud_none(*pu)) {
        if (!pgd_none(*pg)) {
                pu = pud_offset(pg, addr);
                if (!pud_none(*pu)) {


@@ -42468,7 +42653,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/hugetlbpage.c power
                }
        }
  
                }
        }
  

-@@ -114,6 +132,7 @@
+@@ -114,6 +132,7 @@ pte_t *huge_pte_alloc(struct mm_struct *

  {
        pgd_t *pg;
        pud_t *pu;
  {
        pgd_t *pg;
        pud_t *pu;


@@ -42476,7 +42661,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/hugetlbpage.c power
        hugepd_t *hpdp = NULL;
  
        BUG_ON(get_slice_psize(mm, addr) != mmu_huge_psize);
        hugepd_t *hpdp = NULL;
  
        BUG_ON(get_slice_psize(mm, addr) != mmu_huge_psize);

-@@ -124,14 +143,9 @@
+@@ -124,14 +143,9 @@ pte_t *huge_pte_alloc(struct mm_struct *

        pu = pud_alloc(mm, pg, addr);
  
        if (pu) {
        pu = pud_alloc(mm, pg, addr);
  
        if (pu) {


@@ -42492,7 +42677,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/hugetlbpage.c power
        }
  
        if (! hpdp)
        }
  
        if (! hpdp)

-@@ -158,7 +172,6 @@
+@@ -158,7 +172,6 @@ static void free_hugepte_range(struct mm

                                                 PGF_CACHENUM_MASK));
  }
  
                                                 PGF_CACHENUM_MASK));
  }
  


@@ -42500,7 +42685,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/hugetlbpage.c power
  static void hugetlb_free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
                                   unsigned long addr, unsigned long end,
                                   unsigned long floor, unsigned long ceiling)
  static void hugetlb_free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
                                   unsigned long addr, unsigned long end,
                                   unsigned long floor, unsigned long ceiling)

-@@ -191,7 +204,6 @@
+@@ -191,7 +204,6 @@ static void hugetlb_free_pmd_range(struc

        pud_clear(pud);
        pmd_free_tlb(tlb, pmd);
  }
        pud_clear(pud);
        pmd_free_tlb(tlb, pmd);
  }


@@ -42508,7 +42693,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/hugetlbpage.c power
  
  static void hugetlb_free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
                                   unsigned long addr, unsigned long end,
  
  static void hugetlb_free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
                                   unsigned long addr, unsigned long end,

-@@ -210,9 +222,15 @@
+@@ -210,9 +222,15 @@ static void hugetlb_free_pud_range(struc

                        continue;
                hugetlb_free_pmd_range(tlb, pud, addr, next, floor, ceiling);
  #else
                        continue;
                hugetlb_free_pmd_range(tlb, pud, addr, next, floor, ceiling);
  #else


@@ -42527,7 +42712,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/hugetlbpage.c power
  #endif
        } while (pud++, addr = next, addr != end);
  
  #endif
        } while (pud++, addr = next, addr != end);
  

-@@ -526,6 +544,57 @@
+@@ -526,6 +544,57 @@ repeat:

        return err;
  }
  
        return err;
  }
  


@@ -42585,10 +42770,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/hugetlbpage.c power
  static void zero_ctor(struct kmem_cache *cache, void *addr)
  {
        memset(addr, 0, kmem_cache_size(cache));
  static void zero_ctor(struct kmem_cache *cache, void *addr)
  {
        memset(addr, 0, kmem_cache_size(cache));

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/lmb.c powerpc.git/arch/powerpc/mm/lmb.c
---- linux-2.6.24/arch/powerpc/mm/lmb.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/mm/lmb.c  2008-01-28 20:25:49.000000000 +0100
-@@ -342,3 +342,16 @@
+Index: linux-2.6.24.7/arch/powerpc/mm/lmb.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/mm/lmb.c
++++ linux-2.6.24.7/arch/powerpc/mm/lmb.c
+@@ -342,3 +342,16 @@ void __init lmb_enforce_memory_limit(uns

                }
        }
  }
                }
        }
  }


@@ -42605,10 +42791,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/lmb.c powerpc.git/a
 +      }
 +      return 0;
 +}
 +      }
 +      return 0;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/mem.c powerpc.git/arch/powerpc/mm/mem.c
---- linux-2.6.24/arch/powerpc/mm/mem.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/mm/mem.c  2008-01-28 20:25:49.000000000 +0100
-@@ -213,15 +213,30 @@
+Index: linux-2.6.24.7/arch/powerpc/mm/mem.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/mm/mem.c
++++ linux-2.6.24.7/arch/powerpc/mm/mem.c
+@@ -213,15 +213,30 @@ void __init do_init_bootmem(void)

         */
  #ifdef CONFIG_HIGHMEM
        free_bootmem_with_active_regions(0, total_lowmem >> PAGE_SHIFT);
         */
  #ifdef CONFIG_HIGHMEM
        free_bootmem_with_active_regions(0, total_lowmem >> PAGE_SHIFT);


@@ -42640,7 +42827,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/mem.c powerpc.git/a
        /* XXX need to clip this if using highmem? */
        sparse_memory_present_with_active_regions(0);
  
        /* XXX need to clip this if using highmem? */
        sparse_memory_present_with_active_regions(0);
  

-@@ -334,11 +349,13 @@
+@@ -334,11 +349,13 @@ void __init mem_init(void)

                highmem_mapnr = total_lowmem >> PAGE_SHIFT;
                for (pfn = highmem_mapnr; pfn < max_mapnr; ++pfn) {
                        struct page *page = pfn_to_page(pfn);
                highmem_mapnr = total_lowmem >> PAGE_SHIFT;
                for (pfn = highmem_mapnr; pfn < max_mapnr; ++pfn) {
                        struct page *page = pfn_to_page(pfn);


@@ -42655,10 +42842,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/mem.c powerpc.git/a
                }
                totalram_pages += totalhigh_pages;
                printk(KERN_DEBUG "High memory: %luk\n",
                }
                totalram_pages += totalhigh_pages;
                printk(KERN_DEBUG "High memory: %luk\n",

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/slb.c powerpc.git/arch/powerpc/mm/slb.c
---- linux-2.6.24/arch/powerpc/mm/slb.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/mm/slb.c  2008-01-28 20:25:49.000000000 +0100
-@@ -256,6 +256,7 @@
+Index: linux-2.6.24.7/arch/powerpc/mm/slb.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/mm/slb.c
++++ linux-2.6.24.7/arch/powerpc/mm/slb.c
+@@ -256,6 +256,7 @@ void slb_initialize(void)

        static int slb_encoding_inited;
        extern unsigned int *slb_miss_kernel_load_linear;
        extern unsigned int *slb_miss_kernel_load_io;
        static int slb_encoding_inited;
        extern unsigned int *slb_miss_kernel_load_linear;
        extern unsigned int *slb_miss_kernel_load_io;


@@ -42666,7 +42854,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/slb.c powerpc.git/a
  
        /* Prepare our SLB miss handler based on our page size */
        linear_llp = mmu_psize_defs[mmu_linear_psize].sllp;
  
        /* Prepare our SLB miss handler based on our page size */
        linear_llp = mmu_psize_defs[mmu_linear_psize].sllp;

-@@ -269,6 +270,8 @@
+@@ -269,6 +270,8 @@ void slb_initialize(void)

                                   SLB_VSID_KERNEL | linear_llp);
                patch_slb_encoding(slb_miss_kernel_load_io,
                                   SLB_VSID_KERNEL | io_llp);
                                   SLB_VSID_KERNEL | linear_llp);
                patch_slb_encoding(slb_miss_kernel_load_io,
                                   SLB_VSID_KERNEL | io_llp);


@@ -42675,10 +42863,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/slb.c powerpc.git/a
  
                DBG("SLB: linear  LLP = %04x\n", linear_llp);
                DBG("SLB: io      LLP = %04x\n", io_llp);
  
                DBG("SLB: linear  LLP = %04x\n", linear_llp);
                DBG("SLB: io      LLP = %04x\n", io_llp);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/slb_low.S powerpc.git/arch/powerpc/mm/slb_low.S
---- linux-2.6.24/arch/powerpc/mm/slb_low.S     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/mm/slb_low.S      2008-01-28 20:25:49.000000000 +0100
-@@ -227,8 +227,9 @@
+Index: linux-2.6.24.7/arch/powerpc/mm/slb_low.S
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/mm/slb_low.S
++++ linux-2.6.24.7/arch/powerpc/mm/slb_low.S
+@@ -227,8 +227,9 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISER

  
  7:    ld      r10,PACASTABRR(r13)
        addi    r10,r10,1
  
  7:    ld      r10,PACASTABRR(r13)
        addi    r10,r10,1


@@ -42690,10 +42879,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/slb_low.S powerpc.g
  
        blt+    4f
        li      r10,SLB_NUM_BOLTED
  
        blt+    4f
        li      r10,SLB_NUM_BOLTED

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/oprofile/op_model_cell.c powerpc.git/arch/powerpc/oprofile/op_model_cell.c
---- linux-2.6.24/arch/powerpc/oprofile/op_model_cell.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/oprofile/op_model_cell.c  2008-01-28 20:25:49.000000000 +0100
-@@ -61,7 +61,7 @@
+Index: linux-2.6.24.7/arch/powerpc/oprofile/op_model_cell.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/oprofile/op_model_cell.c
++++ linux-2.6.24.7/arch/powerpc/oprofile/op_model_cell.c
+@@ -61,7 +61,7 @@ static unsigned int spu_cycle_reset;

  #define NUM_THREADS 2         /* number of physical threads in
                               * physical processor
                               */
  #define NUM_THREADS 2         /* number of physical threads in
                               * physical processor
                               */


@@ -42702,7 +42892,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/oprofile/op_model_cell
  #define NUM_INPUT_BUS_WORDS 2
  
  #define MAX_SPU_COUNT 0xFFFFFF        /* maximum 24 bit LFSR value */
  #define NUM_INPUT_BUS_WORDS 2
  
  #define MAX_SPU_COUNT 0xFFFFFF        /* maximum 24 bit LFSR value */

-@@ -169,7 +169,6 @@
+@@ -169,7 +169,6 @@ static DEFINE_SPINLOCK(virt_cntr_lock);

  
  static u32 ctr_enabled;
  
  
  static u32 ctr_enabled;
  


@@ -42710,7 +42900,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/oprofile/op_model_cell
  static unsigned char input_bus[NUM_INPUT_BUS_WORDS];
  
  /*
  static unsigned char input_bus[NUM_INPUT_BUS_WORDS];
  
  /*

-@@ -298,7 +297,7 @@
+@@ -298,7 +297,7 @@ static void set_pm_event(u32 ctr, int ev

  
        p->signal_group = event / 100;
        p->bus_word = bus_word;
  
        p->signal_group = event / 100;
        p->bus_word = bus_word;


@@ -42719,7 +42909,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/oprofile/op_model_cell
  
        pm_regs.pm07_cntrl[ctr] = 0;
        pm_regs.pm07_cntrl[ctr] |= PM07_CTR_COUNT_CYCLES(count_cycles);
  
        pm_regs.pm07_cntrl[ctr] = 0;
        pm_regs.pm07_cntrl[ctr] |= PM07_CTR_COUNT_CYCLES(count_cycles);

-@@ -334,16 +333,16 @@
+@@ -334,16 +333,16 @@ static void set_pm_event(u32 ctr, int ev

                p->bit = signal_bit;
        }
  
                p->bit = signal_bit;
        }
  


@@ -42739,7 +42929,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/oprofile/op_model_cell
  
                                        break;
                                }
  
                                        break;
                                }

-@@ -450,6 +449,12 @@
+@@ -450,6 +449,12 @@ static void cell_virtual_cntr(unsigned l

        hdw_thread = 1 ^ hdw_thread;
        next_hdw_thread = hdw_thread;
  
        hdw_thread = 1 ^ hdw_thread;
        next_hdw_thread = hdw_thread;
  


@@ -42752,7 +42942,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/oprofile/op_model_cell
        /*
         * There are some per thread events.  Must do the
         * set event, for the thread that is being started
        /*
         * There are some per thread events.  Must do the
         * set event, for the thread that is being started

-@@ -619,9 +624,6 @@
+@@ -619,9 +624,6 @@ static int cell_reg_setup(struct op_coun

                pmc_cntrl[1][i].vcntr = i;
        }
  
                pmc_cntrl[1][i].vcntr = i;
        }
  


@@ -42762,9 +42952,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/oprofile/op_model_cell
        for (i = 0; i < NUM_INPUT_BUS_WORDS; i++)
                input_bus[i] = 0xff;
  
        for (i = 0; i < NUM_INPUT_BUS_WORDS; i++)
                input_bus[i] = 0xff;
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/Kconfig powerpc.git/arch/powerpc/platforms/40x/Kconfig
---- linux-2.6.24/arch/powerpc/platforms/40x/Kconfig    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/40x/Kconfig     2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/40x/Kconfig
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/40x/Kconfig
++++ linux-2.6.24.7/arch/powerpc/platforms/40x/Kconfig

 @@ -14,28 +14,34 @@
  #     help
  #       This option enables support for the CPCI405 board.
 @@ -14,28 +14,34 @@
  #     help
  #       This option enables support for the CPCI405 board.


@@ -42814,7 +43005,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/Kconfig
  #config REDWOOD_5
  #     bool "Redwood-5"
  #     depends on 40x
  #config REDWOOD_5
  #     bool "Redwood-5"
  #     depends on 40x

-@@ -65,6 +71,7 @@
+@@ -65,6 +71,7 @@ config WALNUT

        depends on 40x
        default y
        select 405GP
        depends on 40x
        default y
        select 405GP


@@ -42822,7 +43013,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/Kconfig
        help
          This option enables support for the IBM PPC405GP evaluation board.
  
        help
          This option enables support for the IBM PPC405GP evaluation board.
  

-@@ -105,6 +112,11 @@
+@@ -105,6 +112,11 @@ config 405GP

  config 405EP
        bool
  
  config 405EP
        bool
  


@@ -42834,18 +43025,20 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/Kconfig
  config 405GPR
        bool
  
  config 405GPR
        bool
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/Makefile powerpc.git/arch/powerpc/platforms/40x/Makefile
---- linux-2.6.24/arch/powerpc/platforms/40x/Makefile   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/40x/Makefile    2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/40x/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/40x/Makefile
++++ linux-2.6.24.7/arch/powerpc/platforms/40x/Makefile

 @@ -1,3 +1,5 @@
  obj-$(CONFIG_KILAUEA)                         += kilauea.o
 +obj-$(CONFIG_MAKALU)                          += makalu.o
  obj-$(CONFIG_WALNUT)                          += walnut.o
  obj-$(CONFIG_XILINX_VIRTEX_GENERIC_BOARD)     += virtex.o
 +obj-$(CONFIG_EP405)                           += ep405.o
 @@ -1,3 +1,5 @@
  obj-$(CONFIG_KILAUEA)                         += kilauea.o
 +obj-$(CONFIG_MAKALU)                          += makalu.o
  obj-$(CONFIG_WALNUT)                          += walnut.o
  obj-$(CONFIG_XILINX_VIRTEX_GENERIC_BOARD)     += virtex.o
 +obj-$(CONFIG_EP405)                           += ep405.o

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/ep405.c powerpc.git/arch/powerpc/platforms/40x/ep405.c
---- linux-2.6.24/arch/powerpc/platforms/40x/ep405.c    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/40x/ep405.c     2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/40x/ep405.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/platforms/40x/ep405.c

 @@ -0,0 +1,123 @@
 +/*
 + * Architecture- / platform-specific boot-time initialization code for
 @@ -0,0 +1,123 @@
 +/*
 + * Architecture- / platform-specific boot-time initialization code for


@@ -42970,9 +43163,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/ep405.c
 +      .get_irq                = uic_get_irq,
 +      .calibrate_decr         = generic_calibrate_decr,
 +};
 +      .get_irq                = uic_get_irq,
 +      .calibrate_decr         = generic_calibrate_decr,
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/kilauea.c powerpc.git/arch/powerpc/platforms/40x/kilauea.c
---- linux-2.6.24/arch/powerpc/platforms/40x/kilauea.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/40x/kilauea.c   2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/40x/kilauea.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/40x/kilauea.c
++++ linux-2.6.24.7/arch/powerpc/platforms/40x/kilauea.c

 @@ -19,8 +19,9 @@
  #include <asm/udbg.h>
  #include <asm/time.h>
 @@ -19,8 +19,9 @@
  #include <asm/udbg.h>
  #include <asm/time.h>


@@ -42984,7 +43178,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/kilauea.
        { .compatible = "ibm,plb4", },
        { .compatible = "ibm,opb", },
        { .compatible = "ibm,ebc", },
        { .compatible = "ibm,plb4", },
        { .compatible = "ibm,opb", },
        { .compatible = "ibm,ebc", },

-@@ -29,14 +30,11 @@
+@@ -29,14 +30,11 @@ static struct of_device_id kilauea_of_bu

  
  static int __init kilauea_device_probe(void)
  {
  
  static int __init kilauea_device_probe(void)
  {


@@ -43000,7 +43194,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/kilauea.
  
  static int __init kilauea_probe(void)
  {
  
  static int __init kilauea_probe(void)
  {

-@@ -45,6 +43,8 @@
+@@ -45,6 +43,8 @@ static int __init kilauea_probe(void)

        if (!of_flat_dt_is_compatible(root, "amcc,kilauea"))
                return 0;
  
        if (!of_flat_dt_is_compatible(root, "amcc,kilauea"))
                return 0;
  


@@ -43009,9 +43203,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/kilauea.
        return 1;
  }
  
        return 1;
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/makalu.c powerpc.git/arch/powerpc/platforms/40x/makalu.c
---- linux-2.6.24/arch/powerpc/platforms/40x/makalu.c   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/40x/makalu.c    2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/40x/makalu.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/platforms/40x/makalu.c

 @@ -0,0 +1,58 @@
 +/*
 + * Makalu board specific routines
 @@ -0,0 +1,58 @@
 +/*
 + * Makalu board specific routines


@@ -43071,9 +43266,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/makalu.c
 +      .get_irq                        = uic_get_irq,
 +      .calibrate_decr                 = generic_calibrate_decr,
 +};
 +      .get_irq                        = uic_get_irq,
 +      .calibrate_decr                 = generic_calibrate_decr,
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/virtex.c powerpc.git/arch/powerpc/platforms/40x/virtex.c
---- linux-2.6.24/arch/powerpc/platforms/40x/virtex.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/40x/virtex.c    2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/40x/virtex.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/40x/virtex.c
++++ linux-2.6.24.7/arch/powerpc/platforms/40x/virtex.c

 @@ -15,16 +15,23 @@
  #include <asm/time.h>
  #include <asm/xilinx_intc.h>
 @@ -15,16 +15,23 @@
  #include <asm/time.h>
  #include <asm/xilinx_intc.h>


@@ -43103,9 +43299,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/virtex.c
  
  static int __init virtex_probe(void)
  {
  
  static int __init virtex_probe(void)
  {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/walnut.c powerpc.git/arch/powerpc/platforms/40x/walnut.c
---- linux-2.6.24/arch/powerpc/platforms/40x/walnut.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/40x/walnut.c    2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/40x/walnut.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/40x/walnut.c
++++ linux-2.6.24.7/arch/powerpc/platforms/40x/walnut.c

 @@ -24,8 +24,9 @@
  #include <asm/udbg.h>
  #include <asm/time.h>
 @@ -24,8 +24,9 @@
  #include <asm/udbg.h>
  #include <asm/time.h>


@@ -43117,7 +43314,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/walnut.c
        { .compatible = "ibm,plb3", },
        { .compatible = "ibm,opb", },
        { .compatible = "ibm,ebc", },
        { .compatible = "ibm,plb3", },
        { .compatible = "ibm,opb", },
        { .compatible = "ibm,ebc", },

-@@ -34,15 +35,12 @@
+@@ -34,15 +35,12 @@ static struct of_device_id walnut_of_bus

  
  static int __init walnut_device_probe(void)
  {
  
  static int __init walnut_device_probe(void)
  {


@@ -43135,7 +43332,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/walnut.c
  
  static int __init walnut_probe(void)
  {
  
  static int __init walnut_probe(void)
  {

-@@ -51,6 +49,8 @@
+@@ -51,6 +49,8 @@ static int __init walnut_probe(void)

        if (!of_flat_dt_is_compatible(root, "ibm,walnut"))
                return 0;
  
        if (!of_flat_dt_is_compatible(root, "ibm,walnut"))
                return 0;
  


@@ -43144,10 +43341,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/walnut.c
        return 1;
  }
  
        return 1;
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/Kconfig powerpc.git/arch/powerpc/platforms/44x/Kconfig
---- linux-2.6.24/arch/powerpc/platforms/44x/Kconfig    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/44x/Kconfig     2008-01-28 20:25:49.000000000 +0100
-@@ -3,6 +3,7 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/44x/Kconfig
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/44x/Kconfig
++++ linux-2.6.24.7/arch/powerpc/platforms/44x/Kconfig
+@@ -3,6 +3,7 @@ config BAMBOO

        depends on 44x
        default n
        select 440EP
        depends on 44x
        default n
        select 440EP


@@ -43155,7 +43353,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/Kconfig
        help
          This option enables support for the IBM PPC440EP evaluation board.
  
        help
          This option enables support for the IBM PPC440EP evaluation board.
  

-@@ -11,6 +12,8 @@
+@@ -11,6 +12,8 @@ config EBONY

        depends on 44x
        default y
        select 440GP
        depends on 44x
        default y
        select 440GP


@@ -43164,7 +43362,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/Kconfig
        help
          This option enables support for the IBM PPC440GP evaluation board.
  
        help
          This option enables support for the IBM PPC440GP evaluation board.
  

-@@ -22,6 +25,48 @@
+@@ -22,6 +25,48 @@ config SEQUOIA

        help
          This option enables support for the AMCC PPC440EPX evaluation board.
  
        help
          This option enables support for the AMCC PPC440EPX evaluation board.
  


@@ -43213,7 +43411,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/Kconfig
  #config LUAN
  #     bool "Luan"
  #     depends on 44x
  #config LUAN
  #     bool "Luan"
  #     depends on 44x

-@@ -44,6 +89,7 @@
+@@ -44,6 +89,7 @@ config 440EP

        select PPC_FPU
        select IBM440EP_ERR42
        select IBM_NEW_EMAC_ZMII
        select PPC_FPU
        select IBM440EP_ERR42
        select IBM_NEW_EMAC_ZMII


@@ -43221,7 +43419,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/Kconfig
  
  config 440EPX
        bool
  
  config 440EPX
        bool

-@@ -52,20 +98,29 @@
+@@ -52,20 +98,29 @@ config 440EPX

        select IBM_NEW_EMAC_RGMII
        select IBM_NEW_EMAC_ZMII
  
        select IBM_NEW_EMAC_RGMII
        select IBM_NEW_EMAC_ZMII
  


@@ -43254,9 +43452,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/Kconfig
  
  # 44x errata/workaround config symbols, selected by the CPU models above
  config IBM440EP_ERR42
  
  # 44x errata/workaround config symbols, selected by the CPU models above
  config IBM440EP_ERR42

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/Makefile powerpc.git/arch/powerpc/platforms/44x/Makefile
---- linux-2.6.24/arch/powerpc/platforms/44x/Makefile   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/44x/Makefile    2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/44x/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/44x/Makefile
++++ linux-2.6.24.7/arch/powerpc/platforms/44x/Makefile

 @@ -1,4 +1,9 @@
  obj-$(CONFIG_44x)     := misc_44x.o
  obj-$(CONFIG_EBONY)   += ebony.o
 @@ -1,4 +1,9 @@
  obj-$(CONFIG_44x)     := misc_44x.o
  obj-$(CONFIG_EBONY)   += ebony.o


@@ -43268,9 +43467,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/Makefile
 +obj-$(CONFIG_RAINIER) += rainier.o
 +obj-$(CONFIG_WARP)    += warp.o
 +obj-$(CONFIG_WARP)    += warp-nand.o
 +obj-$(CONFIG_RAINIER) += rainier.o
 +obj-$(CONFIG_WARP)    += warp.o
 +obj-$(CONFIG_WARP)    += warp-nand.o

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/bamboo.c powerpc.git/arch/powerpc/platforms/44x/bamboo.c
---- linux-2.6.24/arch/powerpc/platforms/44x/bamboo.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/44x/bamboo.c    2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/44x/bamboo.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/44x/bamboo.c
++++ linux-2.6.24.7/arch/powerpc/platforms/44x/bamboo.c

 @@ -21,9 +21,11 @@
  #include <asm/udbg.h>
  #include <asm/time.h>
 @@ -21,9 +21,11 @@
  #include <asm/udbg.h>
  #include <asm/time.h>


@@ -43284,7 +43484,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/bamboo.c
        { .compatible = "ibm,plb4", },
        { .compatible = "ibm,opb", },
        { .compatible = "ibm,ebc", },
        { .compatible = "ibm,plb4", },
        { .compatible = "ibm,opb", },
        { .compatible = "ibm,ebc", },

-@@ -32,14 +34,11 @@
+@@ -32,14 +34,11 @@ static struct of_device_id bamboo_of_bus

  
  static int __init bamboo_device_probe(void)
  {
  
  static int __init bamboo_device_probe(void)
  {


@@ -43300,7 +43500,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/bamboo.c
  
  static int __init bamboo_probe(void)
  {
  
  static int __init bamboo_probe(void)
  {

-@@ -48,6 +47,8 @@
+@@ -48,6 +47,8 @@ static int __init bamboo_probe(void)

        if (!of_flat_dt_is_compatible(root, "amcc,bamboo"))
                return 0;
  
        if (!of_flat_dt_is_compatible(root, "amcc,bamboo"))
                return 0;
  


@@ -43309,9 +43509,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/bamboo.c
        return 1;
  }
  
        return 1;
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/ebony.c powerpc.git/arch/powerpc/platforms/44x/ebony.c
---- linux-2.6.24/arch/powerpc/platforms/44x/ebony.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/44x/ebony.c     2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/44x/ebony.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/44x/ebony.c
++++ linux-2.6.24.7/arch/powerpc/platforms/44x/ebony.c

 @@ -18,16 +18,18 @@
  
  #include <linux/init.h>
 @@ -18,16 +18,18 @@
  
  #include <linux/init.h>


@@ -43332,7 +43533,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/ebony.c
        { .compatible = "ibm,plb4", },
        { .compatible = "ibm,opb", },
        { .compatible = "ibm,ebc", },
        { .compatible = "ibm,plb4", },
        { .compatible = "ibm,opb", },
        { .compatible = "ibm,ebc", },

-@@ -36,14 +38,12 @@
+@@ -36,14 +38,12 @@ static struct of_device_id ebony_of_bus[

  
  static int __init ebony_device_probe(void)
  {
  
  static int __init ebony_device_probe(void)
  {


@@ -43349,7 +43550,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/ebony.c
  
  /*
   * Called very early, MMU is off, device-tree isn't unflattened
  
  /*
   * Called very early, MMU is off, device-tree isn't unflattened

-@@ -55,6 +55,8 @@
+@@ -55,6 +55,8 @@ static int __init ebony_probe(void)

        if (!of_flat_dt_is_compatible(root, "ibm,ebony"))
                return 0;
  
        if (!of_flat_dt_is_compatible(root, "ibm,ebony"))
                return 0;
  


@@ -43358,9 +43559,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/ebony.c
        return 1;
  }
  
        return 1;
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/katmai.c powerpc.git/arch/powerpc/platforms/44x/katmai.c
---- linux-2.6.24/arch/powerpc/platforms/44x/katmai.c   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/44x/katmai.c    2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/44x/katmai.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/platforms/44x/katmai.c

 @@ -0,0 +1,63 @@
 +/*
 + * Katmai board specific routines
 @@ -0,0 +1,63 @@
 +/*
 + * Katmai board specific routines


@@ -43425,9 +43627,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/katmai.c
 +      .restart                        = ppc44x_reset_system,
 +      .calibrate_decr                 = generic_calibrate_decr,
 +};
 +      .restart                        = ppc44x_reset_system,
 +      .calibrate_decr                 = generic_calibrate_decr,
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/rainier.c powerpc.git/arch/powerpc/platforms/44x/rainier.c
---- linux-2.6.24/arch/powerpc/platforms/44x/rainier.c  1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/44x/rainier.c   2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/44x/rainier.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/platforms/44x/rainier.c

 @@ -0,0 +1,62 @@
 +/*
 + * Rainier board specific routines
 @@ -0,0 +1,62 @@
 +/*
 + * Rainier board specific routines


@@ -43491,9 +43694,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/rainier.
 +      .restart                        = ppc44x_reset_system,
 +      .calibrate_decr                 = generic_calibrate_decr,
 +};
 +      .restart                        = ppc44x_reset_system,
 +      .calibrate_decr                 = generic_calibrate_decr,
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/sequoia.c powerpc.git/arch/powerpc/platforms/44x/sequoia.c
---- linux-2.6.24/arch/powerpc/platforms/44x/sequoia.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/44x/sequoia.c   2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/44x/sequoia.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/44x/sequoia.c
++++ linux-2.6.24.7/arch/powerpc/platforms/44x/sequoia.c

 @@ -21,9 +21,11 @@
  #include <asm/udbg.h>
  #include <asm/time.h>
 @@ -21,9 +21,11 @@
  #include <asm/udbg.h>
  #include <asm/time.h>


@@ -43507,7 +43711,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/sequoia.
        { .compatible = "ibm,plb4", },
        { .compatible = "ibm,opb", },
        { .compatible = "ibm,ebc", },
        { .compatible = "ibm,plb4", },
        { .compatible = "ibm,opb", },
        { .compatible = "ibm,ebc", },

-@@ -32,14 +34,11 @@
+@@ -32,14 +34,11 @@ static struct of_device_id sequoia_of_bu

  
  static int __init sequoia_device_probe(void)
  {
  
  static int __init sequoia_device_probe(void)
  {


@@ -43523,7 +43727,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/sequoia.
  
  static int __init sequoia_probe(void)
  {
  
  static int __init sequoia_probe(void)
  {

-@@ -48,6 +47,8 @@
+@@ -48,6 +47,8 @@ static int __init sequoia_probe(void)

        if (!of_flat_dt_is_compatible(root, "amcc,sequoia"))
                return 0;
  
        if (!of_flat_dt_is_compatible(root, "amcc,sequoia"))
                return 0;
  


@@ -43532,9 +43736,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/sequoia.
        return 1;
  }
  
        return 1;
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/taishan.c powerpc.git/arch/powerpc/platforms/44x/taishan.c
---- linux-2.6.24/arch/powerpc/platforms/44x/taishan.c  1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/44x/taishan.c   2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/44x/taishan.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/platforms/44x/taishan.c

 @@ -0,0 +1,73 @@
 +/*
 + * Taishan board specific routines based off ebony.c code
 @@ -0,0 +1,73 @@
 +/*
 + * Taishan board specific routines based off ebony.c code


@@ -43609,9 +43814,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/taishan.
 +      .restart                = ppc44x_reset_system,
 +      .calibrate_decr         = generic_calibrate_decr,
 +};
 +      .restart                = ppc44x_reset_system,
 +      .calibrate_decr         = generic_calibrate_decr,
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/warp-nand.c powerpc.git/arch/powerpc/platforms/44x/warp-nand.c
---- linux-2.6.24/arch/powerpc/platforms/44x/warp-nand.c        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/44x/warp-nand.c 2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/44x/warp-nand.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/platforms/44x/warp-nand.c

 @@ -0,0 +1,105 @@
 +/*
 + * PIKA Warp(tm) NAND flash specific routines
 @@ -0,0 +1,105 @@
 +/*
 + * PIKA Warp(tm) NAND flash specific routines


@@ -43718,9 +43924,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/warp-nan
 +device_initcall(warp_setup_nand_flash);
 +
 +#endif
 +device_initcall(warp_setup_nand_flash);
 +
 +#endif

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/warp.c powerpc.git/arch/powerpc/platforms/44x/warp.c
---- linux-2.6.24/arch/powerpc/platforms/44x/warp.c     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/44x/warp.c      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/44x/warp.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/platforms/44x/warp.c

 @@ -0,0 +1,153 @@
 +/*
 + * PIKA Warp(tm) board specific routines
 @@ -0,0 +1,153 @@
 +/*
 + * PIKA Warp(tm) board specific routines


@@ -43875,10 +44082,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/warp.c p
 +}
 +device_initcall(pika_dtm_start);
 +#endif
 +}
 +device_initcall(pika_dtm_start);
 +#endif

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/Kconfig powerpc.git/arch/powerpc/platforms/52xx/Kconfig
---- linux-2.6.24/arch/powerpc/platforms/52xx/Kconfig   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/52xx/Kconfig    2008-01-28 20:25:49.000000000 +0100
-@@ -19,6 +19,28 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/52xx/Kconfig
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/52xx/Kconfig
++++ linux-2.6.24.7/arch/powerpc/platforms/52xx/Kconfig
+@@ -19,6 +19,28 @@ config PPC_MPC5200_BUGFIX

  
          It is safe to say 'Y' here
  
  
          It is safe to say 'Y' here
  


@@ -43907,7 +44115,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/Kconfig
  config PPC_EFIKA
        bool "bPlan Efika 5k2. MPC5200B based computer"
        depends on PPC_MULTIPLATFORM && PPC32
  config PPC_EFIKA
        bool "bPlan Efika 5k2. MPC5200B based computer"
        depends on PPC_MULTIPLATFORM && PPC32

-@@ -31,8 +53,7 @@
+@@ -31,8 +53,7 @@ config PPC_EFIKA

  config PPC_LITE5200
        bool "Freescale Lite5200 Eval Board"
        depends on PPC_MULTIPLATFORM && PPC32
  config PPC_LITE5200
        bool "Freescale Lite5200 Eval Board"
        depends on PPC_MULTIPLATFORM && PPC32


@@ -43918,10 +44126,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/Kconfig
        default n
 -
 -
        default n
 -
 -

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/Makefile powerpc.git/arch/powerpc/platforms/52xx/Makefile
---- linux-2.6.24/arch/powerpc/platforms/52xx/Makefile  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/52xx/Makefile   2008-01-28 20:25:49.000000000 +0100
-@@ -6,6 +6,7 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/52xx/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/52xx/Makefile
++++ linux-2.6.24.7/arch/powerpc/platforms/52xx/Makefile
+@@ -6,6 +6,7 @@ obj-y                          += mpc52xx_pic.o mpc52xx_common

  obj-$(CONFIG_PCI)             += mpc52xx_pci.o
  endif
  
  obj-$(CONFIG_PCI)             += mpc52xx_pci.o
  endif
  


@@ -43929,9 +44138,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/Makefil
  obj-$(CONFIG_PPC_EFIKA)               += efika.o
  obj-$(CONFIG_PPC_LITE5200)    += lite5200.o
  
  obj-$(CONFIG_PPC_EFIKA)               += efika.o
  obj-$(CONFIG_PPC_LITE5200)    += lite5200.o
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/lite5200.c powerpc.git/arch/powerpc/platforms/52xx/lite5200.c
---- linux-2.6.24/arch/powerpc/platforms/52xx/lite5200.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/52xx/lite5200.c 2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/52xx/lite5200.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/52xx/lite5200.c
++++ linux-2.6.24.7/arch/powerpc/platforms/52xx/lite5200.c

 @@ -42,10 +42,13 @@
  static void __init
  lite5200_fix_clock_config(void)
 @@ -42,10 +42,13 @@
  static void __init
  lite5200_fix_clock_config(void)


@@ -43947,7 +44157,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/lite520
        if (!cdm) {
                printk(KERN_ERR "%s() failed; expect abnormal behaviour\n",
                       __FUNCTION__);
        if (!cdm) {
                printk(KERN_ERR "%s() failed; expect abnormal behaviour\n",
                       __FUNCTION__);

-@@ -74,10 +77,13 @@
+@@ -74,10 +77,13 @@ lite5200_fix_clock_config(void)

  static void __init
  lite5200_fix_port_config(void)
  {
  static void __init
  lite5200_fix_port_config(void)
  {


@@ -43962,7 +44172,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/lite520
        if (!gpio) {
                printk(KERN_ERR "%s() failed. expect abnormal behavior\n",
                       __FUNCTION__);
        if (!gpio) {
                printk(KERN_ERR "%s() failed. expect abnormal behavior\n",
                       __FUNCTION__);

-@@ -131,10 +137,6 @@
+@@ -131,10 +137,6 @@ static void lite5200_resume_finish(void 

  
  static void __init lite5200_setup_arch(void)
  {
  
  static void __init lite5200_setup_arch(void)
  {


@@ -43973,7 +44183,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/lite520
        if (ppc_md.progress)
                ppc_md.progress("lite5200_setup_arch()", 0);
  
        if (ppc_md.progress)
                ppc_md.progress("lite5200_setup_arch()", 0);
  

-@@ -154,13 +156,7 @@
+@@ -154,13 +156,7 @@ static void __init lite5200_setup_arch(v

        lite5200_pm_init();
  #endif
  
        lite5200_pm_init();
  #endif
  


@@ -43988,10 +44198,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/lite520
  }
  
  /*
  }
  
  /*

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/lite5200_pm.c powerpc.git/arch/powerpc/platforms/52xx/lite5200_pm.c
---- linux-2.6.24/arch/powerpc/platforms/52xx/lite5200_pm.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/52xx/lite5200_pm.c      2008-01-28 20:25:49.000000000 +0100
-@@ -42,6 +42,8 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/52xx/lite5200_pm.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/52xx/lite5200_pm.c
++++ linux-2.6.24.7/arch/powerpc/platforms/52xx/lite5200_pm.c
+@@ -42,6 +42,8 @@ static int lite5200_pm_set_target(suspen

  
  static int lite5200_pm_prepare(void)
  {
  
  static int lite5200_pm_prepare(void)
  {


@@ -44000,7 +44211,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/lite520
        /* deep sleep? let mpc52xx code handle that */
        if (lite5200_pm_target_state == PM_SUSPEND_STANDBY)
                return mpc52xx_pm_prepare();
        /* deep sleep? let mpc52xx code handle that */
        if (lite5200_pm_target_state == PM_SUSPEND_STANDBY)
                return mpc52xx_pm_prepare();

-@@ -50,7 +52,9 @@
+@@ -50,7 +52,9 @@ static int lite5200_pm_prepare(void)

                return -EINVAL;
  
        /* map registers */
                return -EINVAL;
  
        /* map registers */


@@ -44011,9 +44222,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/lite520
        if (!mbar) {
                printk(KERN_ERR "%s:%i Error mapping registers\n", __func__, __LINE__);
                return -ENOSYS;
        if (!mbar) {
                printk(KERN_ERR "%s:%i Error mapping registers\n", __func__, __LINE__);
                return -ENOSYS;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/mpc5200_simple.c powerpc.git/arch/powerpc/platforms/52xx/mpc5200_simple.c
---- linux-2.6.24/arch/powerpc/platforms/52xx/mpc5200_simple.c  1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/52xx/mpc5200_simple.c   2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/52xx/mpc5200_simple.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/platforms/52xx/mpc5200_simple.c

 @@ -0,0 +1,85 @@
 +/*
 + * Support for 'mpc5200-simple-platform' compatible boards.
 @@ -0,0 +1,85 @@
 +/*
 + * Support for 'mpc5200-simple-platform' compatible boards.


@@ -44100,9 +44312,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/mpc5200
 +      .restart        = mpc52xx_restart,
 +      .calibrate_decr = generic_calibrate_decr,
 +};
 +      .restart        = mpc52xx_restart,
 +      .calibrate_decr = generic_calibrate_decr,
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/mpc52xx_common.c powerpc.git/arch/powerpc/platforms/52xx/mpc52xx_common.c
---- linux-2.6.24/arch/powerpc/platforms/52xx/mpc52xx_common.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/52xx/mpc52xx_common.c   2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/52xx/mpc52xx_common.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/52xx/mpc52xx_common.c
++++ linux-2.6.24.7/arch/powerpc/platforms/52xx/mpc52xx_common.c

 @@ -26,45 +26,6 @@
   */
  static volatile struct mpc52xx_gpt *mpc52xx_wdt = NULL;
 @@ -26,45 +26,6 @@
   */
  static volatile struct mpc52xx_gpt *mpc52xx_wdt = NULL;


@@ -44149,7 +44362,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/mpc52xx
  /**
   *    mpc52xx_find_ipb_freq - Find the IPB bus frequency for a device
   *    @node:  device node
  /**
   *    mpc52xx_find_ipb_freq - Find the IPB bus frequency for a device
   *    @node:  device node

-@@ -101,9 +62,12 @@
+@@ -101,9 +62,12 @@ EXPORT_SYMBOL(mpc52xx_find_ipb_freq);

  void __init
  mpc5200_setup_xlb_arbiter(void)
  {
  void __init
  mpc5200_setup_xlb_arbiter(void)
  {


@@ -44163,7 +44376,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/mpc52xx
        if (!xlb) {
                printk(KERN_ERR __FILE__ ": "
                        "Error mapping XLB in mpc52xx_setup_cpu().  "
        if (!xlb) {
                printk(KERN_ERR __FILE__ ": "
                        "Error mapping XLB in mpc52xx_setup_cpu().  "

-@@ -124,11 +88,21 @@
+@@ -124,11 +88,21 @@ mpc5200_setup_xlb_arbiter(void)

        iounmap(xlb);
  }
  
        iounmap(xlb);
  }
  


@@ -44186,7 +44399,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/mpc52xx
                printk(KERN_ERR __FILE__ ": "
                        "Error while probing of_platform bus\n");
  }
                printk(KERN_ERR __FILE__ ": "
                        "Error while probing of_platform bus\n");
  }

-@@ -146,16 +120,19 @@
+@@ -146,16 +120,19 @@ mpc52xx_map_wdt(void)

        for_each_compatible_node(np, NULL, "fsl,mpc5200-gpt") {
                has_wdt = of_get_property(np, "fsl,has-wdt", NULL);
                if (has_wdt) {
        for_each_compatible_node(np, NULL, "fsl,mpc5200-gpt") {
                has_wdt = of_get_property(np, "fsl,has-wdt", NULL);
                if (has_wdt) {


@@ -44208,10 +44421,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/mpc52xx
        }
  }
  
        }
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/mpc52xx_pci.c powerpc.git/arch/powerpc/platforms/52xx/mpc52xx_pci.c
---- linux-2.6.24/arch/powerpc/platforms/52xx/mpc52xx_pci.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/52xx/mpc52xx_pci.c      2008-01-28 20:25:49.000000000 +0100
-@@ -363,7 +363,7 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/52xx/mpc52xx_pci.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/52xx/mpc52xx_pci.c
++++ linux-2.6.24.7/arch/powerpc/platforms/52xx/mpc52xx_pci.c
+@@ -363,7 +363,7 @@ mpc52xx_add_bridge(struct device_node *n

  
        pr_debug("Adding MPC52xx PCI host bridge %s\n", node->full_name);
  
  
        pr_debug("Adding MPC52xx PCI host bridge %s\n", node->full_name);
  


@@ -44220,7 +44434,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/mpc52xx
  
        if (of_address_to_resource(node, 0, &rsrc) != 0) {
                printk(KERN_ERR "Can't get %s resources\n", node->full_name);
  
        if (of_address_to_resource(node, 0, &rsrc) != 0) {
                printk(KERN_ERR "Can't get %s resources\n", node->full_name);

-@@ -406,3 +406,17 @@
+@@ -406,3 +406,17 @@ mpc52xx_add_bridge(struct device_node *n

  
        return 0;
  }
  
        return 0;
  }


@@ -44238,10 +44452,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/mpc52xx
 +      mpc52xx_add_bridge(pci);
 +      of_node_put(pci);
 +}
 +      mpc52xx_add_bridge(pci);
 +      of_node_put(pci);
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/mpc52xx_pic.c powerpc.git/arch/powerpc/platforms/52xx/mpc52xx_pic.c
---- linux-2.6.24/arch/powerpc/platforms/52xx/mpc52xx_pic.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/52xx/mpc52xx_pic.c      2008-01-28 20:25:49.000000000 +0100
-@@ -364,16 +364,18 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/52xx/mpc52xx_pic.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/52xx/mpc52xx_pic.c
++++ linux-2.6.24.7/arch/powerpc/platforms/52xx/mpc52xx_pic.c
+@@ -364,16 +364,18 @@ void __init mpc52xx_init_irq(void)

  {
        u32 intr_ctrl;
        struct device_node *picnode;
  {
        u32 intr_ctrl;
        struct device_node *picnode;


@@ -44263,10 +44478,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/mpc52xx
        if (!sdma)
                panic(__FILE__  ": find_and_map failed on 'mpc5200-bestcomm'. "
                                "Check node !");
        if (!sdma)
                panic(__FILE__  ": find_and_map failed on 'mpc5200-bestcomm'. "
                                "Check node !");

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/mpc52xx_pm.c powerpc.git/arch/powerpc/platforms/52xx/mpc52xx_pm.c
---- linux-2.6.24/arch/powerpc/platforms/52xx/mpc52xx_pm.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/52xx/mpc52xx_pm.c       2008-01-28 20:25:49.000000000 +0100
-@@ -59,10 +59,14 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/52xx/mpc52xx_pm.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/52xx/mpc52xx_pm.c
++++ linux-2.6.24.7/arch/powerpc/platforms/52xx/mpc52xx_pm.c
+@@ -59,10 +59,14 @@ int mpc52xx_set_wakeup_gpio(u8 pin, u8 l

  
  int mpc52xx_pm_prepare(void)
  {
  
  int mpc52xx_pm_prepare(void)
  {


@@ -44283,10 +44499,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/mpc52xx
                return -ENOSYS;
        }
        /* these offsets are from mpc5200 users manual */
                return -ENOSYS;
        }
        /* these offsets are from mpc5200 users manual */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/82xx/Kconfig powerpc.git/arch/powerpc/platforms/82xx/Kconfig
---- linux-2.6.24/arch/powerpc/platforms/82xx/Kconfig   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/82xx/Kconfig    2008-01-28 20:25:49.000000000 +0100
-@@ -26,6 +26,19 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/82xx/Kconfig
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/82xx/Kconfig
++++ linux-2.6.24.7/arch/powerpc/platforms/82xx/Kconfig
+@@ -26,6 +26,19 @@ config PQ2FADS

        help
          This option enables support for the PQ2FADS board
  
        help
          This option enables support for the PQ2FADS board
  


@@ -44306,17 +44523,19 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/82xx/Kconfig
  endchoice
  
  config PQ2ADS
  endchoice
  
  config PQ2ADS

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/82xx/Makefile powerpc.git/arch/powerpc/platforms/82xx/Makefile
---- linux-2.6.24/arch/powerpc/platforms/82xx/Makefile  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/82xx/Makefile   2008-01-28 20:25:49.000000000 +0100
-@@ -5,3 +5,4 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/82xx/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/82xx/Makefile
++++ linux-2.6.24.7/arch/powerpc/platforms/82xx/Makefile
+@@ -5,3 +5,4 @@ obj-$(CONFIG_MPC8272_ADS) += mpc8272_ads

  obj-$(CONFIG_CPM2) += pq2.o
  obj-$(CONFIG_PQ2_ADS_PCI_PIC) += pq2ads-pci-pic.o
  obj-$(CONFIG_PQ2FADS) += pq2fads.o
 +obj-$(CONFIG_EP8248E) += ep8248e.o
  obj-$(CONFIG_CPM2) += pq2.o
  obj-$(CONFIG_PQ2_ADS_PCI_PIC) += pq2ads-pci-pic.o
  obj-$(CONFIG_PQ2FADS) += pq2fads.o
 +obj-$(CONFIG_EP8248E) += ep8248e.o

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/82xx/ep8248e.c powerpc.git/arch/powerpc/platforms/82xx/ep8248e.c
---- linux-2.6.24/arch/powerpc/platforms/82xx/ep8248e.c 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/82xx/ep8248e.c  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/82xx/ep8248e.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/platforms/82xx/ep8248e.c

 @@ -0,0 +1,324 @@
 +/*
 + * Embedded Planet EP8248E support
 @@ -0,0 +1,324 @@
 +/*
 + * Embedded Planet EP8248E support


@@ -44642,10 +44861,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/82xx/ep8248e
 +      .restart = pq2_restart,
 +      .progress = udbg_progress,
 +};
 +      .restart = pq2_restart,
 +      .progress = udbg_progress,
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/82xx/pq2.c powerpc.git/arch/powerpc/platforms/82xx/pq2.c
---- linux-2.6.24/arch/powerpc/platforms/82xx/pq2.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/82xx/pq2.c      2008-01-28 20:25:49.000000000 +0100
-@@ -53,13 +53,13 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/82xx/pq2.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/82xx/pq2.c
++++ linux-2.6.24.7/arch/powerpc/platforms/82xx/pq2.c
+@@ -53,13 +53,13 @@ static void __init pq2_pci_add_bridge(st

        if (of_address_to_resource(np, 0, &r) || r.end - r.start < 0x10b)
                goto err;
  
        if (of_address_to_resource(np, 0, &r) || r.end - r.start < 0x10b)
                goto err;
  


@@ -44661,9 +44881,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/82xx/pq2.c p
  
        setup_indirect_pci(hose, r.start + 0x100, r.start + 0x104, 0);
        pci_process_bridge_OF_ranges(hose, np, 1);
  
        setup_indirect_pci(hose, r.start + 0x100, r.start + 0x104, 0);
        pci_process_bridge_OF_ranges(hose, np, 1);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/82xx/pq2fads.c powerpc.git/arch/powerpc/platforms/82xx/pq2fads.c
---- linux-2.6.24/arch/powerpc/platforms/82xx/pq2fads.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/82xx/pq2fads.c  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/82xx/pq2fads.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/82xx/pq2fads.c
++++ linux-2.6.24.7/arch/powerpc/platforms/82xx/pq2fads.c

 @@ -15,12 +15,12 @@
  #include <linux/init.h>
  #include <linux/interrupt.h>
 @@ -15,12 +15,12 @@
  #include <linux/init.h>
  #include <linux/interrupt.h>


@@ -44678,10 +44899,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/82xx/pq2fads
  #include <asm/time.h>
  
  #include <sysdev/fsl_soc.h>
  #include <asm/time.h>
  
  #include <sysdev/fsl_soc.h>

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/Kconfig powerpc.git/arch/powerpc/platforms/83xx/Kconfig
---- linux-2.6.24/arch/powerpc/platforms/83xx/Kconfig   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/83xx/Kconfig    2008-01-28 20:25:49.000000000 +0100
-@@ -50,6 +50,11 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/83xx/Kconfig
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/83xx/Kconfig
++++ linux-2.6.24.7/arch/powerpc/platforms/83xx/Kconfig
+@@ -50,6 +50,11 @@ config MPC836x_MDS

        help
          This option enables support for the MPC836x MDS Processor Board.
  
        help
          This option enables support for the MPC836x MDS Processor Board.
  


@@ -44693,7 +44915,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/Kconfig
  endchoice
  
  config PPC_MPC831x
  endchoice
  
  config PPC_MPC831x

-@@ -75,3 +80,9 @@
+@@ -75,3 +80,9 @@ config PPC_MPC836x

        select PPC_UDBG_16550
        select PPC_INDIRECT_PCI
        default y if MPC836x_MDS
        select PPC_UDBG_16550
        select PPC_INDIRECT_PCI
        default y if MPC836x_MDS


@@ -44703,17 +44925,19 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/Kconfig
 +      select PPC_UDBG_16550
 +      select PPC_INDIRECT_PCI
 +      default y if MPC837x_MDS
 +      select PPC_UDBG_16550
 +      select PPC_INDIRECT_PCI
 +      default y if MPC837x_MDS

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/Makefile powerpc.git/arch/powerpc/platforms/83xx/Makefile
---- linux-2.6.24/arch/powerpc/platforms/83xx/Makefile  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/83xx/Makefile   2008-01-28 20:25:49.000000000 +0100
-@@ -9,3 +9,4 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/83xx/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/83xx/Makefile
++++ linux-2.6.24.7/arch/powerpc/platforms/83xx/Makefile
+@@ -9,3 +9,4 @@ obj-$(CONFIG_MPC834x_MDS)      += mpc834x_mds

  obj-$(CONFIG_MPC834x_ITX)     += mpc834x_itx.o
  obj-$(CONFIG_MPC836x_MDS)     += mpc836x_mds.o
  obj-$(CONFIG_MPC832x_MDS)     += mpc832x_mds.o
 +obj-$(CONFIG_MPC837x_MDS)     += mpc837x_mds.o
  obj-$(CONFIG_MPC834x_ITX)     += mpc834x_itx.o
  obj-$(CONFIG_MPC836x_MDS)     += mpc836x_mds.o
  obj-$(CONFIG_MPC832x_MDS)     += mpc832x_mds.o
 +obj-$(CONFIG_MPC837x_MDS)     += mpc837x_mds.o

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc8313_rdb.c powerpc.git/arch/powerpc/platforms/83xx/mpc8313_rdb.c
---- linux-2.6.24/arch/powerpc/platforms/83xx/mpc8313_rdb.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/83xx/mpc8313_rdb.c      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/83xx/mpc8313_rdb.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/83xx/mpc8313_rdb.c
++++ linux-2.6.24.7/arch/powerpc/platforms/83xx/mpc8313_rdb.c

 @@ -14,6 +14,7 @@
   */
  
 @@ -14,6 +14,7 @@
   */
  


@@ -44722,7 +44946,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc8313
  
  #include <asm/time.h>
  #include <asm/ipic.h>
  
  #include <asm/time.h>
  #include <asm/ipic.h>

-@@ -70,11 +71,23 @@
+@@ -70,11 +71,23 @@ void __init mpc8313_rdb_init_IRQ(void)

   */
  static int __init mpc8313_rdb_probe(void)
  {
   */
  static int __init mpc8313_rdb_probe(void)
  {


@@ -44748,9 +44972,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc8313
  define_machine(mpc8313_rdb) {
        .name                   = "MPC8313 RDB",
        .probe                  = mpc8313_rdb_probe,
  define_machine(mpc8313_rdb) {
        .name                   = "MPC8313 RDB",
        .probe                  = mpc8313_rdb_probe,

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc832x_mds.c powerpc.git/arch/powerpc/platforms/83xx/mpc832x_mds.c
---- linux-2.6.24/arch/powerpc/platforms/83xx/mpc832x_mds.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/83xx/mpc832x_mds.c      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/83xx/mpc832x_mds.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/83xx/mpc832x_mds.c
++++ linux-2.6.24.7/arch/powerpc/platforms/83xx/mpc832x_mds.c

 @@ -23,9 +23,9 @@
  #include <linux/seq_file.h>
  #include <linux/root_dev.h>
 @@ -23,9 +23,9 @@
  #include <linux/seq_file.h>
  #include <linux/root_dev.h>


@@ -44763,7 +44988,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc832x
  #include <asm/system.h>
  #include <asm/atomic.h>
  #include <asm/time.h>
  #include <asm/system.h>
  #include <asm/atomic.h>
  #include <asm/time.h>

-@@ -110,15 +110,12 @@
+@@ -110,15 +110,12 @@ static struct of_device_id mpc832x_ids[]

  
  static int __init mpc832x_declare_of_platform_devices(void)
  {
  
  static int __init mpc832x_declare_of_platform_devices(void)
  {


@@ -44780,9 +45005,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc832x
  
  static void __init mpc832x_sys_init_IRQ(void)
  {
  
  static void __init mpc832x_sys_init_IRQ(void)
  {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc832x_rdb.c powerpc.git/arch/powerpc/platforms/83xx/mpc832x_rdb.c
---- linux-2.6.24/arch/powerpc/platforms/83xx/mpc832x_rdb.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/83xx/mpc832x_rdb.c      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/83xx/mpc832x_rdb.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/83xx/mpc832x_rdb.c
++++ linux-2.6.24.7/arch/powerpc/platforms/83xx/mpc832x_rdb.c

 @@ -19,8 +19,8 @@
  #include <linux/spi/spi.h>
  #include <linux/spi/mmc_spi.h>
 @@ -19,8 +19,8 @@
  #include <linux/spi/spi.h>
  #include <linux/spi/mmc_spi.h>


@@ -44793,7 +45019,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc832x
  #include <asm/time.h>
  #include <asm/ipic.h>
  #include <asm/udbg.h>
  #include <asm/time.h>
  #include <asm/ipic.h>
  #include <asm/udbg.h>

-@@ -63,9 +63,6 @@
+@@ -63,9 +63,6 @@ static struct spi_board_info mpc832x_spi

  
  static int __init mpc832x_spi_init(void)
  {
  
  static int __init mpc832x_spi_init(void)
  {


@@ -44803,7 +45029,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc832x
        par_io_config_pin(3,  0, 3, 0, 1, 0); /* SPI1 MOSI, I/O */
        par_io_config_pin(3,  1, 3, 0, 1, 0); /* SPI1 MISO, I/O */
        par_io_config_pin(3,  2, 3, 0, 1, 0); /* SPI1 CLK,  I/O */
        par_io_config_pin(3,  0, 3, 0, 1, 0); /* SPI1 MOSI, I/O */
        par_io_config_pin(3,  1, 3, 0, 1, 0); /* SPI1 MISO, I/O */
        par_io_config_pin(3,  2, 3, 0, 1, 0); /* SPI1 CLK,  I/O */

-@@ -80,7 +77,7 @@
+@@ -80,7 +77,7 @@ static int __init mpc832x_spi_init(void)

                            mpc83xx_spi_deactivate_cs);
  }
  
                            mpc83xx_spi_deactivate_cs);
  }
  


@@ -44812,7 +45038,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc832x
  
  /* ************************************************************************
   *
  
  /* ************************************************************************
   *

-@@ -123,15 +120,12 @@
+@@ -123,15 +120,12 @@ static struct of_device_id mpc832x_ids[]

  
  static int __init mpc832x_declare_of_platform_devices(void)
  {
  
  static int __init mpc832x_declare_of_platform_devices(void)
  {


@@ -44829,9 +45055,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc832x
  
  void __init mpc832x_rdb_init_IRQ(void)
  {
  
  void __init mpc832x_rdb_init_IRQ(void)
  {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc834x_itx.c powerpc.git/arch/powerpc/platforms/83xx/mpc834x_itx.c
---- linux-2.6.24/arch/powerpc/platforms/83xx/mpc834x_itx.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/83xx/mpc834x_itx.c      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/83xx/mpc834x_itx.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/83xx/mpc834x_itx.c
++++ linux-2.6.24.7/arch/powerpc/platforms/83xx/mpc834x_itx.c

 @@ -23,6 +23,7 @@
  #include <linux/delay.h>
  #include <linux/seq_file.h>
 @@ -23,6 +23,7 @@
  #include <linux/delay.h>
  #include <linux/seq_file.h>


@@ -44858,9 +45085,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc834x
  /* ************************************************************************
   *
   * Setup the architecture
  /* ************************************************************************
   *
   * Setup the architecture

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc834x_mds.c powerpc.git/arch/powerpc/platforms/83xx/mpc834x_mds.c
---- linux-2.6.24/arch/powerpc/platforms/83xx/mpc834x_mds.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/83xx/mpc834x_mds.c      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/83xx/mpc834x_mds.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/83xx/mpc834x_mds.c
++++ linux-2.6.24.7/arch/powerpc/platforms/83xx/mpc834x_mds.c

 @@ -23,6 +23,7 @@
  #include <linux/delay.h>
  #include <linux/seq_file.h>
 @@ -23,6 +23,7 @@
  #include <linux/delay.h>
  #include <linux/seq_file.h>


@@ -44869,7 +45097,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc834x
  
  #include <asm/system.h>
  #include <asm/atomic.h>
  
  #include <asm/system.h>
  #include <asm/atomic.h>

-@@ -106,14 +107,27 @@
+@@ -106,14 +107,27 @@ static void __init mpc834x_mds_init_IRQ(

        ipic_set_default_priority();
  }
  
        ipic_set_default_priority();
  }
  


@@ -44899,9 +45127,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc834x
  }
  
  define_machine(mpc834x_mds) {
  }
  
  define_machine(mpc834x_mds) {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc836x_mds.c powerpc.git/arch/powerpc/platforms/83xx/mpc836x_mds.c
---- linux-2.6.24/arch/powerpc/platforms/83xx/mpc836x_mds.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/83xx/mpc836x_mds.c      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/83xx/mpc836x_mds.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/83xx/mpc836x_mds.c
++++ linux-2.6.24.7/arch/powerpc/platforms/83xx/mpc836x_mds.c

 @@ -29,9 +29,9 @@
  #include <linux/seq_file.h>
  #include <linux/root_dev.h>
 @@ -29,9 +29,9 @@
  #include <linux/seq_file.h>
  #include <linux/root_dev.h>


@@ -44914,7 +45143,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc836x
  #include <asm/system.h>
  #include <asm/atomic.h>
  #include <asm/time.h>
  #include <asm/system.h>
  #include <asm/atomic.h>
  #include <asm/time.h>

-@@ -141,15 +141,12 @@
+@@ -141,15 +141,12 @@ static struct of_device_id mpc836x_ids[]

  
  static int __init mpc836x_declare_of_platform_devices(void)
  {
  
  static int __init mpc836x_declare_of_platform_devices(void)
  {


@@ -44931,9 +45160,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc836x
  
  static void __init mpc836x_mds_init_IRQ(void)
  {
  
  static void __init mpc836x_mds_init_IRQ(void)
  {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc837x_mds.c powerpc.git/arch/powerpc/platforms/83xx/mpc837x_mds.c
---- linux-2.6.24/arch/powerpc/platforms/83xx/mpc837x_mds.c     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/83xx/mpc837x_mds.c      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/83xx/mpc837x_mds.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/platforms/83xx/mpc837x_mds.c

 @@ -0,0 +1,147 @@
 +/*
 + * arch/powerpc/platforms/83xx/mpc837x_mds.c
 @@ -0,0 +1,147 @@
 +/*
 + * arch/powerpc/platforms/83xx/mpc837x_mds.c


@@ -45082,9 +45312,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc837x
 +      .calibrate_decr         = generic_calibrate_decr,
 +      .progress               = udbg_progress,
 +};
 +      .calibrate_decr         = generic_calibrate_decr,
 +      .progress               = udbg_progress,
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc83xx.h powerpc.git/arch/powerpc/platforms/83xx/mpc83xx.h
---- linux-2.6.24/arch/powerpc/platforms/83xx/mpc83xx.h 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/83xx/mpc83xx.h  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/83xx/mpc83xx.h
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/83xx/mpc83xx.h
++++ linux-2.6.24.7/arch/powerpc/platforms/83xx/mpc83xx.h

 @@ -14,6 +14,7 @@
  #define MPC83XX_SCCR_USB_DRCM_11   0x00300000
  #define MPC83XX_SCCR_USB_DRCM_01   0x00100000
 @@ -14,6 +14,7 @@
  #define MPC83XX_SCCR_USB_DRCM_11   0x00300000
  #define MPC83XX_SCCR_USB_DRCM_01   0x00100000


@@ -45102,10 +45333,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc83xx
  
  /* system i/o configuration register high */
  #define MPC83XX_SICRH_OFFS         0x118
  
  /* system i/o configuration register high */
  #define MPC83XX_SICRH_OFFS         0x118

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/pci.c powerpc.git/arch/powerpc/platforms/83xx/pci.c
---- linux-2.6.24/arch/powerpc/platforms/83xx/pci.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/83xx/pci.c      2008-01-28 20:25:49.000000000 +0100
-@@ -54,7 +54,7 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/83xx/pci.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/83xx/pci.c
++++ linux-2.6.24.7/arch/powerpc/platforms/83xx/pci.c
+@@ -54,7 +54,7 @@ int __init mpc83xx_add_bridge(struct dev

                       " bus 0\n", dev->full_name);
        }
  
                       " bus 0\n", dev->full_name);
        }
  


@@ -45114,10 +45346,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/pci.c p
        hose = pcibios_alloc_controller(dev);
        if (!hose)
                return -ENOMEM;
        hose = pcibios_alloc_controller(dev);
        if (!hose)
                return -ENOMEM;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/usb.c powerpc.git/arch/powerpc/platforms/83xx/usb.c
---- linux-2.6.24/arch/powerpc/platforms/83xx/usb.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/83xx/usb.c      2008-01-28 20:25:49.000000000 +0100
-@@ -41,7 +41,7 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/83xx/usb.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/83xx/usb.c
++++ linux-2.6.24.7/arch/powerpc/platforms/83xx/usb.c
+@@ -41,7 +41,7 @@ int mpc834x_usb_cfg(void)

        sicrl = in_be32(immap + MPC83XX_SICRL_OFFS) & ~MPC834X_SICRL_USB_MASK;
        sicrh = in_be32(immap + MPC83XX_SICRH_OFFS) & ~MPC834X_SICRH_USB_UTMI;
  
        sicrl = in_be32(immap + MPC83XX_SICRL_OFFS) & ~MPC834X_SICRL_USB_MASK;
        sicrh = in_be32(immap + MPC83XX_SICRH_OFFS) & ~MPC834X_SICRH_USB_UTMI;
  


@@ -45126,7 +45359,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/usb.c p
        if (np) {
                sccr |= MPC83XX_SCCR_USB_DRCM_11;  /* 1:3 */
  
        if (np) {
                sccr |= MPC83XX_SCCR_USB_DRCM_11;  /* 1:3 */
  

-@@ -67,7 +67,7 @@
+@@ -67,7 +67,7 @@ int mpc834x_usb_cfg(void)

                port0_is_dr = 1;
                of_node_put(np);
        }
                port0_is_dr = 1;
                of_node_put(np);
        }


@@ -45135,7 +45368,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/usb.c p
        if (np) {
                sccr |= MPC83XX_SCCR_USB_MPHCM_11; /* 1:3 */
  
        if (np) {
                sccr |= MPC83XX_SCCR_USB_MPHCM_11; /* 1:3 */
  

-@@ -111,7 +111,7 @@
+@@ -111,7 +111,7 @@ int mpc831x_usb_cfg(void)

        const void *dr_mode;
  #endif
  
        const void *dr_mode;
  #endif
  


@@ -45144,7 +45377,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/usb.c p
        if (!np)
                return -ENODEV;
        prop = of_get_property(np, "phy_type", NULL);
        if (!np)
                return -ENODEV;
        prop = of_get_property(np, "phy_type", NULL);

-@@ -179,3 +179,43 @@
+@@ -179,3 +179,43 @@ int mpc831x_usb_cfg(void)

        return ret;
  }
  #endif /* CONFIG_PPC_MPC831x */
        return ret;
  }
  #endif /* CONFIG_PPC_MPC831x */


@@ -45188,10 +45421,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/usb.c p
 +      return ret;
 +}
 +#endif /* CONFIG_PPC_MPC837x */
 +      return ret;
 +}
 +#endif /* CONFIG_PPC_MPC837x */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/85xx/mpc85xx_ads.c powerpc.git/arch/powerpc/platforms/85xx/mpc85xx_ads.c
---- linux-2.6.24/arch/powerpc/platforms/85xx/mpc85xx_ads.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/85xx/mpc85xx_ads.c      2008-01-28 20:25:49.000000000 +0100
-@@ -52,9 +52,9 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/85xx/mpc85xx_ads.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/85xx/mpc85xx_ads.c
++++ linux-2.6.24.7/arch/powerpc/platforms/85xx/mpc85xx_ads.c
+@@ -52,9 +52,9 @@ static void cpm2_cascade(unsigned int ir

  {
        int cascade_irq;
  
  {
        int cascade_irq;
  


@@ -45203,7 +45437,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/85xx/mpc85xx
        desc->chip->eoi(irq);
  }
  
        desc->chip->eoi(irq);
  }
  

-@@ -70,13 +70,12 @@
+@@ -70,13 +70,12 @@ static void __init mpc85xx_ads_pic_init(

  #endif
  
        np = of_find_node_by_type(np, "open-pic");
  #endif
  
        np = of_find_node_by_type(np, "open-pic");


@@ -45219,7 +45453,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/85xx/mpc85xx
                printk(KERN_ERR "Could not map mpic register space\n");
                of_node_put(np);
                return;
                printk(KERN_ERR "Could not map mpic register space\n");
                of_node_put(np);
                return;

-@@ -100,6 +99,7 @@
+@@ -100,6 +99,7 @@ static void __init mpc85xx_ads_pic_init(

        irq = irq_of_parse_and_map(np, 0);
  
        cpm2_pic_init(np);
        irq = irq_of_parse_and_map(np, 0);
  
        cpm2_pic_init(np);


@@ -45227,7 +45461,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/85xx/mpc85xx
        set_irq_chained_handler(irq, cpm2_cascade);
  #endif
  }
        set_irq_chained_handler(irq, cpm2_cascade);
  #endif
  }

-@@ -112,7 +112,7 @@
+@@ -112,7 +112,7 @@ struct cpm_pin {

        int port, pin, flags;
  };
  
        int port, pin, flags;
  };
  


@@ -45236,7 +45470,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/85xx/mpc85xx
        /* SCC1 */
        {3, 29, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
        {3, 30, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
        /* SCC1 */
        {3, 29, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
        {3, 30, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},

-@@ -233,13 +233,11 @@
+@@ -233,13 +233,11 @@ static struct of_device_id __initdata of

  
  static int __init declare_of_platform_devices(void)
  {
  
  static int __init declare_of_platform_devices(void)
  {


@@ -45252,10 +45486,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/85xx/mpc85xx
  
  /*
   * Called very early, device-tree isn't unflattened
  
  /*
   * Called very early, device-tree isn't unflattened

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/85xx/mpc85xx_cds.c powerpc.git/arch/powerpc/platforms/85xx/mpc85xx_cds.c
---- linux-2.6.24/arch/powerpc/platforms/85xx/mpc85xx_cds.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/85xx/mpc85xx_cds.c      2008-01-28 20:25:49.000000000 +0100
-@@ -222,9 +222,6 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/85xx/mpc85xx_cds.c
++++ linux-2.6.24.7/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+@@ -222,9 +222,6 @@ static int mpc85xx_cds_8259_attach(void)

        struct device_node *cascade_node = NULL;
        int cascade_irq;
  
        struct device_node *cascade_node = NULL;
        int cascade_irq;
  


@@ -45265,7 +45500,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/85xx/mpc85xx
        /* Initialize the i8259 controller */
        for_each_node_by_type(np, "interrupt-controller")
                if (of_device_is_compatible(np, "chrp,iic")) {
        /* Initialize the i8259 controller */
        for_each_node_by_type(np, "interrupt-controller")
                if (of_device_is_compatible(np, "chrp,iic")) {

-@@ -262,8 +259,7 @@
+@@ -262,8 +259,7 @@ static int mpc85xx_cds_8259_attach(void)

  
        return 0;
  }
  
        return 0;
  }


@@ -45275,10 +45510,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/85xx/mpc85xx
  
  #endif /* CONFIG_PPC_I8259 */
  
  
  #endif /* CONFIG_PPC_I8259 */
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/85xx/mpc85xx_ds.c powerpc.git/arch/powerpc/platforms/85xx/mpc85xx_ds.c
---- linux-2.6.24/arch/powerpc/platforms/85xx/mpc85xx_ds.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/85xx/mpc85xx_ds.c       2008-01-28 20:25:49.000000000 +0100
-@@ -123,7 +123,7 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/85xx/mpc85xx_ds.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/85xx/mpc85xx_ds.c
++++ linux-2.6.24.7/arch/powerpc/platforms/85xx/mpc85xx_ds.c
+@@ -123,7 +123,7 @@ static int mpc85xx_exclude_device(struct

        struct device_node* node;
        struct resource rsrc;
  
        struct device_node* node;
        struct resource rsrc;
  


@@ -45287,9 +45523,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/85xx/mpc85xx
        of_address_to_resource(node, 0, &rsrc);
  
        if ((rsrc.start & 0xfffff) == primary_phb_addr) {
        of_address_to_resource(node, 0, &rsrc);
  
        if ((rsrc.start & 0xfffff) == primary_phb_addr) {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/85xx/mpc85xx_mds.c powerpc.git/arch/powerpc/platforms/85xx/mpc85xx_mds.c
---- linux-2.6.24/arch/powerpc/platforms/85xx/mpc85xx_mds.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/85xx/mpc85xx_mds.c      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/85xx/mpc85xx_mds.c
++++ linux-2.6.24.7/arch/powerpc/platforms/85xx/mpc85xx_mds.c

 @@ -30,9 +30,9 @@
  #include <linux/initrd.h>
  #include <linux/module.h>
 @@ -30,9 +30,9 @@
  #include <linux/initrd.h>
  #include <linux/module.h>


@@ -45302,7 +45539,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/85xx/mpc85xx
  #include <asm/system.h>
  #include <asm/atomic.h>
  #include <asm/time.h>
  #include <asm/system.h>
  #include <asm/atomic.h>
  #include <asm/time.h>

-@@ -144,15 +144,12 @@
+@@ -144,15 +144,12 @@ static struct of_device_id mpc85xx_ids[]

  
  static int __init mpc85xx_publish_devices(void)
  {
  
  static int __init mpc85xx_publish_devices(void)
  {


@@ -45320,9 +45557,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/85xx/mpc85xx
  
  static void __init mpc85xx_mds_pic_init(void)
  {
  
  static void __init mpc85xx_mds_pic_init(void)
  {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/86xx/mpc8610_hpcd.c powerpc.git/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
---- linux-2.6.24/arch/powerpc/platforms/86xx/mpc8610_hpcd.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/86xx/mpc8610_hpcd.c     2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
++++ linux-2.6.24.7/arch/powerpc/platforms/86xx/mpc8610_hpcd.c

 @@ -34,9 +34,24 @@
  
  #include <asm/mpic.h>
 @@ -34,9 +34,24 @@
  
  #include <asm/mpic.h>


@@ -45348,7 +45586,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/86xx/mpc8610
  void __init
  mpc86xx_hpcd_init_irq(void)
  {
  void __init
  mpc86xx_hpcd_init_irq(void)
  {

-@@ -124,7 +139,7 @@
+@@ -124,7 +139,7 @@ static void __devinit quirk_uli5229(stru

  static void __devinit final_uli5288(struct pci_dev *dev)
  {
        struct pci_controller *hose = pci_bus_to_host(dev->bus);
  static void __devinit final_uli5288(struct pci_dev *dev)
  {
        struct pci_controller *hose = pci_bus_to_host(dev->bus);


@@ -45357,9 +45595,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/86xx/mpc8610
        struct of_irq oirq;
        int virq, pin = 2;
        u32 laddr[3];
        struct of_irq oirq;
        int virq, pin = 2;
        u32 laddr[3];

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c powerpc.git/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
---- linux-2.6.24/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c     2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
++++ linux-2.6.24.7/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c

 @@ -18,6 +18,7 @@
  #include <linux/kdev_t.h>
  #include <linux/delay.h>
 @@ -18,6 +18,7 @@
  #include <linux/kdev_t.h>
  #include <linux/delay.h>


@@ -45368,7 +45607,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/86xx/mpc86xx
  
  #include <asm/system.h>
  #include <asm/time.h>
  
  #include <asm/system.h>
  #include <asm/time.h>

-@@ -116,7 +117,7 @@
+@@ -116,7 +117,7 @@ static int mpc86xx_exclude_device(struct

        struct device_node* node;       
        struct resource rsrc;
  
        struct device_node* node;       
        struct resource rsrc;
  


@@ -45377,7 +45616,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/86xx/mpc86xx
        of_address_to_resource(node, 0, &rsrc);
  
        if ((rsrc.start & 0xfffff) == 0x8000) {
        of_address_to_resource(node, 0, &rsrc);
  
        if ((rsrc.start & 0xfffff) == 0x8000) {

-@@ -212,6 +213,19 @@
+@@ -212,6 +213,19 @@ mpc86xx_time_init(void)

        return 0;
  }
  
        return 0;
  }
  


@@ -45397,10 +45636,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/86xx/mpc86xx
  define_machine(mpc86xx_hpcn) {
        .name                   = "MPC86xx HPCN",
        .probe                  = mpc86xx_hpcn_probe,
  define_machine(mpc86xx_hpcn) {
        .name                   = "MPC86xx HPCN",
        .probe                  = mpc86xx_hpcn_probe,

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/8xx/Kconfig powerpc.git/arch/powerpc/platforms/8xx/Kconfig
---- linux-2.6.24/arch/powerpc/platforms/8xx/Kconfig    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/8xx/Kconfig     2008-01-28 20:25:49.000000000 +0100
-@@ -18,6 +18,7 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/8xx/Kconfig
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/8xx/Kconfig
++++ linux-2.6.24.7/arch/powerpc/platforms/8xx/Kconfig
+@@ -18,6 +18,7 @@ config MPC8XXFADS

  config MPC86XADS
        bool "MPC86XADS"
        select CPM1
  config MPC86XADS
        bool "MPC86XADS"
        select CPM1


@@ -45408,7 +45648,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/8xx/Kconfig
        help
          MPC86x Application Development System by Freescale Semiconductor.
          The MPC86xADS is meant to serve as a platform for s/w and h/w
        help
          MPC86x Application Development System by Freescale Semiconductor.
          The MPC86xADS is meant to serve as a platform for s/w and h/w

-@@ -43,6 +44,15 @@
+@@ -43,6 +44,15 @@ config PPC_EP88XC

          This board is also resold by Freescale as the QUICCStart
          MPC885 Evaluation System and/or the CWH-PPC-885XN-VE.
  
          This board is also resold by Freescale as the QUICCStart
          MPC885 Evaluation System and/or the CWH-PPC-885XN-VE.
  


@@ -45424,17 +45664,19 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/8xx/Kconfig
  endchoice
  
  menu "Freescale Ethernet driver platform-specific options"
  endchoice
  
  menu "Freescale Ethernet driver platform-specific options"

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/8xx/Makefile powerpc.git/arch/powerpc/platforms/8xx/Makefile
---- linux-2.6.24/arch/powerpc/platforms/8xx/Makefile   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/8xx/Makefile    2008-01-28 20:25:49.000000000 +0100
-@@ -5,3 +5,4 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/8xx/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/8xx/Makefile
++++ linux-2.6.24.7/arch/powerpc/platforms/8xx/Makefile
+@@ -5,3 +5,4 @@ obj-$(CONFIG_PPC_8xx)    += m8xx_setup.o

  obj-$(CONFIG_MPC885ADS)   += mpc885ads_setup.o
  obj-$(CONFIG_MPC86XADS)   += mpc86xads_setup.o
  obj-$(CONFIG_PPC_EP88XC)  += ep88xc.o
 +obj-$(CONFIG_PPC_ADDER875) += adder875.o
  obj-$(CONFIG_MPC885ADS)   += mpc885ads_setup.o
  obj-$(CONFIG_MPC86XADS)   += mpc86xads_setup.o
  obj-$(CONFIG_PPC_EP88XC)  += ep88xc.o
 +obj-$(CONFIG_PPC_ADDER875) += adder875.o

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/8xx/adder875.c powerpc.git/arch/powerpc/platforms/8xx/adder875.c
---- linux-2.6.24/arch/powerpc/platforms/8xx/adder875.c 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/8xx/adder875.c  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/8xx/adder875.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/platforms/8xx/adder875.c

 @@ -0,0 +1,118 @@
 +/* Analogue & Micro Adder MPC875 board support
 + *
 @@ -0,0 +1,118 @@
 +/* Analogue & Micro Adder MPC875 board support
 + *


@@ -45554,10 +45796,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/8xx/adder875
 +      .get_rtc_time = mpc8xx_get_rtc_time,
 +      .progress = udbg_progress,
 +};
 +      .get_rtc_time = mpc8xx_get_rtc_time,
 +      .progress = udbg_progress,
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/8xx/ep88xc.c powerpc.git/arch/powerpc/platforms/8xx/ep88xc.c
---- linux-2.6.24/arch/powerpc/platforms/8xx/ep88xc.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/8xx/ep88xc.c    2008-01-28 20:25:49.000000000 +0100
-@@ -155,12 +155,11 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/8xx/ep88xc.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/8xx/ep88xc.c
++++ linux-2.6.24.7/arch/powerpc/platforms/8xx/ep88xc.c
+@@ -155,12 +155,11 @@ static struct of_device_id __initdata of

  static int __init declare_of_platform_devices(void)
  {
        /* Publish the QE devices */
  static int __init declare_of_platform_devices(void)
  {
        /* Publish the QE devices */


@@ -45572,10 +45815,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/8xx/ep88xc.c
  
  define_machine(ep88xc) {
        .name = "Embedded Planet EP88xC",
  
  define_machine(ep88xc) {
        .name = "Embedded Planet EP88xC",

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/8xx/m8xx_setup.c powerpc.git/arch/powerpc/platforms/8xx/m8xx_setup.c
---- linux-2.6.24/arch/powerpc/platforms/8xx/m8xx_setup.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/8xx/m8xx_setup.c        2008-01-28 20:25:49.000000000 +0100
-@@ -120,7 +120,7 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/8xx/m8xx_setup.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/8xx/m8xx_setup.c
++++ linux-2.6.24.7/arch/powerpc/platforms/8xx/m8xx_setup.c
+@@ -120,7 +120,7 @@ void __init mpc8xx_calibrate_decr(void)

        ppc_tb_freq /= 16;
        ppc_proc_freq = 50000000;
        if (!get_freq("clock-frequency", &ppc_proc_freq))
        ppc_tb_freq /= 16;
        ppc_proc_freq = 50000000;
        if (!get_freq("clock-frequency", &ppc_proc_freq))


@@ -45584,9 +45828,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/8xx/m8xx_set
                                "(not found)\n");
  
        printk("Decrementer Frequency = 0x%lx\n", ppc_tb_freq);
                                "(not found)\n");
  
        printk("Decrementer Frequency = 0x%lx\n", ppc_tb_freq);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/8xx/mpc86xads.h powerpc.git/arch/powerpc/platforms/8xx/mpc86xads.h
---- linux-2.6.24/arch/powerpc/platforms/8xx/mpc86xads.h        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/8xx/mpc86xads.h 2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/8xx/mpc86xads.h
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/8xx/mpc86xads.h
++++ linux-2.6.24.7/arch/powerpc/platforms/8xx/mpc86xads.h

 @@ -15,27 +15,6 @@
  #ifndef __ASM_MPC86XADS_H__
  #define __ASM_MPC86XADS_H__
 @@ -15,27 +15,6 @@
  #ifndef __ASM_MPC86XADS_H__
  #define __ASM_MPC86XADS_H__


@@ -45644,9 +45889,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/8xx/mpc86xad
 -
  #endif /* __ASM_MPC86XADS_H__ */
  #endif /* __KERNEL__ */
 -
  #endif /* __ASM_MPC86XADS_H__ */
  #endif /* __KERNEL__ */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/8xx/mpc86xads_setup.c powerpc.git/arch/powerpc/platforms/8xx/mpc86xads_setup.c
---- linux-2.6.24/arch/powerpc/platforms/8xx/mpc86xads_setup.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/8xx/mpc86xads_setup.c   2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/8xx/mpc86xads_setup.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/8xx/mpc86xads_setup.c
++++ linux-2.6.24.7/arch/powerpc/platforms/8xx/mpc86xads_setup.c

 @@ -6,264 +6,133 @@
   *
   * Copyright 2005 MontaVista Software Inc.
 @@ -6,264 +6,133 @@
   *
   * Copyright 2005 MontaVista Software Inc.


@@ -45990,16 +46236,17 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/8xx/mpc86xad
  
  define_machine(mpc86x_ads) {
        .name                   = "MPC86x ADS",
  
  define_machine(mpc86x_ads) {
        .name                   = "MPC86x ADS",

-@@ -275,4 +144,5 @@
+@@ -275,4 +144,5 @@ define_machine(mpc86x_ads) {

        .calibrate_decr         = mpc8xx_calibrate_decr,
        .set_rtc_time           = mpc8xx_set_rtc_time,
        .get_rtc_time           = mpc8xx_get_rtc_time,
 +      .progress               = udbg_progress,
  };
        .calibrate_decr         = mpc8xx_calibrate_decr,
        .set_rtc_time           = mpc8xx_set_rtc_time,
        .get_rtc_time           = mpc8xx_get_rtc_time,
 +      .progress               = udbg_progress,
  };

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/8xx/mpc885ads_setup.c powerpc.git/arch/powerpc/platforms/8xx/mpc885ads_setup.c
---- linux-2.6.24/arch/powerpc/platforms/8xx/mpc885ads_setup.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/8xx/mpc885ads_setup.c   2008-01-28 20:25:49.000000000 +0100
-@@ -264,12 +264,11 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/8xx/mpc885ads_setup.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/8xx/mpc885ads_setup.c
++++ linux-2.6.24.7/arch/powerpc/platforms/8xx/mpc885ads_setup.c
+@@ -264,12 +264,11 @@ static struct of_device_id __initdata of

  static int __init declare_of_platform_devices(void)
  {
        /* Publish the QE devices */
  static int __init declare_of_platform_devices(void)
  {
        /* Publish the QE devices */


@@ -46014,10 +46261,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/8xx/mpc885ad
  
  define_machine(mpc885_ads) {
        .name                   = "Freescale MPC885 ADS",
  
  define_machine(mpc885_ads) {
        .name                   = "Freescale MPC885 ADS",

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/Kconfig powerpc.git/arch/powerpc/platforms/Kconfig
---- linux-2.6.24/arch/powerpc/platforms/Kconfig        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/Kconfig 2008-01-28 20:25:49.000000000 +0100
-@@ -22,6 +22,7 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/Kconfig
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/Kconfig
++++ linux-2.6.24.7/arch/powerpc/platforms/Kconfig
+@@ -22,6 +22,7 @@ config PPC_83xx

        depends on 6xx
        select FSL_SOC
        select 83xx
        depends on 6xx
        select FSL_SOC
        select 83xx


@@ -46025,7 +46273,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/Kconfig powe
        select WANT_DEVICE_TREE
  
  config PPC_86xx
        select WANT_DEVICE_TREE
  
  config PPC_86xx

-@@ -80,6 +81,10 @@
+@@ -80,6 +81,10 @@ config XICS

        bool
        default y
  
        bool
        default y
  


@@ -46036,7 +46284,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/Kconfig powe
  config MPIC
        bool
        default n
  config MPIC
        bool
        default n

-@@ -265,6 +270,7 @@
+@@ -265,6 +270,7 @@ config TAU_AVERAGE

  config QUICC_ENGINE
        bool
        select PPC_LIB_RHEAP
  config QUICC_ENGINE
        bool
        select PPC_LIB_RHEAP


@@ -46044,7 +46292,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/Kconfig powe
        help
          The QUICC Engine (QE) is a new generation of communications
          coprocessors on Freescale embedded CPUs (akin to CPM in older chips).
        help
          The QUICC Engine (QE) is a new generation of communications
          coprocessors on Freescale embedded CPUs (akin to CPM in older chips).

-@@ -315,6 +321,12 @@
+@@ -315,6 +321,12 @@ config FSL_ULI1575

  config CPM
        bool
  
  config CPM
        bool
  


@@ -46057,10 +46305,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/Kconfig powe
  source "arch/powerpc/sysdev/bestcomm/Kconfig"
  
  endmenu
  source "arch/powerpc/sysdev/bestcomm/Kconfig"
  
  endmenu

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/Kconfig.cputype powerpc.git/arch/powerpc/platforms/Kconfig.cputype
---- linux-2.6.24/arch/powerpc/platforms/Kconfig.cputype        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/Kconfig.cputype 2008-01-28 20:25:49.000000000 +0100
-@@ -43,6 +43,7 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/Kconfig.cputype
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/Kconfig.cputype
++++ linux-2.6.24.7/arch/powerpc/platforms/Kconfig.cputype
+@@ -43,6 +43,7 @@ config 40x

        bool "AMCC 40x"
        select PPC_DCR_NATIVE
        select WANT_DEVICE_TREE
        bool "AMCC 40x"
        select PPC_DCR_NATIVE
        select WANT_DEVICE_TREE


@@ -46068,10 +46317,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/Kconfig.cput
  
  config 44x
        bool "AMCC 44x"
  
  config 44x
        bool "AMCC 44x"

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/Makefile powerpc.git/arch/powerpc/platforms/cell/Makefile
---- linux-2.6.24/arch/powerpc/platforms/cell/Makefile  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/Makefile   2008-01-28 20:25:49.000000000 +0100
-@@ -20,7 +20,7 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/cell/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/cell/Makefile
++++ linux-2.6.24.7/arch/powerpc/platforms/cell/Makefile
+@@ -20,7 +20,7 @@ spu-manage-$(CONFIG_PPC_CELL_NATIVE) += 

  
  obj-$(CONFIG_SPU_BASE)                        += spu_callbacks.o spu_base.o \
                                           spu_notify.o \
  
  obj-$(CONFIG_SPU_BASE)                        += spu_callbacks.o spu_base.o \
                                           spu_notify.o \


@@ -46080,9 +46330,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/Makefil
                                           $(spu-priv1-y) \
                                           $(spu-manage-y) \
                                           spufs/
                                           $(spu-priv1-y) \
                                           $(spu-manage-y) \
                                           spufs/

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/cbe_cpufreq.c powerpc.git/arch/powerpc/platforms/cell/cbe_cpufreq.c
---- linux-2.6.24/arch/powerpc/platforms/cell/cbe_cpufreq.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/cbe_cpufreq.c      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/cell/cbe_cpufreq.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/cell/cbe_cpufreq.c
++++ linux-2.6.24.7/arch/powerpc/platforms/cell/cbe_cpufreq.c

 @@ -21,8 +21,9 @@
   */
  
 @@ -21,8 +21,9 @@
   */
  


@@ -46094,9 +46345,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/cbe_cpu
  #include <asm/prom.h>
  #include <asm/cell-regs.h>
  #include "cbe_cpufreq.h"
  #include <asm/prom.h>
  #include <asm/cell-regs.h>
  #include "cbe_cpufreq.h"

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c powerpc.git/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c
---- linux-2.6.24/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c
++++ linux-2.6.24.7/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c

 @@ -23,7 +23,8 @@
  #include <linux/kernel.h>
  #include <linux/types.h>
 @@ -23,7 +23,8 @@
  #include <linux/kernel.h>
  #include <linux/types.h>


@@ -46107,9 +46359,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/cbe_cpu
  #include <asm/processor.h>
  #include <asm/prom.h>
  #include <asm/pmi.h>
  #include <asm/processor.h>
  #include <asm/prom.h>
  #include <asm/pmi.h>

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/cbe_regs.c powerpc.git/arch/powerpc/platforms/cell/cbe_regs.c
---- linux-2.6.24/arch/powerpc/platforms/cell/cbe_regs.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/cbe_regs.c 2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/cell/cbe_regs.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/cell/cbe_regs.c
++++ linux-2.6.24.7/arch/powerpc/platforms/cell/cbe_regs.c

 @@ -9,13 +9,13 @@
  #include <linux/percpu.h>
  #include <linux/types.h>
 @@ -9,13 +9,13 @@
  #include <linux/percpu.h>
  #include <linux/types.h>


@@ -46126,7 +46379,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/cbe_reg
  #include <asm/cell-regs.h>
  
  /*
  #include <asm/cell-regs.h>
  
  /*

-@@ -256,6 +256,7 @@
+@@ -256,6 +256,7 @@ void __init cbe_regs_init(void)

                        printk(KERN_ERR "cbe_regs: More BE chips than supported"
                               "!\n");
                        cbe_regs_map_count--;
                        printk(KERN_ERR "cbe_regs: More BE chips than supported"
                               "!\n");
                        cbe_regs_map_count--;


@@ -46134,10 +46387,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/cbe_reg
                        return;
                }
                map->cpu_node = cpu;
                        return;
                }
                map->cpu_node = cpu;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/io-workarounds.c powerpc.git/arch/powerpc/platforms/cell/io-workarounds.c
---- linux-2.6.24/arch/powerpc/platforms/cell/io-workarounds.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/io-workarounds.c   2008-01-28 20:25:49.000000000 +0100
-@@ -238,7 +238,7 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/cell/io-workarounds.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/cell/io-workarounds.c
++++ linux-2.6.24.7/arch/powerpc/platforms/cell/io-workarounds.c
+@@ -238,7 +238,7 @@ static void __init spider_pci_setup_chip

  static void __init spider_pci_add_one(struct pci_controller *phb)
  {
        struct spider_pci_bus *bus = &spider_pci_busses[spider_pci_count];
  static void __init spider_pci_add_one(struct pci_controller *phb)
  {
        struct spider_pci_bus *bus = &spider_pci_busses[spider_pci_count];


@@ -46146,7 +46400,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/io-work
        struct resource rsrc;
        void __iomem *regs;
  
        struct resource rsrc;
        void __iomem *regs;
  

-@@ -309,15 +309,12 @@
+@@ -309,15 +309,12 @@ static int __init spider_pci_workaround_

  {
        struct pci_controller *phb;
  
  {
        struct pci_controller *phb;
  


@@ -46163,15 +46417,16 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/io-work
                const char *model = of_get_property(np, "model", NULL);
  
                /* If no model property or name isn't exactly "pci", skip */
                const char *model = of_get_property(np, "model", NULL);
  
                /* If no model property or name isn't exactly "pci", skip */

-@@ -343,4 +340,4 @@
+@@ -343,4 +340,4 @@ static int __init spider_pci_workaround_

  
        return 0;
  }
 -arch_initcall(spider_pci_workaround_init);
 +machine_arch_initcall(cell, spider_pci_workaround_init);
  
        return 0;
  }
 -arch_initcall(spider_pci_workaround_init);
 +machine_arch_initcall(cell, spider_pci_workaround_init);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/iommu.c powerpc.git/arch/powerpc/platforms/cell/iommu.c
---- linux-2.6.24/arch/powerpc/platforms/cell/iommu.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/iommu.c    2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/cell/iommu.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/cell/iommu.c
++++ linux-2.6.24.7/arch/powerpc/platforms/cell/iommu.c

 @@ -26,14 +26,15 @@
  #include <linux/init.h>
  #include <linux/interrupt.h>
 @@ -26,14 +26,15 @@
  #include <linux/init.h>
  #include <linux/interrupt.h>


@@ -46189,7 +46444,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/iommu.c
  #include <asm/cell-regs.h>
  
  #include "interrupt.h"
  #include <asm/cell-regs.h>
  
  #include "interrupt.h"

-@@ -309,8 +310,8 @@
+@@ -309,8 +310,8 @@ static void cell_iommu_setup_hardware(st

  {
        struct page *page;
        int ret, i;
  {
        struct page *page;
        int ret, i;


@@ -46200,7 +46455,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/iommu.c
        unsigned int virq;
  
        if (cell_iommu_find_ioc(iommu->nid, &xlate_base))
        unsigned int virq;
  
        if (cell_iommu_find_ioc(iommu->nid, &xlate_base))

-@@ -327,7 +328,8 @@
+@@ -327,7 +328,8 @@ static void cell_iommu_setup_hardware(st

                        __FUNCTION__, iommu->nid, segments, pages_per_segment);
  
        /* set up the segment table */
                        __FUNCTION__, iommu->nid, segments, pages_per_segment);
  
        /* set up the segment table */


@@ -46210,7 +46465,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/iommu.c
        BUG_ON(!page);
        iommu->stab = page_address(page);
        clear_page(iommu->stab);
        BUG_ON(!page);
        iommu->stab = page_address(page);
        clear_page(iommu->stab);

-@@ -489,15 +491,18 @@
+@@ -489,15 +491,18 @@ static struct cbe_iommu *cell_iommu_for_

        return NULL;
  }
  
        return NULL;
  }
  


@@ -46231,7 +46486,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/iommu.c
  
        /* Current implementation uses the first window available in that
         * node's iommu. We -might- do something smarter later though it may
  
        /* Current implementation uses the first window available in that
         * node's iommu. We -might- do something smarter later though it may

-@@ -653,7 +658,7 @@
+@@ -653,7 +658,7 @@ static int __init cell_iommu_init_disabl

  
        /* If we have no Axon, we set up the spider DMA magic offset */
        if (of_find_node_by_name(NULL, "axon") == NULL)
  
        /* If we have no Axon, we set up the spider DMA magic offset */
        if (of_find_node_by_name(NULL, "axon") == NULL)


@@ -46240,7 +46495,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/iommu.c
  
        /* Now we need to check to see where the memory is mapped
         * in PCI space. We assume that all busses use the same dma
  
        /* Now we need to check to see where the memory is mapped
         * in PCI space. We assume that all busses use the same dma

-@@ -687,10 +692,13 @@
+@@ -687,10 +692,13 @@ static int __init cell_iommu_init_disabl

                return -ENODEV;
        }
  
                return -ENODEV;
        }
  


@@ -46256,7 +46511,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/iommu.c
  
        return 0;
  }
  
        return 0;
  }

-@@ -699,9 +707,6 @@
+@@ -699,9 +707,6 @@ static int __init cell_iommu_init(void)

  {
        struct device_node *np;
  
  {
        struct device_node *np;
  


@@ -46266,7 +46521,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/iommu.c
        /* If IOMMU is disabled or we have little enough RAM to not need
         * to enable it, we setup a direct mapping.
         *
        /* If IOMMU is disabled or we have little enough RAM to not need
         * to enable it, we setup a direct mapping.
         *

-@@ -744,5 +749,6 @@
+@@ -744,5 +749,6 @@ static int __init cell_iommu_init(void)

  
        return 0;
  }
  
        return 0;
  }


@@ -46274,10 +46529,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/iommu.c
 +machine_arch_initcall(cell, cell_iommu_init);
 +machine_arch_initcall(celleb_native, cell_iommu_init);
  
 +machine_arch_initcall(cell, cell_iommu_init);
 +machine_arch_initcall(celleb_native, cell_iommu_init);
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/pmu.c powerpc.git/arch/powerpc/platforms/cell/pmu.c
---- linux-2.6.24/arch/powerpc/platforms/cell/pmu.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/pmu.c      2008-01-28 20:25:49.000000000 +0100
-@@ -213,7 +213,7 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/cell/pmu.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/cell/pmu.c
++++ linux-2.6.24.7/arch/powerpc/platforms/cell/pmu.c
+@@ -213,7 +213,7 @@ u32 cbe_read_pm(u32 cpu, enum pm_reg_nam

                break;
  
        case pm_interval:
                break;
  
        case pm_interval:


@@ -46286,7 +46542,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/pmu.c p
                break;
  
        case pm_start_stop:
                break;
  
        case pm_start_stop:

-@@ -381,9 +381,6 @@
+@@ -381,9 +381,6 @@ static int __init cbe_init_pm_irq(void)

        unsigned int irq;
        int rc, node;
  
        unsigned int irq;
        int rc, node;
  


@@ -46296,7 +46552,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/pmu.c p
        for_each_node(node) {
                irq = irq_create_mapping(NULL, IIC_IRQ_IOEX_PMI |
                                               (node << IIC_IRQ_NODE_SHIFT));
        for_each_node(node) {
                irq = irq_create_mapping(NULL, IIC_IRQ_IOEX_PMI |
                                               (node << IIC_IRQ_NODE_SHIFT));

-@@ -404,7 +401,7 @@
+@@ -404,7 +401,7 @@ static int __init cbe_init_pm_irq(void)

  
        return 0;
  }
  
        return 0;
  }


@@ -46305,9 +46561,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/pmu.c p
  
  void cbe_sync_irq(int node)
  {
  
  void cbe_sync_irq(int node)
  {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/setup.c powerpc.git/arch/powerpc/platforms/cell/setup.c
---- linux-2.6.24/arch/powerpc/platforms/cell/setup.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/setup.c    2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/cell/setup.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/cell/setup.c
++++ linux-2.6.24.7/arch/powerpc/platforms/cell/setup.c

 @@ -30,6 +30,7 @@
  #include <linux/console.h>
  #include <linux/mutex.h>
 @@ -30,6 +30,7 @@
  #include <linux/console.h>
  #include <linux/mutex.h>


@@ -46324,7 +46581,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/setup.c
  #include <asm/cell-regs.h>
  
  #include "interrupt.h"
  #include <asm/cell-regs.h>
  
  #include "interrupt.h"

-@@ -85,9 +85,6 @@
+@@ -85,9 +85,6 @@ static int __init cell_publish_devices(v

  {
        int node;
  
  {
        int node;
  


@@ -46334,7 +46591,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/setup.c
        /* Publish OF platform devices for southbridge IOs */
        of_platform_bus_probe(NULL, NULL, NULL);
  
        /* Publish OF platform devices for southbridge IOs */
        of_platform_bus_probe(NULL, NULL, NULL);
  

-@@ -101,7 +98,7 @@
+@@ -101,7 +98,7 @@ static int __init cell_publish_devices(v

        }
        return 0;
  }
        }
        return 0;
  }


@@ -46343,9 +46600,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/setup.c
  
  static void cell_mpic_cascade(unsigned int irq, struct irq_desc *desc)
  {
  
  static void cell_mpic_cascade(unsigned int irq, struct irq_desc *desc)
  {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/smp.c powerpc.git/arch/powerpc/platforms/cell/smp.c
---- linux-2.6.24/arch/powerpc/platforms/cell/smp.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/smp.c      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/cell/smp.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/cell/smp.c
++++ linux-2.6.24.7/arch/powerpc/platforms/cell/smp.c

 @@ -42,6 +42,7 @@
  #include <asm/firmware.h>
  #include <asm/system.h>
 @@ -42,6 +42,7 @@
  #include <asm/firmware.h>
  #include <asm/system.h>


@@ -46354,7 +46612,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/smp.c p
  
  #include "interrupt.h"
  #include <asm/udbg.h>
  
  #include "interrupt.h"
  #include <asm/udbg.h>

-@@ -182,7 +183,7 @@
+@@ -182,7 +183,7 @@ static int smp_cell_cpu_bootable(unsigne

         */
        if (system_state < SYSTEM_RUNNING &&
            cpu_has_feature(CPU_FTR_SMT) &&
         */
        if (system_state < SYSTEM_RUNNING &&
            cpu_has_feature(CPU_FTR_SMT) &&


@@ -46363,9 +46621,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/smp.c p
                return 0;
  
        return 1;
                return 0;
  
        return 1;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spu_base.c powerpc.git/arch/powerpc/platforms/cell/spu_base.c
---- linux-2.6.24/arch/powerpc/platforms/cell/spu_base.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/spu_base.c 2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/cell/spu_base.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/cell/spu_base.c
++++ linux-2.6.24.7/arch/powerpc/platforms/cell/spu_base.c

 @@ -34,6 +34,7 @@
  #include <linux/linux_logo.h>
  #include <asm/spu.h>
 @@ -34,6 +34,7 @@
  #include <linux/linux_logo.h>
  #include <asm/spu.h>


@@ -46374,7 +46633,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spu_bas
  #include <asm/xmon.h>
  #include <asm/prom.h>
  
  #include <asm/xmon.h>
  #include <asm/prom.h>
  

-@@ -47,6 +48,13 @@
+@@ -47,6 +48,13 @@ struct cbe_spu_info cbe_spu_info[MAX_NUM

  EXPORT_SYMBOL_GPL(cbe_spu_info);
  
  /*
  EXPORT_SYMBOL_GPL(cbe_spu_info);
  
  /*


@@ -46388,7 +46647,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spu_bas
   * Protects cbe_spu_info and spu->number.
   */
  static DEFINE_SPINLOCK(spu_lock);
   * Protects cbe_spu_info and spu->number.
   */
  static DEFINE_SPINLOCK(spu_lock);

-@@ -66,6 +74,10 @@
+@@ -66,6 +74,10 @@ static LIST_HEAD(spu_full_list);

  static DEFINE_SPINLOCK(spu_full_list_lock);
  static DEFINE_MUTEX(spu_full_list_mutex);
  
  static DEFINE_SPINLOCK(spu_full_list_lock);
  static DEFINE_MUTEX(spu_full_list_mutex);
  


@@ -46399,7 +46658,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spu_bas
  void spu_invalidate_slbs(struct spu *spu)
  {
        struct spu_priv2 __iomem *priv2 = spu->priv2;
  void spu_invalidate_slbs(struct spu *spu)
  {
        struct spu_priv2 __iomem *priv2 = spu->priv2;

-@@ -114,40 +126,36 @@
+@@ -114,40 +126,36 @@ void spu_associate_mm(struct spu *spu, s

  }
  EXPORT_SYMBOL_GPL(spu_associate_mm);
  
  }
  EXPORT_SYMBOL_GPL(spu_associate_mm);
  


@@ -46455,7 +46714,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spu_bas
        int psize;
  
        pr_debug("%s\n", __FUNCTION__);
        int psize;
  
        pr_debug("%s\n", __FUNCTION__);

-@@ -159,7 +167,7 @@
+@@ -159,7 +167,7 @@ static int __spu_trap_data_seg(struct sp

                printk("%s: invalid access during switch!\n", __func__);
                return 1;
        }
                printk("%s: invalid access during switch!\n", __func__);
                return 1;
        }


@@ -46464,7 +46723,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spu_bas
  
        switch(REGION_ID(ea)) {
        case USER_REGION_ID:
  
        switch(REGION_ID(ea)) {
        case USER_REGION_ID:

-@@ -168,21 +176,21 @@
+@@ -168,21 +176,21 @@ static int __spu_trap_data_seg(struct sp

  #else
                psize = mm->context.user_psize;
  #endif
  #else
                psize = mm->context.user_psize;
  #endif


@@ -46492,7 +46751,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spu_bas
                break;
        default:
                /* Future: support kernel segments so that drivers
                break;
        default:
                /* Future: support kernel segments so that drivers

-@@ -191,11 +199,9 @@
+@@ -191,11 +199,9 @@ static int __spu_trap_data_seg(struct sp

                pr_debug("invalid region access at %016lx\n", ea);
                return 1;
        }
                pr_debug("invalid region access at %016lx\n", ea);
                return 1;
        }


@@ -46506,7 +46765,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spu_bas
  
        spu->slb_replace++;
        if (spu->slb_replace >= 8)
  
        spu->slb_replace++;
        if (spu->slb_replace >= 8)

-@@ -225,13 +231,83 @@
+@@ -225,13 +231,83 @@ static int __spu_trap_data_map(struct sp

                return 1;
        }
  
                return 1;
        }
  


@@ -46591,7 +46850,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spu_bas
  static irqreturn_t
  spu_irq_class_0(int irq, void *data)
  {
  static irqreturn_t
  spu_irq_class_0(int irq, void *data)
  {

-@@ -240,12 +316,13 @@
+@@ -240,12 +316,13 @@ spu_irq_class_0(int irq, void *data)

  
        spu = data;
  
  
        spu = data;
  


@@ -46608,7 +46867,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spu_bas
        spin_unlock(&spu->register_lock);
  
        spu->stop_callback(spu);
        spin_unlock(&spu->register_lock);
  
        spu->stop_callback(spu);

-@@ -255,31 +332,6 @@
+@@ -255,31 +332,6 @@ spu_irq_class_0(int irq, void *data)

        return IRQ_HANDLED;
  }
  
        return IRQ_HANDLED;
  }
  


@@ -46640,7 +46899,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spu_bas
  static irqreturn_t
  spu_irq_class_1(int irq, void *data)
  {
  static irqreturn_t
  spu_irq_class_1(int irq, void *data)
  {

-@@ -294,24 +346,23 @@
+@@ -294,24 +346,23 @@ spu_irq_class_1(int irq, void *data)

        stat  = spu_int_stat_get(spu, 1) & mask;
        dar   = spu_mfc_dar_get(spu);
        dsisr = spu_mfc_dsisr_get(spu);
        stat  = spu_int_stat_get(spu, 1) & mask;
        dar   = spu_mfc_dar_get(spu);
        dsisr = spu_mfc_dsisr_get(spu);


@@ -46670,7 +46929,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spu_bas
                ;
  
        return stat ? IRQ_HANDLED : IRQ_NONE;
                ;
  
        return stat ? IRQ_HANDLED : IRQ_NONE;

-@@ -323,6 +374,8 @@
+@@ -323,6 +374,8 @@ spu_irq_class_2(int irq, void *data)

        struct spu *spu;
        unsigned long stat;
        unsigned long mask;
        struct spu *spu;
        unsigned long stat;
        unsigned long mask;


@@ -46679,7 +46938,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spu_bas
  
        spu = data;
        spin_lock(&spu->register_lock);
  
        spu = data;
        spin_lock(&spu->register_lock);

-@@ -330,31 +383,30 @@
+@@ -330,31 +383,30 @@ spu_irq_class_2(int irq, void *data)

        mask = spu_int_mask_get(spu, 2);
        /* ignore interrupts we're not waiting for */
        stat &= mask;
        mask = spu_int_mask_get(spu, 2);
        /* ignore interrupts we're not waiting for */
        stat &= mask;


@@ -46721,7 +46980,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spu_bas
                spu->wbox_callback(spu);
  
        spu->stats.class2_intr++;
                spu->wbox_callback(spu);
  
        spu->stats.class2_intr++;

-@@ -479,13 +531,27 @@
+@@ -479,13 +531,27 @@ EXPORT_SYMBOL_GPL(spu_add_sysdev_attr);

  int spu_add_sysdev_attr_group(struct attribute_group *attrs)
  {
        struct spu *spu;
  int spu_add_sysdev_attr_group(struct attribute_group *attrs)
  {
        struct spu *spu;


@@ -46752,9 +47011,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spu_bas
  }
  EXPORT_SYMBOL_GPL(spu_add_sysdev_attr_group);
  
  }
  EXPORT_SYMBOL_GPL(spu_add_sysdev_attr_group);
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spu_fault.c powerpc.git/arch/powerpc/platforms/cell/spu_fault.c
---- linux-2.6.24/arch/powerpc/platforms/cell/spu_fault.c       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/spu_fault.c        2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/cell/spu_fault.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/platforms/cell/spu_fault.c

 @@ -0,0 +1,98 @@
 +/*
 + * SPU mm fault handler
 @@ -0,0 +1,98 @@
 +/*
 + * SPU mm fault handler


@@ -46854,9 +47114,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spu_fau
 +      return -EFAULT;
 +}
 +EXPORT_SYMBOL_GPL(spu_handle_mm_fault);
 +      return -EFAULT;
 +}
 +EXPORT_SYMBOL_GPL(spu_handle_mm_fault);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spu_manage.c powerpc.git/arch/powerpc/platforms/cell/spu_manage.c
---- linux-2.6.24/arch/powerpc/platforms/cell/spu_manage.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/spu_manage.c       2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/cell/spu_manage.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/cell/spu_manage.c
++++ linux-2.6.24.7/arch/powerpc/platforms/cell/spu_manage.c

 @@ -35,6 +35,7 @@
  #include <asm/firmware.h>
  #include <asm/prom.h>
 @@ -35,6 +35,7 @@
  #include <asm/firmware.h>
  #include <asm/prom.h>


@@ -46865,7 +47126,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spu_man
  #include "interrupt.h"
  
  struct device_node *spu_devnode(struct spu *spu)
  #include "interrupt.h"
  
  struct device_node *spu_devnode(struct spu *spu)

-@@ -345,7 +346,7 @@
+@@ -345,7 +346,7 @@ static int __init of_create_spu(struct s

                }
                ret = spu_map_interrupts_old(spu, spe);
                if (ret) {
                }
                ret = spu_map_interrupts_old(spu, spe);
                if (ret) {


@@ -46874,7 +47135,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spu_man
                                spu->name);
                        goto out_unmap;
                }
                                spu->name);
                        goto out_unmap;
                }

-@@ -369,6 +370,16 @@
+@@ -369,6 +370,16 @@ static int of_destroy_spu(struct spu *sp

        return 0;
  }
  
        return 0;
  }
  


@@ -46891,7 +47152,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spu_man
  /* Hardcoded affinity idxs for qs20 */
  #define QS20_SPES_PER_BE 8
  static int qs20_reg_idxs[QS20_SPES_PER_BE] =   { 0, 2, 4, 6, 7, 5, 3, 1 };
  /* Hardcoded affinity idxs for qs20 */
  #define QS20_SPES_PER_BE 8
  static int qs20_reg_idxs[QS20_SPES_PER_BE] =   { 0, 2, 4, 6, 7, 5, 3, 1 };

-@@ -411,10 +422,15 @@
+@@ -411,10 +422,15 @@ static void init_affinity_qs20_harcoded(

  
  static int of_has_vicinity(void)
  {
  
  static int of_has_vicinity(void)
  {


@@ -46910,7 +47171,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spu_man
  }
  
  static struct spu *devnode_spu(int cbe, struct device_node *dn)
  }
  
  static struct spu *devnode_spu(int cbe, struct device_node *dn)

-@@ -525,7 +541,7 @@
+@@ -525,7 +541,7 @@ static int __init init_affinity(void)

                if (of_flat_dt_is_compatible(root, "IBM,CPBW-1.0"))
                        init_affinity_qs20_harcoded();
                else
                if (of_flat_dt_is_compatible(root, "IBM,CPBW-1.0"))
                        init_affinity_qs20_harcoded();
                else


@@ -46919,7 +47180,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spu_man
        }
  
        return 0;
        }
  
        return 0;

-@@ -535,5 +551,7 @@
+@@ -535,5 +551,7 @@ const struct spu_management_ops spu_mana

        .enumerate_spus = of_enumerate_spus,
        .create_spu = of_create_spu,
        .destroy_spu = of_destroy_spu,
        .enumerate_spus = of_enumerate_spus,
        .create_spu = of_create_spu,
        .destroy_spu = of_destroy_spu,


@@ -46927,9 +47188,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spu_man
 +      .disable_spu = disable_spu_by_master_run,
        .init_affinity = init_affinity,
  };
 +      .disable_spu = disable_spu_by_master_run,
        .init_affinity = init_affinity,
  };

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/Makefile powerpc.git/arch/powerpc/platforms/cell/spufs/Makefile
---- linux-2.6.24/arch/powerpc/platforms/cell/spufs/Makefile    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/Makefile     2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/cell/spufs/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/cell/spufs/Makefile
++++ linux-2.6.24.7/arch/powerpc/platforms/cell/spufs/Makefile

 @@ -1,8 +1,8 @@
 -obj-y += switch.o fault.o lscsa_alloc.o
  
 @@ -1,8 +1,8 @@
 -obj-y += switch.o fault.o lscsa_alloc.o
  


@@ -46940,10 +47202,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/M
  
  # Rules to build switch.o with the help of SPU tool chain
  SPU_CROSS     := spu-
  
  # Rules to build switch.o with the help of SPU tool chain
  SPU_CROSS     := spu-

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/backing_ops.c powerpc.git/arch/powerpc/platforms/cell/spufs/backing_ops.c
---- linux-2.6.24/arch/powerpc/platforms/cell/spufs/backing_ops.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/backing_ops.c        2008-01-28 20:25:49.000000000 +0100
-@@ -106,16 +106,20 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/cell/spufs/backing_ops.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/cell/spufs/backing_ops.c
++++ linux-2.6.24.7/arch/powerpc/platforms/cell/spufs/backing_ops.c
+@@ -106,16 +106,20 @@ static unsigned int spu_backing_mbox_sta

                if (stat & 0xff0000)
                        ret |= POLLIN | POLLRDNORM;
                else {
                if (stat & 0xff0000)
                        ret |= POLLIN | POLLRDNORM;
                else {


@@ -46968,7 +47231,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/b
                }
        }
        spin_unlock_irq(&ctx->csa.register_lock);
                }
        }
        spin_unlock_irq(&ctx->csa.register_lock);

-@@ -139,7 +143,7 @@
+@@ -139,7 +143,7 @@ static int spu_backing_ibox_read(struct 

                ret = 4;
        } else {
                /* make sure we get woken up by the interrupt */
                ret = 4;
        } else {
                /* make sure we get woken up by the interrupt */


@@ -46977,7 +47240,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/b
                ret = 0;
        }
        spin_unlock(&ctx->csa.register_lock);
                ret = 0;
        }
        spin_unlock(&ctx->csa.register_lock);

-@@ -169,7 +173,8 @@
+@@ -169,7 +173,8 @@ static int spu_backing_wbox_write(struct

        } else {
                /* make sure we get woken up by the interrupt when space
                   becomes available */
        } else {
                /* make sure we get woken up by the interrupt when space
                   becomes available */


@@ -46987,7 +47250,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/b
                ret = 0;
        }
        spin_unlock(&ctx->csa.register_lock);
                ret = 0;
        }
        spin_unlock(&ctx->csa.register_lock);

-@@ -268,6 +273,11 @@
+@@ -268,6 +273,11 @@ static char *spu_backing_get_ls(struct s

        return ctx->csa.lscsa->ls;
  }
  
        return ctx->csa.lscsa->ls;
  }
  


@@ -46999,7 +47262,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/b
  static u32 spu_backing_runcntl_read(struct spu_context *ctx)
  {
        return ctx->csa.prob.spu_runcntl_RW;
  static u32 spu_backing_runcntl_read(struct spu_context *ctx)
  {
        return ctx->csa.prob.spu_runcntl_RW;

-@@ -285,6 +295,11 @@
+@@ -285,6 +295,11 @@ static void spu_backing_runcntl_write(st

        spin_unlock(&ctx->csa.register_lock);
  }
  
        spin_unlock(&ctx->csa.register_lock);
  }
  


@@ -47011,7 +47274,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/b
  static void spu_backing_master_start(struct spu_context *ctx)
  {
        struct spu_state *csa = &ctx->csa;
  static void spu_backing_master_start(struct spu_context *ctx)
  {
        struct spu_state *csa = &ctx->csa;

-@@ -358,7 +373,7 @@
+@@ -358,7 +373,7 @@ static int spu_backing_send_mfc_command(

  
  static void spu_backing_restart_dma(struct spu_context *ctx)
  {
  
  static void spu_backing_restart_dma(struct spu_context *ctx)
  {


@@ -47020,7 +47283,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/b
  }
  
  struct spu_context_ops spu_backing_ops = {
  }
  
  struct spu_context_ops spu_backing_ops = {

-@@ -379,8 +394,10 @@
+@@ -379,8 +394,10 @@ struct spu_context_ops spu_backing_ops =

        .npc_write = spu_backing_npc_write,
        .status_read = spu_backing_status_read,
        .get_ls = spu_backing_get_ls,
        .npc_write = spu_backing_npc_write,
        .status_read = spu_backing_status_read,
        .get_ls = spu_backing_get_ls,


@@ -47031,10 +47294,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/b
        .master_start = spu_backing_master_start,
        .master_stop = spu_backing_master_stop,
        .set_mfc_query = spu_backing_set_mfc_query,
        .master_start = spu_backing_master_start,
        .master_stop = spu_backing_master_stop,
        .set_mfc_query = spu_backing_set_mfc_query,

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/context.c powerpc.git/arch/powerpc/platforms/cell/spufs/context.c
---- linux-2.6.24/arch/powerpc/platforms/cell/spufs/context.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/context.c    2008-01-28 20:25:49.000000000 +0100
-@@ -52,6 +52,7 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/cell/spufs/context.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/cell/spufs/context.c
++++ linux-2.6.24.7/arch/powerpc/platforms/cell/spufs/context.c
+@@ -52,6 +52,7 @@ struct spu_context *alloc_spu_context(st

        init_waitqueue_head(&ctx->wbox_wq);
        init_waitqueue_head(&ctx->stop_wq);
        init_waitqueue_head(&ctx->mfc_wq);
        init_waitqueue_head(&ctx->wbox_wq);
        init_waitqueue_head(&ctx->stop_wq);
        init_waitqueue_head(&ctx->mfc_wq);


@@ -47042,7 +47306,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/c
        ctx->state = SPU_STATE_SAVED;
        ctx->ops = &spu_backing_ops;
        ctx->owner = get_task_mm(current);
        ctx->state = SPU_STATE_SAVED;
        ctx->ops = &spu_backing_ops;
        ctx->owner = get_task_mm(current);

-@@ -105,7 +106,17 @@
+@@ -105,7 +106,17 @@ int put_spu_context(struct spu_context *

  void spu_forget(struct spu_context *ctx)
  {
        struct mm_struct *mm;
  void spu_forget(struct spu_context *ctx)
  {
        struct mm_struct *mm;


@@ -47061,7 +47325,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/c
        mm = ctx->owner;
        ctx->owner = NULL;
        mmput(mm);
        mm = ctx->owner;
        ctx->owner = NULL;
        mmput(mm);

-@@ -133,47 +144,23 @@
+@@ -133,47 +144,23 @@ void spu_unmap_mappings(struct spu_conte

  }
  
  /**
  }
  
  /**


@@ -47117,10 +47381,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/c
  }
  
  /**
  }
  
  /**

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/coredump.c powerpc.git/arch/powerpc/platforms/cell/spufs/coredump.c
---- linux-2.6.24/arch/powerpc/platforms/cell/spufs/coredump.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/coredump.c   2008-01-28 20:25:49.000000000 +0100
-@@ -148,7 +148,9 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/cell/spufs/coredump.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/cell/spufs/coredump.c
++++ linux-2.6.24.7/arch/powerpc/platforms/cell/spufs/coredump.c
+@@ -148,7 +148,9 @@ int spufs_coredump_extra_notes_size(void

  
        fd = 0;
        while ((ctx = coredump_next_context(&fd)) != NULL) {
  
        fd = 0;
        while ((ctx = coredump_next_context(&fd)) != NULL) {


@@ -47131,7 +47396,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/c
                rc = spufs_ctx_note_size(ctx, fd);
                spu_release_saved(ctx);
                if (rc < 0)
                rc = spufs_ctx_note_size(ctx, fd);
                spu_release_saved(ctx);
                if (rc < 0)

-@@ -224,7 +226,9 @@
+@@ -224,7 +226,9 @@ int spufs_coredump_extra_notes_write(str

  
        fd = 0;
        while ((ctx = coredump_next_context(&fd)) != NULL) {
  
        fd = 0;
        while ((ctx = coredump_next_context(&fd)) != NULL) {


@@ -47142,9 +47407,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/c
  
                for (j = 0; spufs_coredump_read[j].name != NULL; j++) {
                        rc = spufs_arch_write_note(ctx, j, file, fd, foffset);
  
                for (j = 0; spufs_coredump_read[j].name != NULL; j++) {
                        rc = spufs_arch_write_note(ctx, j, file, fd, foffset);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/fault.c powerpc.git/arch/powerpc/platforms/cell/spufs/fault.c
---- linux-2.6.24/arch/powerpc/platforms/cell/spufs/fault.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/fault.c      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/cell/spufs/fault.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/cell/spufs/fault.c
++++ linux-2.6.24.7/arch/powerpc/platforms/cell/spufs/fault.c

 @@ -28,117 +28,71 @@
  
  #include "spufs.h"
 @@ -28,117 +28,71 @@
  
  #include "spufs.h"


@@ -47317,7 +47583,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
  
  /*
   * bottom half handler for page faults, we can't do this from
  
  /*
   * bottom half handler for page faults, we can't do this from

-@@ -154,7 +108,7 @@
+@@ -154,7 +108,7 @@ int spufs_handle_class1(struct spu_conte

        u64 ea, dsisr, access;
        unsigned long flags;
        unsigned flt = 0;
        u64 ea, dsisr, access;
        unsigned long flags;
        unsigned flt = 0;


@@ -47326,7 +47592,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
  
        /*
         * dar and dsisr get passed from the registers
  
        /*
         * dar and dsisr get passed from the registers

-@@ -165,16 +119,8 @@
+@@ -165,16 +119,8 @@ int spufs_handle_class1(struct spu_conte

         * in time, we can still expect to get the same fault
         * the immediately after the context restore.
         */
         * in time, we can still expect to get the same fault
         * the immediately after the context restore.
         */


@@ -47345,7 +47611,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
  
        if (!(dsisr & (MFC_DSISR_PTE_NOT_FOUND | MFC_DSISR_ACCESS_DENIED)))
                return 0;
  
        if (!(dsisr & (MFC_DSISR_PTE_NOT_FOUND | MFC_DSISR_ACCESS_DENIED)))
                return 0;

-@@ -201,7 +147,22 @@
+@@ -201,7 +147,22 @@ int spufs_handle_class1(struct spu_conte

        if (ret)
                ret = spu_handle_mm_fault(current->mm, ea, dsisr, &flt);
  
        if (ret)
                ret = spu_handle_mm_fault(current->mm, ea, dsisr, &flt);
  


@@ -47369,7 +47635,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        /*
         * If we handled the fault successfully and are in runnable
         * state, restart the DMA.
        /*
         * If we handled the fault successfully and are in runnable
         * state, restart the DMA.

-@@ -222,9 +183,9 @@
+@@ -222,9 +183,9 @@ int spufs_handle_class1(struct spu_conte

                if (ctx->spu)
                        ctx->ops->restart_dma(ctx);
        } else
                if (ctx->spu)
                        ctx->ops->restart_dma(ctx);
        } else


@@ -47381,9 +47647,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        return ret;
  }
 -EXPORT_SYMBOL_GPL(spufs_handle_class1);
        return ret;
  }
 -EXPORT_SYMBOL_GPL(spufs_handle_class1);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/file.c powerpc.git/arch/powerpc/platforms/cell/spufs/file.c
---- linux-2.6.24/arch/powerpc/platforms/cell/spufs/file.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/file.c       2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/cell/spufs/file.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/cell/spufs/file.c
++++ linux-2.6.24.7/arch/powerpc/platforms/cell/spufs/file.c

 @@ -40,6 +40,120 @@
  
  #define SPUFS_MMAP_4K (PAGE_SIZE == 0x1000)
 @@ -40,6 +40,120 @@
  
  #define SPUFS_MMAP_4K (PAGE_SIZE == 0x1000)


@@ -47505,7 +47772,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
  
  static int
  spufs_mem_open(struct inode *inode, struct file *file)
  
  static int
  spufs_mem_open(struct inode *inode, struct file *file)

-@@ -84,9 +198,12 @@
+@@ -84,9 +198,12 @@ spufs_mem_read(struct file *file, char _

        struct spu_context *ctx = file->private_data;
        ssize_t ret;
  
        struct spu_context *ctx = file->private_data;
        ssize_t ret;
  


@@ -47519,7 +47786,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        return ret;
  }
  
        return ret;
  }
  

-@@ -106,7 +223,10 @@
+@@ -106,7 +223,10 @@ spufs_mem_write(struct file *file, const

        if (size > LS_SIZE - pos)
                size = LS_SIZE - pos;
  
        if (size > LS_SIZE - pos)
                size = LS_SIZE - pos;
  


@@ -47531,7 +47798,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        local_store = ctx->ops->get_ls(ctx);
        ret = copy_from_user(local_store + pos, buffer, size);
        spu_release(ctx);
        local_store = ctx->ops->get_ls(ctx);
        ret = copy_from_user(local_store + pos, buffer, size);
        spu_release(ctx);

-@@ -146,7 +266,8 @@
+@@ -146,7 +266,8 @@ static unsigned long spufs_mem_mmap_nopf

        pr_debug("spufs_mem_mmap_nopfn address=0x%lx -> 0x%lx, offset=0x%lx\n",
                 addr0, address, offset);
  
        pr_debug("spufs_mem_mmap_nopfn address=0x%lx -> 0x%lx, offset=0x%lx\n",
                 addr0, address, offset);
  


@@ -47541,7 +47808,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
  
        if (ctx->state == SPU_STATE_SAVED) {
                vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
  
        if (ctx->state == SPU_STATE_SAVED) {
                vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)

-@@ -236,23 +357,32 @@
+@@ -236,23 +357,32 @@ static unsigned long spufs_ps_nopfn(stru

  {
        struct spu_context *ctx = vma->vm_file->private_data;
        unsigned long area, offset = address - vma->vm_start;
  {
        struct spu_context *ctx = vma->vm_file->private_data;
        unsigned long area, offset = address - vma->vm_start;


@@ -47582,7 +47849,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        return NOPFN_REFAULT;
  }
  
        return NOPFN_REFAULT;
  }
  

-@@ -286,25 +416,32 @@
+@@ -286,25 +416,32 @@ static int spufs_cntl_mmap(struct file *

  #define spufs_cntl_mmap NULL
  #endif /* !SPUFS_MMAP_4K */
  
  #define spufs_cntl_mmap NULL
  #endif /* !SPUFS_MMAP_4K */
  


@@ -47622,7 +47889,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
  }
  
  static int spufs_cntl_open(struct inode *inode, struct file *file)
  }
  
  static int spufs_cntl_open(struct inode *inode, struct file *file)

-@@ -317,7 +454,7 @@
+@@ -317,7 +454,7 @@ static int spufs_cntl_open(struct inode 

        if (!i->i_openers++)
                ctx->cntl = inode->i_mapping;
        mutex_unlock(&ctx->mapping_lock);
        if (!i->i_openers++)
                ctx->cntl = inode->i_mapping;
        mutex_unlock(&ctx->mapping_lock);


@@ -47631,7 +47898,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
                                        spufs_cntl_set, "0x%08lx");
  }
  
                                        spufs_cntl_set, "0x%08lx");
  }
  

-@@ -327,7 +464,7 @@
+@@ -327,7 +464,7 @@ spufs_cntl_release(struct inode *inode, 

        struct spufs_inode_info *i = SPUFS_I(inode);
        struct spu_context *ctx = i->i_ctx;
  
        struct spufs_inode_info *i = SPUFS_I(inode);
        struct spu_context *ctx = i->i_ctx;
  


@@ -47640,7 +47907,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
  
        mutex_lock(&ctx->mapping_lock);
        if (!--i->i_openers)
  
        mutex_lock(&ctx->mapping_lock);
        if (!--i->i_openers)

-@@ -339,8 +476,8 @@
+@@ -339,8 +476,8 @@ spufs_cntl_release(struct inode *inode, 

  static const struct file_operations spufs_cntl_fops = {
        .open = spufs_cntl_open,
        .release = spufs_cntl_release,
  static const struct file_operations spufs_cntl_fops = {
        .open = spufs_cntl_open,
        .release = spufs_cntl_release,


@@ -47651,7 +47918,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        .mmap = spufs_cntl_mmap,
  };
  
        .mmap = spufs_cntl_mmap,
  };
  

-@@ -368,7 +505,9 @@
+@@ -368,7 +505,9 @@ spufs_regs_read(struct file *file, char 

        int ret;
        struct spu_context *ctx = file->private_data;
  
        int ret;
        struct spu_context *ctx = file->private_data;
  


@@ -47662,7 +47929,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        ret = __spufs_regs_read(ctx, buffer, size, pos);
        spu_release_saved(ctx);
        return ret;
        ret = __spufs_regs_read(ctx, buffer, size, pos);
        spu_release_saved(ctx);
        return ret;

-@@ -387,7 +526,9 @@
+@@ -387,7 +526,9 @@ spufs_regs_write(struct file *file, cons

                return -EFBIG;
        *pos += size;
  
                return -EFBIG;
        *pos += size;
  


@@ -47673,7 +47940,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
  
        ret = copy_from_user(lscsa->gprs + *pos - size,
                             buffer, size) ? -EFAULT : size;
  
        ret = copy_from_user(lscsa->gprs + *pos - size,
                             buffer, size) ? -EFAULT : size;

-@@ -419,7 +560,9 @@
+@@ -419,7 +560,9 @@ spufs_fpcr_read(struct file *file, char 

        int ret;
        struct spu_context *ctx = file->private_data;
  
        int ret;
        struct spu_context *ctx = file->private_data;
  


@@ -47684,7 +47951,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        ret = __spufs_fpcr_read(ctx, buffer, size, pos);
        spu_release_saved(ctx);
        return ret;
        ret = __spufs_fpcr_read(ctx, buffer, size, pos);
        spu_release_saved(ctx);
        return ret;

-@@ -436,10 +579,12 @@
+@@ -436,10 +579,12 @@ spufs_fpcr_write(struct file *file, cons

        size = min_t(ssize_t, sizeof(lscsa->fpcr) - *pos, size);
        if (size <= 0)
                return -EFBIG;
        size = min_t(ssize_t, sizeof(lscsa->fpcr) - *pos, size);
        if (size <= 0)
                return -EFBIG;


@@ -47699,7 +47966,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        ret = copy_from_user((char *)&lscsa->fpcr + *pos - size,
                             buffer, size) ? -EFAULT : size;
  
        ret = copy_from_user((char *)&lscsa->fpcr + *pos - size,
                             buffer, size) ? -EFAULT : size;
  

-@@ -486,7 +631,10 @@
+@@ -486,7 +631,10 @@ static ssize_t spufs_mbox_read(struct fi

  
        udata = (void __user *)buf;
  
  
        udata = (void __user *)buf;
  


@@ -47711,7 +47978,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        for (count = 0; (count + 4) <= len; count += 4, udata++) {
                int ret;
                ret = ctx->ops->mbox_read(ctx, &mbox_data);
        for (count = 0; (count + 4) <= len; count += 4, udata++) {
                int ret;
                ret = ctx->ops->mbox_read(ctx, &mbox_data);

-@@ -522,12 +670,15 @@
+@@ -522,12 +670,15 @@ static ssize_t spufs_mbox_stat_read(stru

                        size_t len, loff_t *pos)
  {
        struct spu_context *ctx = file->private_data;
                        size_t len, loff_t *pos)
  {
        struct spu_context *ctx = file->private_data;


@@ -47728,7 +47995,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
  
        mbox_stat = ctx->ops->mbox_stat_read(ctx) & 0xff;
  
  
        mbox_stat = ctx->ops->mbox_stat_read(ctx) & 0xff;
  

-@@ -562,6 +713,9 @@
+@@ -562,6 +713,9 @@ void spufs_ibox_callback(struct spu *spu

  {
        struct spu_context *ctx = spu->ctx;
  
  {
        struct spu_context *ctx = spu->ctx;
  


@@ -47738,7 +48005,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        wake_up_all(&ctx->ibox_wq);
        kill_fasync(&ctx->ibox_fasync, SIGIO, POLLIN);
  }
        wake_up_all(&ctx->ibox_wq);
        kill_fasync(&ctx->ibox_fasync, SIGIO, POLLIN);
  }

-@@ -593,7 +747,9 @@
+@@ -593,7 +747,9 @@ static ssize_t spufs_ibox_read(struct fi

  
        udata = (void __user *)buf;
  
  
        udata = (void __user *)buf;
  


@@ -47749,7 +48016,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
  
        /* wait only for the first element */
        count = 0;
  
        /* wait only for the first element */
        count = 0;

-@@ -639,7 +795,11 @@
+@@ -639,7 +795,11 @@ static unsigned int spufs_ibox_poll(stru

  
        poll_wait(file, &ctx->ibox_wq, wait);
  
  
        poll_wait(file, &ctx->ibox_wq, wait);
  


@@ -47762,7 +48029,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        mask = ctx->ops->mbox_stat_poll(ctx, POLLIN | POLLRDNORM);
        spu_release(ctx);
  
        mask = ctx->ops->mbox_stat_poll(ctx, POLLIN | POLLRDNORM);
        spu_release(ctx);
  

-@@ -657,12 +817,15 @@
+@@ -657,12 +817,15 @@ static ssize_t spufs_ibox_stat_read(stru

                        size_t len, loff_t *pos)
  {
        struct spu_context *ctx = file->private_data;
                        size_t len, loff_t *pos)
  {
        struct spu_context *ctx = file->private_data;


@@ -47779,7 +48046,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        ibox_stat = (ctx->ops->mbox_stat_read(ctx) >> 16) & 0xff;
        spu_release(ctx);
  
        ibox_stat = (ctx->ops->mbox_stat_read(ctx) >> 16) & 0xff;
        spu_release(ctx);
  

-@@ -698,6 +861,9 @@
+@@ -698,6 +861,9 @@ void spufs_wbox_callback(struct spu *spu

  {
        struct spu_context *ctx = spu->ctx;
  
  {
        struct spu_context *ctx = spu->ctx;
  


@@ -47789,7 +48056,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        wake_up_all(&ctx->wbox_wq);
        kill_fasync(&ctx->wbox_fasync, SIGIO, POLLOUT);
  }
        wake_up_all(&ctx->wbox_wq);
        kill_fasync(&ctx->wbox_fasync, SIGIO, POLLOUT);
  }

-@@ -731,7 +897,9 @@
+@@ -731,7 +897,9 @@ static ssize_t spufs_wbox_write(struct f

        if (__get_user(wbox_data, udata))
                return -EFAULT;
  
        if (__get_user(wbox_data, udata))
                return -EFAULT;
  


@@ -47800,7 +48067,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
  
        /*
         * make sure we can at least write one element, by waiting
  
        /*
         * make sure we can at least write one element, by waiting

-@@ -772,7 +940,11 @@
+@@ -772,7 +940,11 @@ static unsigned int spufs_wbox_poll(stru

  
        poll_wait(file, &ctx->wbox_wq, wait);
  
  
        poll_wait(file, &ctx->wbox_wq, wait);
  


@@ -47813,7 +48080,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        mask = ctx->ops->mbox_stat_poll(ctx, POLLOUT | POLLWRNORM);
        spu_release(ctx);
  
        mask = ctx->ops->mbox_stat_poll(ctx, POLLOUT | POLLWRNORM);
        spu_release(ctx);
  

-@@ -790,12 +962,15 @@
+@@ -790,12 +962,15 @@ static ssize_t spufs_wbox_stat_read(stru

                        size_t len, loff_t *pos)
  {
        struct spu_context *ctx = file->private_data;
                        size_t len, loff_t *pos)
  {
        struct spu_context *ctx = file->private_data;


@@ -47830,7 +48097,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        wbox_stat = (ctx->ops->mbox_stat_read(ctx) >> 8) & 0xff;
        spu_release(ctx);
  
        wbox_stat = (ctx->ops->mbox_stat_read(ctx) >> 8) & 0xff;
        spu_release(ctx);
  

-@@ -866,7 +1041,9 @@
+@@ -866,7 +1041,9 @@ static ssize_t spufs_signal1_read(struct

        int ret;
        struct spu_context *ctx = file->private_data;
  
        int ret;
        struct spu_context *ctx = file->private_data;
  


@@ -47841,7 +48108,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        ret = __spufs_signal1_read(ctx, buf, len, pos);
        spu_release_saved(ctx);
  
        ret = __spufs_signal1_read(ctx, buf, len, pos);
        spu_release_saved(ctx);
  

-@@ -877,6 +1054,7 @@
+@@ -877,6 +1054,7 @@ static ssize_t spufs_signal1_write(struc

                        size_t len, loff_t *pos)
  {
        struct spu_context *ctx;
                        size_t len, loff_t *pos)
  {
        struct spu_context *ctx;


@@ -47849,7 +48116,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        u32 data;
  
        ctx = file->private_data;
        u32 data;
  
        ctx = file->private_data;

-@@ -887,7 +1065,9 @@
+@@ -887,7 +1065,9 @@ static ssize_t spufs_signal1_write(struc

        if (copy_from_user(&data, buf, 4))
                return -EFAULT;
  
        if (copy_from_user(&data, buf, 4))
                return -EFAULT;
  


@@ -47860,7 +48127,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        ctx->ops->signal1_write(ctx, data);
        spu_release(ctx);
  
        ctx->ops->signal1_write(ctx, data);
        spu_release(ctx);
  

-@@ -997,7 +1177,9 @@
+@@ -997,7 +1177,9 @@ static ssize_t spufs_signal2_read(struct

        struct spu_context *ctx = file->private_data;
        int ret;
  
        struct spu_context *ctx = file->private_data;
        int ret;
  


@@ -47871,7 +48138,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        ret = __spufs_signal2_read(ctx, buf, len, pos);
        spu_release_saved(ctx);
  
        ret = __spufs_signal2_read(ctx, buf, len, pos);
        spu_release_saved(ctx);
  

-@@ -1008,6 +1190,7 @@
+@@ -1008,6 +1190,7 @@ static ssize_t spufs_signal2_write(struc

                        size_t len, loff_t *pos)
  {
        struct spu_context *ctx;
                        size_t len, loff_t *pos)
  {
        struct spu_context *ctx;


@@ -47879,7 +48146,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        u32 data;
  
        ctx = file->private_data;
        u32 data;
  
        ctx = file->private_data;

-@@ -1018,7 +1201,9 @@
+@@ -1018,7 +1201,9 @@ static ssize_t spufs_signal2_write(struc

        if (copy_from_user(&data, buf, 4))
                return -EFAULT;
  
        if (copy_from_user(&data, buf, 4))
                return -EFAULT;
  


@@ -47890,7 +48157,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        ctx->ops->signal2_write(ctx, data);
        spu_release(ctx);
  
        ctx->ops->signal2_write(ctx, data);
        spu_release(ctx);
  

-@@ -1086,33 +1271,42 @@
+@@ -1086,33 +1271,42 @@ static const struct file_operations spuf

  #define SPU_ATTR_ACQUIRE_SAVED        2
  
  #define DEFINE_SPUFS_ATTRIBUTE(__name, __get, __set, __fmt, __acquire)        \
  #define SPU_ATTR_ACQUIRE_SAVED        2
  
  #define DEFINE_SPUFS_ATTRIBUTE(__name, __get, __set, __fmt, __acquire)        \


@@ -47944,7 +48211,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
  }
  
  static u64 spufs_signal1_type_get(struct spu_context *ctx)
  }
  
  static u64 spufs_signal1_type_get(struct spu_context *ctx)

-@@ -1123,13 +1317,18 @@
+@@ -1123,13 +1317,18 @@ DEFINE_SPUFS_ATTRIBUTE(spufs_signal1_typ

                       spufs_signal1_type_set, "%llu", SPU_ATTR_ACQUIRE);
  
  
                       spufs_signal1_type_set, "%llu", SPU_ATTR_ACQUIRE);
  
  


@@ -47965,7 +48232,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
  }
  
  static u64 spufs_signal2_type_get(struct spu_context *ctx)
  }
  
  static u64 spufs_signal2_type_get(struct spu_context *ctx)

-@@ -1329,6 +1528,9 @@
+@@ -1329,6 +1528,9 @@ void spufs_mfc_callback(struct spu *spu)

  {
        struct spu_context *ctx = spu->ctx;
  
  {
        struct spu_context *ctx = spu->ctx;
  


@@ -47975,7 +48242,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        wake_up_all(&ctx->mfc_wq);
  
        pr_debug("%s %s\n", __FUNCTION__, spu->name);
        wake_up_all(&ctx->mfc_wq);
  
        pr_debug("%s %s\n", __FUNCTION__, spu->name);

-@@ -1375,12 +1577,17 @@
+@@ -1375,12 +1577,17 @@ static ssize_t spufs_mfc_read(struct fil

        if (size != 4)
                goto out;
  
        if (size != 4)
                goto out;
  


@@ -47994,7 +48261,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
                        ctx->tagwait &= ~status;
        } else {
                ret = spufs_wait(ctx->mfc_wq,
                        ctx->tagwait &= ~status;
        } else {
                ret = spufs_wait(ctx->mfc_wq,

-@@ -1505,7 +1712,11 @@
+@@ -1505,7 +1712,11 @@ static ssize_t spufs_mfc_write(struct fi

        if (ret)
                goto out;
  
        if (ret)
                goto out;
  


@@ -48007,7 +48274,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        if (ret)
                goto out;
  
        if (ret)
                goto out;
  

-@@ -1539,7 +1750,11 @@
+@@ -1539,7 +1750,11 @@ static unsigned int spufs_mfc_poll(struc

  
        poll_wait(file, &ctx->mfc_wq, wait);
  
  
        poll_wait(file, &ctx->mfc_wq, wait);
  


@@ -48020,7 +48287,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        ctx->ops->set_mfc_query(ctx, ctx->tagwait, 2);
        free_elements = ctx->ops->get_mfc_free_elements(ctx);
        tagstatus = ctx->ops->read_mfc_tagstatus(ctx);
        ctx->ops->set_mfc_query(ctx, ctx->tagwait, 2);
        free_elements = ctx->ops->get_mfc_free_elements(ctx);
        tagstatus = ctx->ops->read_mfc_tagstatus(ctx);

-@@ -1562,7 +1777,9 @@
+@@ -1562,7 +1777,9 @@ static int spufs_mfc_flush(struct file *

        struct spu_context *ctx = file->private_data;
        int ret;
  
        struct spu_context *ctx = file->private_data;
        int ret;
  


@@ -48031,7 +48298,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
  #if 0
  /* this currently hangs */
        ret = spufs_wait(ctx->mfc_wq,
  #if 0
  /* this currently hangs */
        ret = spufs_wait(ctx->mfc_wq,

-@@ -1605,12 +1822,18 @@
+@@ -1605,12 +1822,18 @@ static const struct file_operations spuf

        .mmap    = spufs_mfc_mmap,
  };
  
        .mmap    = spufs_mfc_mmap,
  };
  


@@ -48052,7 +48319,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
  }
  
  static u64 spufs_npc_get(struct spu_context *ctx)
  }
  
  static u64 spufs_npc_get(struct spu_context *ctx)

-@@ -1620,13 +1843,19 @@
+@@ -1620,13 +1843,19 @@ static u64 spufs_npc_get(struct spu_cont

  DEFINE_SPUFS_ATTRIBUTE(spufs_npc_ops, spufs_npc_get, spufs_npc_set,
                       "0x%llx\n", SPU_ATTR_ACQUIRE);
  
  DEFINE_SPUFS_ATTRIBUTE(spufs_npc_ops, spufs_npc_get, spufs_npc_set,
                       "0x%llx\n", SPU_ATTR_ACQUIRE);
  


@@ -48074,7 +48341,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
  }
  
  static u64 spufs_decr_get(struct spu_context *ctx)
  }
  
  static u64 spufs_decr_get(struct spu_context *ctx)

-@@ -1637,15 +1866,21 @@
+@@ -1637,15 +1866,21 @@ static u64 spufs_decr_get(struct spu_con

  DEFINE_SPUFS_ATTRIBUTE(spufs_decr_ops, spufs_decr_get, spufs_decr_set,
                       "0x%llx\n", SPU_ATTR_ACQUIRE_SAVED);
  
  DEFINE_SPUFS_ATTRIBUTE(spufs_decr_ops, spufs_decr_get, spufs_decr_set,
                       "0x%llx\n", SPU_ATTR_ACQUIRE_SAVED);
  


@@ -48098,7 +48365,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
  }
  
  static u64 spufs_decr_status_get(struct spu_context *ctx)
  }
  
  static u64 spufs_decr_status_get(struct spu_context *ctx)

-@@ -1659,13 +1894,19 @@
+@@ -1659,13 +1894,19 @@ DEFINE_SPUFS_ATTRIBUTE(spufs_decr_status

                       spufs_decr_status_set, "0x%llx\n",
                       SPU_ATTR_ACQUIRE_SAVED);
  
                       spufs_decr_status_set, "0x%llx\n",
                       SPU_ATTR_ACQUIRE_SAVED);
  


@@ -48120,7 +48387,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
  }
  
  static u64 spufs_event_mask_get(struct spu_context *ctx)
  }
  
  static u64 spufs_event_mask_get(struct spu_context *ctx)

-@@ -1690,13 +1931,19 @@
+@@ -1690,13 +1931,19 @@ static u64 spufs_event_status_get(struct

  DEFINE_SPUFS_ATTRIBUTE(spufs_event_status_ops, spufs_event_status_get,
                       NULL, "0x%llx\n", SPU_ATTR_ACQUIRE_SAVED)
  
  DEFINE_SPUFS_ATTRIBUTE(spufs_event_status_ops, spufs_event_status_get,
                       NULL, "0x%llx\n", SPU_ATTR_ACQUIRE_SAVED)
  


@@ -48142,7 +48409,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
  }
  
  static u64 spufs_srr0_get(struct spu_context *ctx)
  }
  
  static u64 spufs_srr0_get(struct spu_context *ctx)

-@@ -1727,10 +1974,12 @@
+@@ -1727,10 +1974,12 @@ static u64 spufs_object_id_get(struct sp

        return ctx->object_id;
  }
  
        return ctx->object_id;
  }
  


@@ -48156,7 +48423,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
  }
  
  DEFINE_SPUFS_ATTRIBUTE(spufs_object_id_ops, spufs_object_id_get,
  }
  
  DEFINE_SPUFS_ATTRIBUTE(spufs_object_id_ops, spufs_object_id_get,

-@@ -1777,13 +2026,13 @@
+@@ -1777,13 +2026,13 @@ static const struct file_operations spuf

  static ssize_t __spufs_mbox_info_read(struct spu_context *ctx,
                        char __user *buf, size_t len, loff_t *pos)
  {
  static ssize_t __spufs_mbox_info_read(struct spu_context *ctx,
                        char __user *buf, size_t len, loff_t *pos)
  {


@@ -48175,7 +48442,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
  
        return simple_read_from_buffer(buf, len, pos, &data, sizeof data);
  }
  
        return simple_read_from_buffer(buf, len, pos, &data, sizeof data);
  }

-@@ -1797,7 +2046,9 @@
+@@ -1797,7 +2046,9 @@ static ssize_t spufs_mbox_info_read(stru

        if (!access_ok(VERIFY_WRITE, buf, len))
                return -EFAULT;
  
        if (!access_ok(VERIFY_WRITE, buf, len))
                return -EFAULT;
  


@@ -48186,7 +48453,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        spin_lock(&ctx->csa.register_lock);
        ret = __spufs_mbox_info_read(ctx, buf, len, pos);
        spin_unlock(&ctx->csa.register_lock);
        spin_lock(&ctx->csa.register_lock);
        ret = __spufs_mbox_info_read(ctx, buf, len, pos);
        spin_unlock(&ctx->csa.register_lock);

-@@ -1815,13 +2066,13 @@
+@@ -1815,13 +2066,13 @@ static const struct file_operations spuf

  static ssize_t __spufs_ibox_info_read(struct spu_context *ctx,
                                char __user *buf, size_t len, loff_t *pos)
  {
  static ssize_t __spufs_ibox_info_read(struct spu_context *ctx,
                                char __user *buf, size_t len, loff_t *pos)
  {


@@ -48205,7 +48472,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
  
        return simple_read_from_buffer(buf, len, pos, &data, sizeof data);
  }
  
        return simple_read_from_buffer(buf, len, pos, &data, sizeof data);
  }

-@@ -1835,7 +2086,9 @@
+@@ -1835,7 +2086,9 @@ static ssize_t spufs_ibox_info_read(stru

        if (!access_ok(VERIFY_WRITE, buf, len))
                return -EFAULT;
  
        if (!access_ok(VERIFY_WRITE, buf, len))
                return -EFAULT;
  


@@ -48216,7 +48483,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        spin_lock(&ctx->csa.register_lock);
        ret = __spufs_ibox_info_read(ctx, buf, len, pos);
        spin_unlock(&ctx->csa.register_lock);
        spin_lock(&ctx->csa.register_lock);
        ret = __spufs_ibox_info_read(ctx, buf, len, pos);
        spin_unlock(&ctx->csa.register_lock);

-@@ -1876,7 +2129,9 @@
+@@ -1876,7 +2129,9 @@ static ssize_t spufs_wbox_info_read(stru

        if (!access_ok(VERIFY_WRITE, buf, len))
                return -EFAULT;
  
        if (!access_ok(VERIFY_WRITE, buf, len))
                return -EFAULT;
  


@@ -48227,7 +48494,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        spin_lock(&ctx->csa.register_lock);
        ret = __spufs_wbox_info_read(ctx, buf, len, pos);
        spin_unlock(&ctx->csa.register_lock);
        spin_lock(&ctx->csa.register_lock);
        ret = __spufs_wbox_info_read(ctx, buf, len, pos);
        spin_unlock(&ctx->csa.register_lock);

-@@ -1926,7 +2181,9 @@
+@@ -1926,7 +2181,9 @@ static ssize_t spufs_dma_info_read(struc

        if (!access_ok(VERIFY_WRITE, buf, len))
                return -EFAULT;
  
        if (!access_ok(VERIFY_WRITE, buf, len))
                return -EFAULT;
  


@@ -48238,7 +48505,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        spin_lock(&ctx->csa.register_lock);
        ret = __spufs_dma_info_read(ctx, buf, len, pos);
        spin_unlock(&ctx->csa.register_lock);
        spin_lock(&ctx->csa.register_lock);
        ret = __spufs_dma_info_read(ctx, buf, len, pos);
        spin_unlock(&ctx->csa.register_lock);

-@@ -1977,7 +2234,9 @@
+@@ -1977,7 +2234,9 @@ static ssize_t spufs_proxydma_info_read(

        struct spu_context *ctx = file->private_data;
        int ret;
  
        struct spu_context *ctx = file->private_data;
        int ret;
  


@@ -48249,7 +48516,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        spin_lock(&ctx->csa.register_lock);
        ret = __spufs_proxydma_info_read(ctx, buf, len, pos);
        spin_unlock(&ctx->csa.register_lock);
        spin_lock(&ctx->csa.register_lock);
        ret = __spufs_proxydma_info_read(ctx, buf, len, pos);
        spin_unlock(&ctx->csa.register_lock);

-@@ -2066,8 +2325,12 @@
+@@ -2066,8 +2325,12 @@ static unsigned long long spufs_class2_i

  static int spufs_show_stat(struct seq_file *s, void *private)
  {
        struct spu_context *ctx = s->private;
  static int spufs_show_stat(struct seq_file *s, void *private)
  {
        struct spu_context *ctx = s->private;


@@ -48263,10 +48530,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        seq_printf(s, "%s %llu %llu %llu %llu "
                      "%llu %llu %llu %llu %llu %llu %llu %llu\n",
                ctx_state_names[ctx->stats.util_state],
        seq_printf(s, "%s %llu %llu %llu %llu "
                      "%llu %llu %llu %llu %llu %llu %llu %llu\n",
                ctx_state_names[ctx->stats.util_state],

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/hw_ops.c powerpc.git/arch/powerpc/platforms/cell/spufs/hw_ops.c
---- linux-2.6.24/arch/powerpc/platforms/cell/spufs/hw_ops.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/hw_ops.c     2008-01-28 20:25:49.000000000 +0100
-@@ -76,16 +76,18 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/cell/spufs/hw_ops.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/cell/spufs/hw_ops.c
++++ linux-2.6.24.7/arch/powerpc/platforms/cell/spufs/hw_ops.c
+@@ -76,16 +76,18 @@ static unsigned int spu_hw_mbox_stat_pol

                if (stat & 0xff0000)
                        ret |= POLLIN | POLLRDNORM;
                else {
                if (stat & 0xff0000)
                        ret |= POLLIN | POLLRDNORM;
                else {


@@ -48289,7 +48557,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/h
                }
        }
        spin_unlock_irq(&spu->register_lock);
                }
        }
        spin_unlock_irq(&spu->register_lock);

-@@ -106,7 +108,7 @@
+@@ -106,7 +108,7 @@ static int spu_hw_ibox_read(struct spu_c

                ret = 4;
        } else {
                /* make sure we get woken up by the interrupt */
                ret = 4;
        } else {
                /* make sure we get woken up by the interrupt */


@@ -48298,7 +48566,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/h
                ret = 0;
        }
        spin_unlock_irq(&spu->register_lock);
                ret = 0;
        }
        spin_unlock_irq(&spu->register_lock);

-@@ -127,7 +129,7 @@
+@@ -127,7 +129,7 @@ static int spu_hw_wbox_write(struct spu_

        } else {
                /* make sure we get woken up by the interrupt when space
                   becomes available */
        } else {
                /* make sure we get woken up by the interrupt when space
                   becomes available */


@@ -48307,7 +48575,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/h
                ret = 0;
        }
        spin_unlock_irq(&spu->register_lock);
                ret = 0;
        }
        spin_unlock_irq(&spu->register_lock);

-@@ -206,6 +208,11 @@
+@@ -206,6 +208,11 @@ static char *spu_hw_get_ls(struct spu_co

        return ctx->spu->local_store;
  }
  
        return ctx->spu->local_store;
  }
  


@@ -48319,7 +48587,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/h
  static u32 spu_hw_runcntl_read(struct spu_context *ctx)
  {
        return in_be32(&ctx->spu->problem->spu_runcntl_RW);
  static u32 spu_hw_runcntl_read(struct spu_context *ctx)
  {
        return in_be32(&ctx->spu->problem->spu_runcntl_RW);

-@@ -215,11 +222,21 @@
+@@ -215,11 +222,21 @@ static void spu_hw_runcntl_write(struct 

  {
        spin_lock_irq(&ctx->spu->register_lock);
        if (val & SPU_RUNCNTL_ISOLATE)
  {
        spin_lock_irq(&ctx->spu->register_lock);
        if (val & SPU_RUNCNTL_ISOLATE)


@@ -48342,7 +48610,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/h
  static void spu_hw_master_start(struct spu_context *ctx)
  {
        struct spu *spu = ctx->spu;
  static void spu_hw_master_start(struct spu_context *ctx)
  {
        struct spu *spu = ctx->spu;

-@@ -319,8 +336,10 @@
+@@ -319,8 +336,10 @@ struct spu_context_ops spu_hw_ops = {

        .npc_write = spu_hw_npc_write,
        .status_read = spu_hw_status_read,
        .get_ls = spu_hw_get_ls,
        .npc_write = spu_hw_npc_write,
        .status_read = spu_hw_status_read,
        .get_ls = spu_hw_get_ls,


@@ -48353,9 +48621,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/h
        .master_start = spu_hw_master_start,
        .master_stop = spu_hw_master_stop,
        .set_mfc_query = spu_hw_set_mfc_query,
        .master_start = spu_hw_master_start,
        .master_stop = spu_hw_master_stop,
        .set_mfc_query = spu_hw_set_mfc_query,

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/lscsa_alloc.c powerpc.git/arch/powerpc/platforms/cell/spufs/lscsa_alloc.c
---- linux-2.6.24/arch/powerpc/platforms/cell/spufs/lscsa_alloc.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/lscsa_alloc.c        2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/cell/spufs/lscsa_alloc.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/cell/spufs/lscsa_alloc.c
++++ linux-2.6.24.7/arch/powerpc/platforms/cell/spufs/lscsa_alloc.c

 @@ -28,6 +28,8 @@
  #include <asm/spu_csa.h>
  #include <asm/mmu.h>
 @@ -28,6 +28,8 @@
  #include <asm/spu_csa.h>
  #include <asm/mmu.h>


@@ -48365,7 +48634,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/l
  static int spu_alloc_lscsa_std(struct spu_state *csa)
  {
        struct spu_lscsa *lscsa;
  static int spu_alloc_lscsa_std(struct spu_state *csa)
  {
        struct spu_lscsa *lscsa;

-@@ -73,7 +75,7 @@
+@@ -73,7 +75,7 @@ int spu_alloc_lscsa(struct spu_state *cs

        int             i, j, n_4k;
  
        /* Check availability of 64K pages */
        int             i, j, n_4k;
  
        /* Check availability of 64K pages */


@@ -48374,10 +48643,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/l
                goto fail;
  
        csa->use_big_pages = 1;
                goto fail;
  
        csa->use_big_pages = 1;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/run.c powerpc.git/arch/powerpc/platforms/cell/spufs/run.c
---- linux-2.6.24/arch/powerpc/platforms/cell/spufs/run.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/run.c        2008-01-28 20:25:49.000000000 +0100
-@@ -15,24 +15,55 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/cell/spufs/run.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/cell/spufs/run.c
++++ linux-2.6.24.7/arch/powerpc/platforms/cell/spufs/run.c
+@@ -15,24 +15,55 @@ void spufs_stop_callback(struct spu *spu

  {
        struct spu_context *ctx = spu->ctx;
  
  {
        struct spu_context *ctx = spu->ctx;
  


@@ -48444,7 +48714,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/r
  }
  
  static int spu_setup_isolated(struct spu_context *ctx)
  }
  
  static int spu_setup_isolated(struct spu_context *ctx)

-@@ -128,34 +159,66 @@
+@@ -128,34 +159,66 @@ out:

  
  static int spu_run_init(struct spu_context *ctx, u32 *npc)
  {
  
  static int spu_run_init(struct spu_context *ctx, u32 *npc)
  {


@@ -48523,7 +48793,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/r
  
        return 0;
  }
  
        return 0;
  }

-@@ -165,6 +228,8 @@
+@@ -165,6 +228,8 @@ static int spu_run_fini(struct spu_conte

  {
        int ret = 0;
  
  {
        int ret = 0;
  


@@ -48532,7 +48802,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/r
        *status = ctx->ops->status_read(ctx);
        *npc = ctx->ops->npc_read(ctx);
  
        *status = ctx->ops->status_read(ctx);
        *npc = ctx->ops->npc_read(ctx);
  

-@@ -177,26 +242,6 @@
+@@ -177,26 +242,6 @@ static int spu_run_fini(struct spu_conte

        return ret;
  }
  
        return ret;
  }
  


@@ -48559,7 +48829,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/r
  /*
   * SPU syscall restarting is tricky because we violate the basic
   * assumption that the signal handler is running on the interrupted
  /*
   * SPU syscall restarting is tricky because we violate the basic
   * assumption that the signal handler is running on the interrupted

-@@ -247,7 +292,7 @@
+@@ -247,7 +292,7 @@ static int spu_process_callback(struct s

        u32 ls_pointer, npc;
        void __iomem *ls;
        long spu_ret;
        u32 ls_pointer, npc;
        void __iomem *ls;
        long spu_ret;


@@ -48568,7 +48838,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/r
  
        /* get syscall block from local store */
        npc = ctx->ops->npc_read(ctx) & ~3;
  
        /* get syscall block from local store */
        npc = ctx->ops->npc_read(ctx) & ~3;

-@@ -269,9 +314,11 @@
+@@ -269,9 +314,11 @@ static int spu_process_callback(struct s

                if (spu_ret <= -ERESTARTSYS) {
                        ret = spu_handle_restartsys(ctx, &spu_ret, &npc);
                }
                if (spu_ret <= -ERESTARTSYS) {
                        ret = spu_handle_restartsys(ctx, &spu_ret, &npc);
                }


@@ -48581,7 +48851,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/r
        }
  
        /* write result, jump over indirect pointer */
        }
  
        /* write result, jump over indirect pointer */

-@@ -281,18 +328,6 @@
+@@ -281,18 +328,6 @@ static int spu_process_callback(struct s

        return ret;
  }
  
        return ret;
  }
  


@@ -48600,7 +48870,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/r
  long spufs_run_spu(struct spu_context *ctx, u32 *npc, u32 *event)
  {
        int ret;
  long spufs_run_spu(struct spu_context *ctx, u32 *npc, u32 *event)
  {
        int ret;

-@@ -302,29 +337,14 @@
+@@ -302,29 +337,14 @@ long spufs_run_spu(struct spu_context *c

        if (mutex_lock_interruptible(&ctx->run_mutex))
                return -ERESTARTSYS;
  
        if (mutex_lock_interruptible(&ctx->run_mutex))
                return -ERESTARTSYS;
  


@@ -48636,7 +48906,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/r
  
        ret = spu_run_init(ctx, npc);
        if (ret) {
  
        ret = spu_run_init(ctx, npc);
        if (ret) {

-@@ -358,14 +378,12 @@
+@@ -358,14 +378,12 @@ long spufs_run_spu(struct spu_context *c

                if (ret)
                        break;
  
                if (ret)
                        break;
  


@@ -48656,7 +48926,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/r
        } while (!ret && !(status & (SPU_STATUS_STOPPED_BY_STOP |
                                      SPU_STATUS_STOPPED_BY_HALT |
                                       SPU_STATUS_SINGLE_STEP)));
        } while (!ret && !(status & (SPU_STATUS_STOPPED_BY_STOP |
                                      SPU_STATUS_STOPPED_BY_HALT |
                                       SPU_STATUS_SINGLE_STEP)));

-@@ -376,11 +394,10 @@
+@@ -376,11 +394,10 @@ long spufs_run_spu(struct spu_context *c

                ctx->stats.libassist++;
  
  
                ctx->stats.libassist++;
  
  


@@ -48669,7 +48939,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/r
        if ((ret == 0) ||
            ((ret == -ERESTARTSYS) &&
             ((status & SPU_STATUS_STOPPED_BY_HALT) ||
        if ((ret == 0) ||
            ((ret == -ERESTARTSYS) &&
             ((status & SPU_STATUS_STOPPED_BY_HALT) ||

-@@ -401,6 +418,7 @@
+@@ -401,6 +418,7 @@ out2:

  
  out:
        *event = ctx->event_return;
  
  out:
        *event = ctx->event_return;


@@ -48677,10 +48947,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/r
        mutex_unlock(&ctx->run_mutex);
        return ret;
  }
        mutex_unlock(&ctx->run_mutex);
        return ret;
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/sched.c powerpc.git/arch/powerpc/platforms/cell/spufs/sched.c
---- linux-2.6.24/arch/powerpc/platforms/cell/spufs/sched.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/sched.c      2008-01-28 20:25:49.000000000 +0100
-@@ -58,6 +58,7 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/cell/spufs/sched.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/cell/spufs/sched.c
++++ linux-2.6.24.7/arch/powerpc/platforms/cell/spufs/sched.c
+@@ -58,6 +58,7 @@ static unsigned long spu_avenrun[3];

  static struct spu_prio_array *spu_prio;
  static struct task_struct *spusched_task;
  static struct timer_list spusched_timer;
  static struct spu_prio_array *spu_prio;
  static struct task_struct *spusched_task;
  static struct timer_list spusched_timer;


@@ -48688,7 +48959,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
  
  /*
   * Priority of a normal, non-rt, non-niced'd process (aka nice level 0).
  
  /*
   * Priority of a normal, non-rt, non-niced'd process (aka nice level 0).

-@@ -105,15 +106,21 @@
+@@ -105,15 +106,21 @@ void spu_set_timeslice(struct spu_contex

  void __spu_update_sched_info(struct spu_context *ctx)
  {
        /*
  void __spu_update_sched_info(struct spu_context *ctx)
  {
        /*


@@ -48714,7 +48985,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
         * contains junk for threads with a realtime scheduling
         * policy so we have to look at ->prio in this case.
         */
         * contains junk for threads with a realtime scheduling
         * policy so we have to look at ->prio in this case.
         */

-@@ -124,23 +131,32 @@
+@@ -124,23 +131,32 @@ void __spu_update_sched_info(struct spu_

        ctx->policy = current->policy;
  
        /*
        ctx->policy = current->policy;
  
        /*


@@ -48757,7 +49028,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
  }
  
  static int __node_allowed(struct spu_context *ctx, int node)
  }
  
  static int __node_allowed(struct spu_context *ctx, int node)

-@@ -174,7 +190,7 @@
+@@ -174,7 +190,7 @@ void do_notify_spus_active(void)

         * Wake up the active spu_contexts.
         *
         * When the awakened processes see their "notify_active" flag is set,
         * Wake up the active spu_contexts.
         *
         * When the awakened processes see their "notify_active" flag is set,


@@ -48766,7 +49037,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
         */
        for_each_online_node(node) {
                struct spu *spu;
         */
        for_each_online_node(node) {
                struct spu *spu;

-@@ -221,7 +237,6 @@
+@@ -221,7 +237,6 @@ static void spu_bind_context(struct spu 

        spu->wbox_callback = spufs_wbox_callback;
        spu->stop_callback = spufs_stop_callback;
        spu->mfc_callback = spufs_mfc_callback;
        spu->wbox_callback = spufs_wbox_callback;
        spu->stop_callback = spufs_stop_callback;
        spu->mfc_callback = spufs_mfc_callback;


@@ -48774,7 +49045,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
        mb();
        spu_unmap_mappings(ctx);
        spu_restore(&ctx->csa, spu);
        mb();
        spu_unmap_mappings(ctx);
        spu_restore(&ctx->csa, spu);

-@@ -409,7 +424,6 @@
+@@ -409,7 +424,6 @@ static void spu_unbind_context(struct sp

        spu->wbox_callback = NULL;
        spu->stop_callback = NULL;
        spu->mfc_callback = NULL;
        spu->wbox_callback = NULL;
        spu->stop_callback = NULL;
        spu->mfc_callback = NULL;


@@ -48782,7 +49053,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
        spu_associate_mm(spu, NULL);
        spu->pid = 0;
        spu->tgid = 0;
        spu_associate_mm(spu, NULL);
        spu->pid = 0;
        spu->tgid = 0;

-@@ -454,6 +468,13 @@
+@@ -454,6 +468,13 @@ static void __spu_add_to_rq(struct spu_c

        }
  }
  
        }
  }
  


@@ -48796,7 +49067,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
  static void __spu_del_from_rq(struct spu_context *ctx)
  {
        int prio = ctx->prio;
  static void __spu_del_from_rq(struct spu_context *ctx)
  {
        int prio = ctx->prio;

-@@ -468,10 +489,24 @@
+@@ -468,10 +489,24 @@ static void __spu_del_from_rq(struct spu

        }
  }
  
        }
  }
  


@@ -48821,7 +49092,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
        spin_lock(&spu_prio->runq_lock);
        prepare_to_wait_exclusive(&ctx->stop_wq, &wait, TASK_INTERRUPTIBLE);
        if (!signal_pending(current)) {
        spin_lock(&spu_prio->runq_lock);
        prepare_to_wait_exclusive(&ctx->stop_wq, &wait, TASK_INTERRUPTIBLE);
        if (!signal_pending(current)) {

-@@ -555,7 +590,7 @@
+@@ -555,7 +590,7 @@ static struct spu *find_victim(struct sp

        /*
         * Look for a possible preemption candidate on the local node first.
         * If there is no candidate look at the other nodes.  This isn't
        /*
         * Look for a possible preemption candidate on the local node first.
         * If there is no candidate look at the other nodes.  This isn't


@@ -48830,7 +49101,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
         * a strong node affinity.  We might want to fine-tune this in
         * the future.
         */
         * a strong node affinity.  We might want to fine-tune this in
         * the future.
         */

-@@ -571,6 +606,7 @@
+@@ -571,6 +606,7 @@ static struct spu *find_victim(struct sp

                        struct spu_context *tmp = spu->ctx;
  
                        if (tmp && tmp->prio > ctx->prio &&
                        struct spu_context *tmp = spu->ctx;
  
                        if (tmp && tmp->prio > ctx->prio &&


@@ -48838,7 +49109,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
                            (!victim || tmp->prio > victim->prio))
                                victim = spu->ctx;
                }
                            (!victim || tmp->prio > victim->prio))
                                victim = spu->ctx;
                }

-@@ -582,6 +618,10 @@
+@@ -582,6 +618,10 @@ static struct spu *find_victim(struct sp

                         * higher priority contexts before lower priority
                         * ones, so this is safe until we introduce
                         * priority inheritance schemes.
                         * higher priority contexts before lower priority
                         * ones, so this is safe until we introduce
                         * priority inheritance schemes.


@@ -48849,7 +49120,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
                         */
                        if (!mutex_trylock(&victim->state_mutex)) {
                                victim = NULL;
                         */
                        if (!mutex_trylock(&victim->state_mutex)) {
                                victim = NULL;

-@@ -589,10 +629,10 @@
+@@ -589,10 +629,10 @@ static struct spu *find_victim(struct sp

                        }
  
                        spu = victim->spu;
                        }
  
                        spu = victim->spu;


@@ -48862,7 +49133,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
                                 * restart the search.
                                 */
                                mutex_unlock(&victim->state_mutex);
                                 * restart the search.
                                 */
                                mutex_unlock(&victim->state_mutex);

-@@ -607,13 +647,10 @@
+@@ -607,13 +647,10 @@ static struct spu *find_victim(struct sp

  
                        victim->stats.invol_ctx_switch++;
                        spu->stats.invol_ctx_switch++;
  
                        victim->stats.invol_ctx_switch++;
                        spu->stats.invol_ctx_switch++;


@@ -48879,7 +49150,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
                        return spu;
                }
        }
                        return spu;
                }
        }

-@@ -621,6 +658,50 @@
+@@ -621,6 +658,50 @@ static struct spu *find_victim(struct sp

        return NULL;
  }
  
        return NULL;
  }
  


@@ -48930,7 +49201,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
  /**
   * spu_activate - find a free spu for a context and execute it
   * @ctx:      spu context to schedule
  /**
   * spu_activate - find a free spu for a context and execute it
   * @ctx:      spu context to schedule

-@@ -632,39 +713,47 @@
+@@ -632,39 +713,47 @@ static struct spu *find_victim(struct sp

   */
  int spu_activate(struct spu_context *ctx, unsigned long flags)
  {
   */
  int spu_activate(struct spu_context *ctx, unsigned long flags)
  {


@@ -49005,7 +49276,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
  }
  
  /**
  }
  
  /**

-@@ -706,21 +795,19 @@
+@@ -706,21 +795,19 @@ static int __spu_deactivate(struct spu_c

        if (spu) {
                new = grab_runnable_context(max_prio, spu->node);
                if (new || force) {
        if (spu) {
                new = grab_runnable_context(max_prio, spu->node);
                if (new || force) {


@@ -49039,7 +49310,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
        }
  
        return new != NULL;
        }
  
        return new != NULL;

-@@ -757,43 +844,38 @@
+@@ -757,43 +844,38 @@ void spu_yield(struct spu_context *ctx)

  
  static noinline void spusched_tick(struct spu_context *ctx)
  {
  
  static noinline void spusched_tick(struct spu_context *ctx)
  {


@@ -49107,7 +49378,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
  }
  
  /**
  }
  
  /**

-@@ -817,35 +899,31 @@
+@@ -817,35 +899,31 @@ static unsigned long count_active_contex

  }
  
  /**
  }
  
  /**


@@ -49155,7 +49426,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
  }
  
  static int spusched_thread(void *unused)
  }
  
  static int spusched_thread(void *unused)

-@@ -857,17 +935,58 @@
+@@ -857,17 +935,58 @@ static int spusched_thread(void *unused)

                set_current_state(TASK_INTERRUPTIBLE);
                schedule();
                for (node = 0; node < MAX_NUMNODES; node++) {
                set_current_state(TASK_INTERRUPTIBLE);
                schedule();
                for (node = 0; node < MAX_NUMNODES; node++) {


@@ -49219,7 +49490,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
  #define LOAD_INT(x) ((x) >> FSHIFT)
  #define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
  
  #define LOAD_INT(x) ((x) >> FSHIFT)
  #define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
  

-@@ -881,7 +1000,7 @@
+@@ -881,7 +1000,7 @@ static int show_spu_loadavg(struct seq_f

  
        /*
         * Note that last_pid doesn't really make much sense for the
  
        /*
         * Note that last_pid doesn't really make much sense for the


@@ -49228,7 +49499,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
         * but we include it here to have a 100% compatible interface.
         */
        seq_printf(s, "%d.%02d %d.%02d %d.%02d %ld/%d %d\n",
         * but we include it here to have a 100% compatible interface.
         */
        seq_printf(s, "%d.%02d %d.%02d %d.%02d %ld/%d %d\n",

-@@ -922,6 +1041,7 @@
+@@ -922,6 +1041,7 @@ int __init spu_sched_init(void)

        spin_lock_init(&spu_prio->runq_lock);
  
        setup_timer(&spusched_timer, spusched_wake, 0);
        spin_lock_init(&spu_prio->runq_lock);
  
        setup_timer(&spusched_timer, spusched_wake, 0);


@@ -49236,7 +49507,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
  
        spusched_task = kthread_run(spusched_thread, NULL, "spusched");
        if (IS_ERR(spusched_task)) {
  
        spusched_task = kthread_run(spusched_thread, NULL, "spusched");
        if (IS_ERR(spusched_task)) {

-@@ -929,6 +1049,8 @@
+@@ -929,6 +1049,8 @@ int __init spu_sched_init(void)

                goto out_free_spu_prio;
        }
  
                goto out_free_spu_prio;
        }
  


@@ -49245,7 +49516,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
        entry = create_proc_entry("spu_loadavg", 0, NULL);
        if (!entry)
                goto out_stop_kthread;
        entry = create_proc_entry("spu_loadavg", 0, NULL);
        if (!entry)
                goto out_stop_kthread;

-@@ -954,6 +1076,7 @@
+@@ -954,6 +1076,7 @@ void spu_sched_exit(void)

        remove_proc_entry("spu_loadavg", NULL);
  
        del_timer_sync(&spusched_timer);
        remove_proc_entry("spu_loadavg", NULL);
  
        del_timer_sync(&spusched_timer);


@@ -49253,10 +49524,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
        kthread_stop(spusched_task);
  
        for (node = 0; node < MAX_NUMNODES; node++) {
        kthread_stop(spusched_task);
  
        for (node = 0; node < MAX_NUMNODES; node++) {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/spufs.h powerpc.git/arch/powerpc/platforms/cell/spufs/spufs.h
---- linux-2.6.24/arch/powerpc/platforms/cell/spufs/spufs.h     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/spufs.h      2008-01-28 20:25:49.000000000 +0100
-@@ -71,6 +71,7 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/cell/spufs/spufs.h
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/cell/spufs/spufs.h
++++ linux-2.6.24.7/arch/powerpc/platforms/cell/spufs/spufs.h
+@@ -71,6 +71,7 @@ struct spu_context {

        wait_queue_head_t wbox_wq;
        wait_queue_head_t stop_wq;
        wait_queue_head_t mfc_wq;
        wait_queue_head_t wbox_wq;
        wait_queue_head_t stop_wq;
        wait_queue_head_t mfc_wq;


@@ -49264,7 +49536,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
        struct fasync_struct *ibox_fasync;
        struct fasync_struct *wbox_fasync;
        struct fasync_struct *mfc_fasync;
        struct fasync_struct *ibox_fasync;
        struct fasync_struct *wbox_fasync;
        struct fasync_struct *mfc_fasync;

-@@ -168,8 +169,10 @@
+@@ -168,8 +169,10 @@ struct spu_context_ops {

        void (*npc_write) (struct spu_context * ctx, u32 data);
         u32(*status_read) (struct spu_context * ctx);
        char*(*get_ls) (struct spu_context * ctx);
        void (*npc_write) (struct spu_context * ctx, u32 data);
         u32(*status_read) (struct spu_context * ctx);
        char*(*get_ls) (struct spu_context * ctx);


@@ -49275,7 +49547,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
        void (*master_start) (struct spu_context * ctx);
        void (*master_stop) (struct spu_context * ctx);
        int (*set_mfc_query)(struct spu_context * ctx, u32 mask, u32 mode);
        void (*master_start) (struct spu_context * ctx);
        void (*master_stop) (struct spu_context * ctx);
        int (*set_mfc_query)(struct spu_context * ctx, u32 mask, u32 mode);

-@@ -219,15 +222,16 @@
+@@ -219,15 +222,16 @@ void spu_gang_add_ctx(struct spu_gang *g

  
  /* fault handling */
  int spufs_handle_class1(struct spu_context *ctx);
  
  /* fault handling */
  int spufs_handle_class1(struct spu_context *ctx);


@@ -49294,7 +49566,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
  }
  
  static inline void spu_release(struct spu_context *ctx)
  }
  
  static inline void spu_release(struct spu_context *ctx)

-@@ -242,10 +246,11 @@
+@@ -242,10 +246,11 @@ int put_spu_context(struct spu_context *

  void spu_unmap_mappings(struct spu_context *ctx);
  
  void spu_forget(struct spu_context *ctx);
  void spu_unmap_mappings(struct spu_context *ctx);
  
  void spu_forget(struct spu_context *ctx);


@@ -49308,7 +49580,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
  int spu_activate(struct spu_context *ctx, unsigned long flags);
  void spu_deactivate(struct spu_context *ctx);
  void spu_yield(struct spu_context *ctx);
  int spu_activate(struct spu_context *ctx, unsigned long flags);
  void spu_deactivate(struct spu_context *ctx);
  void spu_yield(struct spu_context *ctx);

-@@ -279,7 +284,9 @@
+@@ -279,7 +284,9 @@ extern char *isolated_loader;

                }                                                       \
                spu_release(ctx);                                       \
                schedule();                                             \
                }                                                       \
                spu_release(ctx);                                       \
                schedule();                                             \


@@ -49319,7 +49591,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
        }                                                               \
        finish_wait(&(wq), &__wait);                                    \
        __ret;                                                          \
        }                                                               \
        finish_wait(&(wq), &__wait);                                    \
        __ret;                                                          \

-@@ -306,41 +313,16 @@
+@@ -306,41 +313,16 @@ struct spufs_coredump_reader {

  extern struct spufs_coredump_reader spufs_coredump_read[];
  extern int spufs_coredump_num_notes;
  
  extern struct spufs_coredump_reader spufs_coredump_read[];
  extern int spufs_coredump_num_notes;
  


@@ -49372,9 +49644,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
 +              enum spu_utilization_state new_state);
  
  #endif
 +              enum spu_utilization_state new_state);
  
  #endif

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/switch.c powerpc.git/arch/powerpc/platforms/cell/spufs/switch.c
---- linux-2.6.24/arch/powerpc/platforms/cell/spufs/switch.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/switch.c     2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/cell/spufs/switch.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/cell/spufs/switch.c
++++ linux-2.6.24.7/arch/powerpc/platforms/cell/spufs/switch.c

 @@ -48,6 +48,8 @@
  #include <asm/spu_csa.h>
  #include <asm/mmu_context.h>
 @@ -48,6 +48,8 @@
  #include <asm/spu_csa.h>
  #include <asm/mmu_context.h>


@@ -49384,7 +49657,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
  #include "spu_save_dump.h"
  #include "spu_restore_dump.h"
  
  #include "spu_save_dump.h"
  #include "spu_restore_dump.h"
  

-@@ -691,35 +693,9 @@
+@@ -691,35 +693,9 @@ static inline void resume_mfc_queue(stru

        out_be64(&priv2->mfc_control_RW, MFC_CNTL_RESUME_DMA_QUEUE);
  }
  
        out_be64(&priv2->mfc_control_RW, MFC_CNTL_RESUME_DMA_QUEUE);
  }
  


@@ -49422,7 +49695,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
        /* Save, Step 47:
         * Restore, Step 30.
         *     If MFC_SR1[R]=1, write 0 to SLB_Invalidate_All
        /* Save, Step 47:
         * Restore, Step 30.
         *     If MFC_SR1[R]=1, write 0 to SLB_Invalidate_All

-@@ -735,11 +711,7 @@
+@@ -735,11 +711,7 @@ static inline void setup_mfc_slbs(struct

         *     translation is desired by OS environment).
         */
        spu_invalidate_slbs(spu);
         *     translation is desired by OS environment).
         */
        spu_invalidate_slbs(spu);


@@ -49435,7 +49708,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
  }
  
  static inline void set_switch_active(struct spu_state *csa, struct spu *spu)
  }
  
  static inline void set_switch_active(struct spu_state *csa, struct spu *spu)

-@@ -768,9 +740,9 @@
+@@ -768,9 +740,9 @@ static inline void enable_interrupts(str

         *     (translation) interrupts.
         */
        spin_lock_irq(&spu->register_lock);
         *     (translation) interrupts.
         */
        spin_lock_irq(&spu->register_lock);


@@ -49448,7 +49721,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
        spu_int_mask_set(spu, 0, 0ul);
        spu_int_mask_set(spu, 1, class1_mask);
        spu_int_mask_set(spu, 2, 0ul);
        spu_int_mask_set(spu, 0, 0ul);
        spu_int_mask_set(spu, 1, class1_mask);
        spu_int_mask_set(spu, 2, 0ul);

-@@ -927,8 +899,8 @@
+@@ -927,8 +899,8 @@ static inline void wait_tag_complete(str

        POLL_WHILE_FALSE(in_be32(&prob->dma_tagstatus_R) & mask);
  
        local_irq_save(flags);
        POLL_WHILE_FALSE(in_be32(&prob->dma_tagstatus_R) & mask);
  
        local_irq_save(flags);


@@ -49459,7 +49732,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
        local_irq_restore(flags);
  }
  
        local_irq_restore(flags);
  }
  

-@@ -946,8 +918,8 @@
+@@ -946,8 +918,8 @@ static inline void wait_spu_stopped(stru

        POLL_WHILE_TRUE(in_be32(&prob->spu_status_R) & SPU_STATUS_RUNNING);
  
        local_irq_save(flags);
        POLL_WHILE_TRUE(in_be32(&prob->spu_status_R) & SPU_STATUS_RUNNING);
  
        local_irq_save(flags);


@@ -49470,7 +49743,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
        local_irq_restore(flags);
  }
  
        local_irq_restore(flags);
  }
  

-@@ -1423,9 +1395,9 @@
+@@ -1423,9 +1395,9 @@ static inline void clear_interrupts(stru

        spu_int_mask_set(spu, 0, 0ul);
        spu_int_mask_set(spu, 1, 0ul);
        spu_int_mask_set(spu, 2, 0ul);
        spu_int_mask_set(spu, 0, 0ul);
        spu_int_mask_set(spu, 1, 0ul);
        spu_int_mask_set(spu, 2, 0ul);


@@ -49483,7 +49756,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
        spin_unlock_irq(&spu->register_lock);
  }
  
        spin_unlock_irq(&spu->register_lock);
  }
  

-@@ -1866,7 +1838,8 @@
+@@ -1866,7 +1838,8 @@ static void save_lscsa(struct spu_state 

         */
  
        resume_mfc_queue(prev, spu);    /* Step 46. */
         */
  
        resume_mfc_queue(prev, spu);    /* Step 46. */


@@ -49493,7 +49766,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
        set_switch_active(prev, spu);   /* Step 48. */
        enable_interrupts(prev, spu);   /* Step 49. */
        save_ls_16kb(prev, spu);        /* Step 50. */
        set_switch_active(prev, spu);   /* Step 48. */
        enable_interrupts(prev, spu);   /* Step 49. */
        save_ls_16kb(prev, spu);        /* Step 50. */

-@@ -1971,7 +1944,8 @@
+@@ -1971,7 +1944,8 @@ static void restore_lscsa(struct spu_sta

        setup_spu_status_part1(next, spu);      /* Step 27. */
        setup_spu_status_part2(next, spu);      /* Step 28. */
        restore_mfc_rag(next, spu);             /* Step 29. */
        setup_spu_status_part1(next, spu);      /* Step 27. */
        setup_spu_status_part2(next, spu);      /* Step 28. */
        restore_mfc_rag(next, spu);             /* Step 29. */


@@ -49503,7 +49776,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
        set_spu_npc(next, spu);                 /* Step 31. */
        set_signot1(next, spu);                 /* Step 32. */
        set_signot2(next, spu);                 /* Step 33. */
        set_spu_npc(next, spu);                 /* Step 31. */
        set_signot1(next, spu);                 /* Step 32. */
        set_signot2(next, spu);                 /* Step 33. */

-@@ -2103,10 +2077,6 @@
+@@ -2103,10 +2077,6 @@ int spu_save(struct spu_state *prev, str

        int rc;
  
        acquire_spu_lock(spu);          /* Step 1.     */
        int rc;
  
        acquire_spu_lock(spu);          /* Step 1.     */


@@ -49514,7 +49787,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
        rc = __do_spu_save(prev, spu);  /* Steps 2-53. */
        release_spu_lock(spu);
        if (rc != 0 && rc != 2 && rc != 6) {
        rc = __do_spu_save(prev, spu);  /* Steps 2-53. */
        release_spu_lock(spu);
        if (rc != 0 && rc != 2 && rc != 6) {

-@@ -2133,9 +2103,6 @@
+@@ -2133,9 +2103,6 @@ int spu_restore(struct spu_state *new, s

        acquire_spu_lock(spu);
        harvest(NULL, spu);
        spu->slb_replace = 0;
        acquire_spu_lock(spu);
        harvest(NULL, spu);
        spu->slb_replace = 0;


@@ -49524,7 +49797,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
        rc = __do_spu_restore(new, spu);
        release_spu_lock(spu);
        if (rc) {
        rc = __do_spu_restore(new, spu);
        release_spu_lock(spu);
        if (rc) {

-@@ -2215,10 +2182,8 @@
+@@ -2215,10 +2182,8 @@ int spu_init_csa(struct spu_state *csa)

  
        return 0;
  }
  
        return 0;
  }


@@ -49535,10 +49808,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
        spu_free_lscsa(csa);
  }
 -EXPORT_SYMBOL_GPL(spu_fini_csa);
        spu_free_lscsa(csa);
  }
 -EXPORT_SYMBOL_GPL(spu_fini_csa);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/Kconfig powerpc.git/arch/powerpc/platforms/celleb/Kconfig
---- linux-2.6.24/arch/powerpc/platforms/celleb/Kconfig 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/celleb/Kconfig  2008-01-28 20:25:49.000000000 +0100
-@@ -2,6 +2,8 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/celleb/Kconfig
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/celleb/Kconfig
++++ linux-2.6.24.7/arch/powerpc/platforms/celleb/Kconfig
+@@ -2,6 +2,8 @@ config PPC_CELLEB

        bool "Toshiba's Cell Reference Set 'Celleb' Architecture"
        depends on PPC_MULTIPLATFORM && PPC64
        select PPC_CELL
        bool "Toshiba's Cell Reference Set 'Celleb' Architecture"
        depends on PPC_MULTIPLATFORM && PPC64
        select PPC_CELL


@@ -49547,9 +49821,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/Kconf
        select PPC_INDIRECT_IO
        select PPC_OF_PLATFORM_PCI
        select HAS_TXX9_SERIAL
        select PPC_INDIRECT_IO
        select PPC_OF_PLATFORM_PCI
        select HAS_TXX9_SERIAL

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/io-workarounds.c powerpc.git/arch/powerpc/platforms/celleb/io-workarounds.c
---- linux-2.6.24/arch/powerpc/platforms/celleb/io-workarounds.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/celleb/io-workarounds.c 2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/celleb/io-workarounds.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/celleb/io-workarounds.c
++++ linux-2.6.24.7/arch/powerpc/platforms/celleb/io-workarounds.c

 @@ -22,6 +22,7 @@
  
  #undef DEBUG
 @@ -22,6 +22,7 @@
  
  #undef DEBUG


@@ -49558,7 +49833,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/io-wo
  #include <linux/of_device.h>
  #include <linux/irq.h>
  
  #include <linux/of_device.h>
  #include <linux/irq.h>
  

-@@ -222,7 +223,7 @@
+@@ -222,7 +223,7 @@ void __init celleb_pci_add_one(struct pc

                               void (*dummy_read)(struct pci_controller *))
  {
        struct celleb_pci_bus *bus = &celleb_pci_busses[celleb_pci_count];
                               void (*dummy_read)(struct pci_controller *))
  {
        struct celleb_pci_bus *bus = &celleb_pci_busses[celleb_pci_count];


@@ -49567,7 +49842,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/io-wo
  
        if (celleb_pci_count >= MAX_CELLEB_PCI_BUS) {
                printk(KERN_ERR "Too many pci bridges, workarounds"
  
        if (celleb_pci_count >= MAX_CELLEB_PCI_BUS) {
                printk(KERN_ERR "Too many pci bridges, workarounds"

-@@ -256,13 +257,13 @@
+@@ -256,13 +257,13 @@ int __init celleb_pci_workaround_init(vo

  
        celleb_dummy_page_va = kmalloc(PAGE_SIZE, GFP_KERNEL);
        if (!celleb_dummy_page_va) {
  
        celleb_dummy_page_va = kmalloc(PAGE_SIZE, GFP_KERNEL);
        if (!celleb_dummy_page_va) {


@@ -49583,9 +49858,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/io-wo
                match = of_match_node(celleb_pci_workaround_match, node);
  
                if (match) {
                match = of_match_node(celleb_pci_workaround_match, node);
  
                if (match) {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/iommu.c powerpc.git/arch/powerpc/platforms/celleb/iommu.c
---- linux-2.6.24/arch/powerpc/platforms/celleb/iommu.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/celleb/iommu.c  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/celleb/iommu.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/celleb/iommu.c
++++ linux-2.6.24.7/arch/powerpc/platforms/celleb/iommu.c

 @@ -22,8 +22,9 @@
  #include <linux/init.h>
  #include <linux/dma-mapping.h>
 @@ -22,8 +22,9 @@
  #include <linux/init.h>
  #include <linux/dma-mapping.h>


@@ -49597,7 +49873,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/iommu
  
  #include "beat_wrapper.h"
  
  
  #include "beat_wrapper.h"
  

-@@ -51,6 +52,8 @@
+@@ -51,6 +52,8 @@ static int __init find_dma_window(u64 *i

        return 0;
  }
  
        return 0;
  }
  


@@ -49606,7 +49882,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/iommu
  static void __init celleb_init_direct_mapping(void)
  {
        u64 lpar_addr, io_addr;
  static void __init celleb_init_direct_mapping(void)
  {
        u64 lpar_addr, io_addr;

-@@ -68,7 +71,18 @@
+@@ -68,7 +71,18 @@ static void __init celleb_init_direct_ma

                                     ioid, DMA_FLAGS);
        }
  
                                     ioid, DMA_FLAGS);
        }
  


@@ -49626,7 +49902,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/iommu
  }
  
  static int celleb_of_bus_notify(struct notifier_block *nb,
  }
  
  static int celleb_of_bus_notify(struct notifier_block *nb,

-@@ -80,7 +94,7 @@
+@@ -80,7 +94,7 @@ static int celleb_of_bus_notify(struct n

        if (action != BUS_NOTIFY_ADD_DEVICE)
                return 0;
  
        if (action != BUS_NOTIFY_ADD_DEVICE)
                return 0;
  


@@ -49635,7 +49911,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/iommu
  
        return 0;
  }
  
        return 0;
  }

-@@ -91,14 +105,12 @@
+@@ -91,14 +105,12 @@ static struct notifier_block celleb_of_b

  
  static int __init celleb_init_iommu(void)
  {
  
  static int __init celleb_init_iommu(void)
  {


@@ -49652,9 +49928,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/iommu
  
 -arch_initcall(celleb_init_iommu);
 +machine_arch_initcall(celleb_beat, celleb_init_iommu);
  
 -arch_initcall(celleb_init_iommu);
 +machine_arch_initcall(celleb_beat, celleb_init_iommu);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/pci.c powerpc.git/arch/powerpc/platforms/celleb/pci.c
---- linux-2.6.24/arch/powerpc/platforms/celleb/pci.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/celleb/pci.c    2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/celleb/pci.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/celleb/pci.c
++++ linux-2.6.24.7/arch/powerpc/platforms/celleb/pci.c

 @@ -31,6 +31,7 @@
  #include <linux/init.h>
  #include <linux/bootmem.h>
 @@ -31,6 +31,7 @@
  #include <linux/init.h>
  #include <linux/bootmem.h>


@@ -49663,7 +49940,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/pci.c
  #include <linux/of_device.h>
  
  #include <asm/io.h>
  #include <linux/of_device.h>
  
  #include <asm/io.h>

-@@ -138,8 +139,6 @@
+@@ -138,8 +139,6 @@ static void celleb_config_read_fake(unsi

                *val = celleb_fake_config_readl(p);
                break;
        }
                *val = celleb_fake_config_readl(p);
                break;
        }


@@ -49672,7 +49949,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/pci.c
  }
  
  static void celleb_config_write_fake(unsigned char *config, int where,
  }
  
  static void celleb_config_write_fake(unsigned char *config, int where,

-@@ -158,7 +157,6 @@
+@@ -158,7 +157,6 @@ static void celleb_config_write_fake(uns

                celleb_fake_config_writel(val, p);
                break;
        }
                celleb_fake_config_writel(val, p);
                break;
        }


@@ -49680,7 +49957,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/pci.c
  }
  
  static int celleb_fake_pci_read_config(struct pci_bus *bus,
  }
  
  static int celleb_fake_pci_read_config(struct pci_bus *bus,

-@@ -351,6 +349,10 @@
+@@ -351,6 +349,10 @@ static int __init celleb_setup_fake_pci_

        wi1 = of_get_property(node, "vendor-id", NULL);
        wi2 = of_get_property(node, "class-code", NULL);
        wi3 = of_get_property(node, "revision-id", NULL);
        wi1 = of_get_property(node, "vendor-id", NULL);
        wi2 = of_get_property(node, "class-code", NULL);
        wi3 = of_get_property(node, "revision-id", NULL);


@@ -49691,7 +49968,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/pci.c
  
        celleb_config_write_fake(*config, PCI_DEVICE_ID, 2, wi0[0] & 0xffff);
        celleb_config_write_fake(*config, PCI_VENDOR_ID, 2, wi1[0] & 0xffff);
  
        celleb_config_write_fake(*config, PCI_DEVICE_ID, 2, wi0[0] & 0xffff);
        celleb_config_write_fake(*config, PCI_VENDOR_ID, 2, wi1[0] & 0xffff);

-@@ -372,6 +374,10 @@
+@@ -372,6 +374,10 @@ static int __init celleb_setup_fake_pci_

        celleb_setup_pci_base_addrs(hose, devno, fn, num_base_addr);
  
        li = of_get_property(node, "interrupts", &rlen);
        celleb_setup_pci_base_addrs(hose, devno, fn, num_base_addr);
  
        li = of_get_property(node, "interrupts", &rlen);


@@ -49702,7 +49979,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/pci.c
        val = li[0];
        celleb_config_write_fake(*config, PCI_INTERRUPT_PIN, 1, 1);
        celleb_config_write_fake(*config, PCI_INTERRUPT_LINE, 1, val);
        val = li[0];
        celleb_config_write_fake(*config, PCI_INTERRUPT_PIN, 1, 1);
        celleb_config_write_fake(*config, PCI_INTERRUPT_LINE, 1, val);

-@@ -475,7 +481,7 @@
+@@ -475,7 +481,7 @@ static struct of_device_id celleb_phb_ma

  
  int __init celleb_setup_phb(struct pci_controller *phb)
  {
  
  int __init celleb_setup_phb(struct pci_controller *phb)
  {


@@ -49711,10 +49988,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/pci.c
        const struct of_device_id *match;
        int (*setup_func)(struct device_node *, struct pci_controller *);
  
        const struct of_device_id *match;
        int (*setup_func)(struct device_node *, struct pci_controller *);
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/scc_epci.c powerpc.git/arch/powerpc/platforms/celleb/scc_epci.c
---- linux-2.6.24/arch/powerpc/platforms/celleb/scc_epci.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/celleb/scc_epci.c       2008-01-28 20:25:49.000000000 +0100
-@@ -95,7 +95,7 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/celleb/scc_epci.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/celleb/scc_epci.c
++++ linux-2.6.24.7/arch/powerpc/platforms/celleb/scc_epci.c
+@@ -95,7 +95,7 @@ void __init epci_workaround_init(struct 

        private->dummy_page_da = dma_map_single(hose->parent,
                celleb_dummy_page_va, PAGE_SIZE, DMA_FROM_DEVICE);
        if (private->dummy_page_da == DMA_ERROR_CODE) {
        private->dummy_page_da = dma_map_single(hose->parent,
                celleb_dummy_page_va, PAGE_SIZE, DMA_FROM_DEVICE);
        if (private->dummy_page_da == DMA_ERROR_CODE) {


@@ -49723,10 +50001,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/scc_e
                       "Map dummy page failed.\n");
                return;
        }
                       "Map dummy page failed.\n");
                return;
        }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/scc_uhc.c powerpc.git/arch/powerpc/platforms/celleb/scc_uhc.c
---- linux-2.6.24/arch/powerpc/platforms/celleb/scc_uhc.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/celleb/scc_uhc.c        2008-01-28 20:25:49.000000000 +0100
-@@ -47,7 +47,8 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/celleb/scc_uhc.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/celleb/scc_uhc.c
++++ linux-2.6.24.7/arch/powerpc/platforms/celleb/scc_uhc.c
+@@ -47,7 +47,8 @@ static void enable_scc_uhc(struct pci_de

        u32 val = 0;
        int i;
  
        u32 val = 0;
        int i;
  


@@ -49736,9 +50015,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/scc_u
                return;
  
        uhc_base = ioremap(pci_resource_start(dev, 0),
                return;
  
        uhc_base = ioremap(pci_resource_start(dev, 0),

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/setup.c powerpc.git/arch/powerpc/platforms/celleb/setup.c
---- linux-2.6.24/arch/powerpc/platforms/celleb/setup.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/celleb/setup.c  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/celleb/setup.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/celleb/setup.c
++++ linux-2.6.24.7/arch/powerpc/platforms/celleb/setup.c

 @@ -40,6 +40,7 @@
  #include <linux/seq_file.h>
  #include <linux/root_dev.h>
 @@ -40,6 +40,7 @@
  #include <linux/seq_file.h>
  #include <linux/root_dev.h>


@@ -49765,7 +50045,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/setup
  
  static char celleb_machine_type[128] = "Celleb";
  
  
  static char celleb_machine_type[128] = "Celleb";
  

-@@ -88,61 +93,122 @@
+@@ -88,61 +93,122 @@ static void celleb_progress(char *s, uns

        printk("*** %04x : %s\n", hex, s ? s : "");
  }
  
        printk("*** %04x : %s\n", hex, s ? s : "");
  }
  


@@ -49916,7 +50196,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/setup
        .show_cpuinfo           = celleb_show_cpuinfo,
        .restart                = beat_restart,
        .power_off              = beat_power_off,
        .show_cpuinfo           = celleb_show_cpuinfo,
        .restart                = beat_restart,
        .power_off              = beat_power_off,

-@@ -167,3 +233,26 @@
+@@ -167,3 +233,26 @@ define_machine(celleb) {

        .machine_crash_shutdown = default_machine_crash_shutdown,
  #endif
  };
        .machine_crash_shutdown = default_machine_crash_shutdown,
  #endif
  };


@@ -49943,10 +50223,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/setup
 +      .machine_crash_shutdown = default_machine_crash_shutdown,
 +#endif
 +};
 +      .machine_crash_shutdown = default_machine_crash_shutdown,
 +#endif
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/chrp/pci.c powerpc.git/arch/powerpc/platforms/chrp/pci.c
---- linux-2.6.24/arch/powerpc/platforms/chrp/pci.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/chrp/pci.c      2008-01-28 20:25:49.000000000 +0100
-@@ -198,7 +198,7 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/chrp/pci.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/chrp/pci.c
++++ linux-2.6.24.7/arch/powerpc/platforms/chrp/pci.c
+@@ -198,7 +198,7 @@ static void __init setup_peg2(struct pci

                printk ("RTAS supporting Pegasos OF not found, please upgrade"
                        " your firmware\n");
        }
                printk ("RTAS supporting Pegasos OF not found, please upgrade"
                        " your firmware\n");
        }


@@ -49955,10 +50236,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/chrp/pci.c p
        /* keep the reference to the root node */
  }
  
        /* keep the reference to the root node */
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/chrp/setup.c powerpc.git/arch/powerpc/platforms/chrp/setup.c
---- linux-2.6.24/arch/powerpc/platforms/chrp/setup.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/chrp/setup.c    2008-01-28 20:25:49.000000000 +0100
-@@ -115,7 +115,7 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/chrp/setup.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/chrp/setup.c
++++ linux-2.6.24.7/arch/powerpc/platforms/chrp/setup.c
+@@ -115,7 +115,7 @@ void chrp_show_cpuinfo(struct seq_file *

        seq_printf(m, "machine\t\t: CHRP %s\n", model);
  
        /* longtrail (goldengate) stuff */
        seq_printf(m, "machine\t\t: CHRP %s\n", model);
  
        /* longtrail (goldengate) stuff */


@@ -49967,7 +50249,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/chrp/setup.c
                /* VLSI VAS96011/12 `Golden Gate 2' */
                /* Memory banks */
                sdramen = (in_le32(gg2_pci_config_base + GG2_PCI_DRAM_CTRL)
                /* VLSI VAS96011/12 `Golden Gate 2' */
                /* Memory banks */
                sdramen = (in_le32(gg2_pci_config_base + GG2_PCI_DRAM_CTRL)

-@@ -203,15 +203,20 @@
+@@ -203,15 +203,20 @@ static void __init sio_fixup_irq(const c

  static void __init sio_init(void)
  {
        struct device_node *root;
  static void __init sio_init(void)
  {
        struct device_node *root;


@@ -49991,7 +50273,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/chrp/setup.c
        of_node_put(root);
  }
  
        of_node_put(root);
  }
  

-@@ -251,6 +256,57 @@
+@@ -251,6 +256,57 @@ static void briq_restart(char *cmd)

        for(;;);
  }
  
        for(;;);
  }
  


@@ -50049,7 +50331,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/chrp/setup.c
  void __init chrp_setup_arch(void)
  {
        struct device_node *root = of_find_node_by_path("/");
  void __init chrp_setup_arch(void)
  {
        struct device_node *root = of_find_node_by_path("/");

-@@ -594,6 +650,7 @@
+@@ -594,6 +650,7 @@ define_machine(chrp) {

        .probe                  = chrp_probe,
        .setup_arch             = chrp_setup_arch,
        .init                   = chrp_init2,
        .probe                  = chrp_probe,
        .setup_arch             = chrp_setup_arch,
        .init                   = chrp_init2,


@@ -50057,10 +50339,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/chrp/setup.c
        .show_cpuinfo           = chrp_show_cpuinfo,
        .init_IRQ               = chrp_init_IRQ,
        .restart                = rtas_restart,
        .show_cpuinfo           = chrp_show_cpuinfo,
        .init_IRQ               = chrp_init_IRQ,
        .restart                = rtas_restart,

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/embedded6xx/Kconfig powerpc.git/arch/powerpc/platforms/embedded6xx/Kconfig
---- linux-2.6.24/arch/powerpc/platforms/embedded6xx/Kconfig    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/embedded6xx/Kconfig     2008-01-28 20:25:49.000000000 +0100
-@@ -9,6 +9,8 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/embedded6xx/Kconfig
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/embedded6xx/Kconfig
++++ linux-2.6.24.7/arch/powerpc/platforms/embedded6xx/Kconfig
+@@ -9,6 +9,8 @@ config LINKSTATION

        select FSL_SOC
        select PPC_UDBG_16550 if SERIAL_8250
        select DEFAULT_UIMAGE
        select FSL_SOC
        select PPC_UDBG_16550 if SERIAL_8250
        select DEFAULT_UIMAGE


@@ -50069,7 +50352,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/embedded6xx/
        help
          Select LINKSTATION if configuring for one of PPC- (MPC8241)
          based NAS systems from Buffalo Technology. So far only
        help
          Select LINKSTATION if configuring for one of PPC- (MPC8241)
          based NAS systems from Buffalo Technology. So far only

-@@ -16,6 +18,19 @@
+@@ -16,6 +18,19 @@ config LINKSTATION

          Linkstation-I HD-HLAN and HD-HGLAN versions, and PPC-based
          Terastation systems should be supported too.
  
          Linkstation-I HD-HLAN and HD-HGLAN versions, and PPC-based
          Terastation systems should be supported too.
  


@@ -50089,7 +50372,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/embedded6xx/
  config MPC7448HPC2
        bool "Freescale MPC7448HPC2(Taiga)"
        depends on EMBEDDED6xx
  config MPC7448HPC2
        bool "Freescale MPC7448HPC2(Taiga)"
        depends on EMBEDDED6xx

-@@ -23,6 +38,7 @@
+@@ -23,6 +38,7 @@ config MPC7448HPC2

        select DEFAULT_UIMAGE
        select PPC_UDBG_16550
        select WANT_DEVICE_TREE
        select DEFAULT_UIMAGE
        select PPC_UDBG_16550
        select WANT_DEVICE_TREE


@@ -50097,7 +50380,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/embedded6xx/
        help
          Select MPC7448HPC2 if configuring for Freescale MPC7448HPC2 (Taiga)
          platform
        help
          Select MPC7448HPC2 if configuring for Freescale MPC7448HPC2 (Taiga)
          platform

-@@ -33,6 +49,7 @@
+@@ -33,6 +49,7 @@ config PPC_HOLLY

        select TSI108_BRIDGE
        select PPC_UDBG_16550
        select WANT_DEVICE_TREE
        select TSI108_BRIDGE
        select PPC_UDBG_16550
        select WANT_DEVICE_TREE


@@ -50105,7 +50388,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/embedded6xx/
        help
          Select PPC_HOLLY if configuring for an IBM 750GX/CL Eval
          Board with TSI108/9 bridge (Hickory/Holly)
        help
          Select PPC_HOLLY if configuring for an IBM 750GX/CL Eval
          Board with TSI108/9 bridge (Hickory/Holly)

-@@ -48,17 +65,13 @@
+@@ -48,17 +65,13 @@ config PPC_PRPMC2800

  
  config TSI108_BRIDGE
        bool
  
  config TSI108_BRIDGE
        bool


@@ -50123,7 +50406,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/embedded6xx/
  
  config MV64X60
        bool
  
  config MV64X60
        bool

-@@ -67,8 +80,6 @@
+@@ -67,8 +80,6 @@ config MV64X60

  
  config MPC10X_OPENPIC
        bool
  
  config MPC10X_OPENPIC
        bool


@@ -50132,9 +50415,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/embedded6xx/
  
  config MPC10X_STORE_GATHERING
        bool "Enable MPC10x store gathering"
  
  config MPC10X_STORE_GATHERING
        bool "Enable MPC10x store gathering"

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/embedded6xx/Makefile powerpc.git/arch/powerpc/platforms/embedded6xx/Makefile
---- linux-2.6.24/arch/powerpc/platforms/embedded6xx/Makefile   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/embedded6xx/Makefile    2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/embedded6xx/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/embedded6xx/Makefile
++++ linux-2.6.24.7/arch/powerpc/platforms/embedded6xx/Makefile

 @@ -3,5 +3,6 @@
  #
  obj-$(CONFIG_MPC7448HPC2)     += mpc7448_hpc2.o
 @@ -3,5 +3,6 @@
  #
  obj-$(CONFIG_MPC7448HPC2)     += mpc7448_hpc2.o


@@ -50142,9 +50426,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/embedded6xx/
 +obj-$(CONFIG_STORCENTER)      += storcenter.o
  obj-$(CONFIG_PPC_HOLLY)               += holly.o
  obj-$(CONFIG_PPC_PRPMC2800)   += prpmc2800.o
 +obj-$(CONFIG_STORCENTER)      += storcenter.o
  obj-$(CONFIG_PPC_HOLLY)               += holly.o
  obj-$(CONFIG_PPC_PRPMC2800)   += prpmc2800.o

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/embedded6xx/holly.c powerpc.git/arch/powerpc/platforms/embedded6xx/holly.c
---- linux-2.6.24/arch/powerpc/platforms/embedded6xx/holly.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/embedded6xx/holly.c     2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/embedded6xx/holly.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/embedded6xx/holly.c
++++ linux-2.6.24.7/arch/powerpc/platforms/embedded6xx/holly.c

 @@ -20,12 +20,12 @@
  #include <linux/console.h>
  #include <linux/delay.h>
 @@ -20,12 +20,12 @@
  #include <linux/console.h>
  #include <linux/delay.h>


@@ -50167,9 +50452,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/embedded6xx/
  
  #undef DEBUG
  
  
  #undef DEBUG
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c powerpc.git/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
---- linux-2.6.24/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
++++ linux-2.6.24.7/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c

 @@ -53,8 +53,6 @@
  
  #define MPC7448HPC2_PCI_CFG_PHYS 0xfb000000
 @@ -53,8 +53,6 @@
  
  #define MPC7448HPC2_PCI_CFG_PHYS 0xfb000000


@@ -50179,9 +50465,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/embedded6xx/
  int mpc7448_hpc2_exclude_device(struct pci_controller *hose,
                                u_char bus, u_char devfn)
  {
  int mpc7448_hpc2_exclude_device(struct pci_controller *hose,
                                u_char bus, u_char devfn)
  {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/embedded6xx/storcenter.c powerpc.git/arch/powerpc/platforms/embedded6xx/storcenter.c
---- linux-2.6.24/arch/powerpc/platforms/embedded6xx/storcenter.c       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/embedded6xx/storcenter.c        2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/embedded6xx/storcenter.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/platforms/embedded6xx/storcenter.c

 @@ -0,0 +1,192 @@
 +/*
 + * Board setup routines for the storcenter
 @@ -0,0 +1,192 @@
 +/*
 + * Board setup routines for the storcenter


@@ -50375,10 +50662,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/embedded6xx/
 +      .restart                = storcenter_restart,
 +      .calibrate_decr         = generic_calibrate_decr,
 +};
 +      .restart                = storcenter_restart,
 +      .calibrate_decr         = generic_calibrate_decr,
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/Makefile powerpc.git/arch/powerpc/platforms/iseries/Makefile
---- linux-2.6.24/arch/powerpc/platforms/iseries/Makefile       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/iseries/Makefile        2008-01-28 20:25:49.000000000 +0100
-@@ -5,7 +5,7 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/iseries/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/iseries/Makefile
++++ linux-2.6.24.7/arch/powerpc/platforms/iseries/Makefile
+@@ -5,7 +5,7 @@ extra-y += dt.o

  obj-y += exception.o
  obj-y += hvlog.o hvlpconfig.o lpardata.o setup.o dt_mod.o mf.o lpevents.o \
        hvcall.o proc.o htab.o iommu.o misc.o irq.o
  obj-y += exception.o
  obj-y += hvlog.o hvlpconfig.o lpardata.o setup.o dt_mod.o mf.o lpevents.o \
        hvcall.o proc.o htab.o iommu.o misc.o irq.o


@@ -50387,10 +50675,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/Make
  obj-$(CONFIG_SMP) += smp.o
  obj-$(CONFIG_VIOPATH) += viopath.o vio.o
  obj-$(CONFIG_MODULES) += ksyms.o
  obj-$(CONFIG_SMP) += smp.o
  obj-$(CONFIG_VIOPATH) += viopath.o vio.o
  obj-$(CONFIG_MODULES) += ksyms.o

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/iommu.c powerpc.git/arch/powerpc/platforms/iseries/iommu.c
---- linux-2.6.24/arch/powerpc/platforms/iseries/iommu.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/iseries/iommu.c 2008-01-28 20:25:49.000000000 +0100
-@@ -163,8 +163,10 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/iseries/iommu.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/iseries/iommu.c
++++ linux-2.6.24.7/arch/powerpc/platforms/iseries/iommu.c
+@@ -163,8 +163,10 @@ static struct iommu_table *iommu_table_f

                    (it->it_type == TCE_PCI) &&
                    (it->it_offset == tbl->it_offset) &&
                    (it->it_index == tbl->it_index) &&
                    (it->it_type == TCE_PCI) &&
                    (it->it_offset == tbl->it_offset) &&
                    (it->it_index == tbl->it_index) &&


@@ -50402,10 +50691,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/iomm
        }
        return NULL;
  }
        }
        return NULL;
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/lpevents.c powerpc.git/arch/powerpc/platforms/iseries/lpevents.c
---- linux-2.6.24/arch/powerpc/platforms/iseries/lpevents.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/iseries/lpevents.c      2008-01-28 20:25:49.000000000 +0100
-@@ -239,7 +239,7 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/iseries/lpevents.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/iseries/lpevents.c
++++ linux-2.6.24.7/arch/powerpc/platforms/iseries/lpevents.c
+@@ -239,7 +239,7 @@ int HvLpEvent_unregisterHandler(HvLpEven

                         * other CPUs, and that the deleted handler isn't
                         * still running on another CPU when we return.
                         */
                         * other CPUs, and that the deleted handler isn't
                         * still running on another CPU when we return.
                         */


@@ -50414,9 +50704,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/lpev
                        return 0;
                }
        }
                        return 0;
                }
        }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.c powerpc.git/arch/powerpc/platforms/iseries/pci.c
---- linux-2.6.24/arch/powerpc/platforms/iseries/pci.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/iseries/pci.c   2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/iseries/pci.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/iseries/pci.c
++++ linux-2.6.24.7/arch/powerpc/platforms/iseries/pci.c

 @@ -1,5 +1,6 @@
  /*
   * Copyright (C) 2001 Allan Trautman, IBM Corporation
 @@ -1,5 +1,6 @@
  /*
   * Copyright (C) 2001 Allan Trautman, IBM Corporation


@@ -50469,7 +50760,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.
  
  /*
   * Table defines
  
  /*
   * Table defines

-@@ -62,6 +62,7 @@
+@@ -62,6 +62,7 @@ static struct pci_ops iSeries_pci_ops;

  #define IOMM_TABLE_MAX_ENTRIES        1024
  #define IOMM_TABLE_ENTRY_SIZE 0x0000000000400000UL
  #define BASE_IO_MEMORY                0xE000000000000000UL
  #define IOMM_TABLE_MAX_ENTRIES        1024
  #define IOMM_TABLE_ENTRY_SIZE 0x0000000000400000UL
  #define BASE_IO_MEMORY                0xE000000000000000UL


@@ -50477,7 +50768,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.
  
  static unsigned long max_io_memory = BASE_IO_MEMORY;
  static long current_iomm_table_entry;
  
  static unsigned long max_io_memory = BASE_IO_MEMORY;
  static long current_iomm_table_entry;

-@@ -70,12 +71,237 @@
+@@ -70,12 +71,237 @@ static long current_iomm_table_entry;

   * Lookup Tables.
   */
  static struct device_node *iomm_table[IOMM_TABLE_MAX_ENTRIES];
   * Lookup Tables.
   */
  static struct device_node *iomm_table[IOMM_TABLE_MAX_ENTRIES];


@@ -50717,7 +51008,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.
   * iomm_table_allocate_entry
   *
   * Adds pci_dev entry in address translation table
   * iomm_table_allocate_entry
   *
   * Adds pci_dev entry in address translation table

-@@ -87,7 +313,7 @@
+@@ -87,7 +313,7 @@ static DEFINE_SPINLOCK(iomm_table_lock);

   * - CurrentIndex is incremented to keep track of the last entry.
   * - Builds the resource entry for allocated BARs.
   */
   * - CurrentIndex is incremented to keep track of the last entry.
   * - Builds the resource entry for allocated BARs.
   */


@@ -50726,7 +51017,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.
  {
        struct resource *bar_res = &dev->resource[bar_num];
        long bar_size = pci_resource_len(dev, bar_num);
  {
        struct resource *bar_res = &dev->resource[bar_num];
        long bar_size = pci_resource_len(dev, bar_num);

-@@ -101,7 +327,6 @@
+@@ -101,7 +327,6 @@ static void iomm_table_allocate_entry(st

         * Set Resource values.
         */
        spin_lock(&iomm_table_lock);
         * Set Resource values.
         */
        spin_lock(&iomm_table_lock);


@@ -50734,7 +51025,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.
        bar_res->start = BASE_IO_MEMORY +
                IOMM_TABLE_ENTRY_SIZE * current_iomm_table_entry;
        bar_res->end = bar_res->start + bar_size - 1;
        bar_res->start = BASE_IO_MEMORY +
                IOMM_TABLE_ENTRY_SIZE * current_iomm_table_entry;
        bar_res->end = bar_res->start + bar_size - 1;

-@@ -110,7 +335,8 @@
+@@ -110,7 +335,8 @@ static void iomm_table_allocate_entry(st

         */
        while (bar_size > 0 ) {
                iomm_table[current_iomm_table_entry] = dev->sysdata;
         */
        while (bar_size > 0 ) {
                iomm_table[current_iomm_table_entry] = dev->sysdata;


@@ -50744,7 +51035,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.
                bar_size -= IOMM_TABLE_ENTRY_SIZE;
                ++current_iomm_table_entry;
        }
                bar_size -= IOMM_TABLE_ENTRY_SIZE;
                ++current_iomm_table_entry;
        }

-@@ -130,7 +356,7 @@
+@@ -130,7 +356,7 @@ static void iomm_table_allocate_entry(st

   * - Loops through The Bar resources(0 - 5) including the ROM
   *   is resource(6).
   */
   * - Loops through The Bar resources(0 - 5) including the ROM
   *   is resource(6).
   */


@@ -50753,7 +51044,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.
  {
        int bar_num;
  
  {
        int bar_num;
  

-@@ -145,79 +371,19 @@
+@@ -145,79 +371,19 @@ static void allocate_device_bars(struct 

   * PCI: Read Vendor Failed 0x18.58.10 Rc: 0x00xx
   * PCI: Connect Bus Unit Failed 0x18.58.10 Rc: 0x00xx
   */
   * PCI: Read Vendor Failed 0x18.58.10 Rc: 0x00xx
   * PCI: Connect Bus Unit Failed 0x18.58.10 Rc: 0x00xx
   */


@@ -50838,7 +51129,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.
  {
        struct device_node *node;
  
  {
        struct device_node *node;
  

-@@ -230,22 +396,66 @@
+@@ -230,22 +396,66 @@ static struct device_node *find_Device_N

        return NULL;
  }
  
        return NULL;
  }
  


@@ -50915,7 +51206,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.
  
  /*
   * Config space read and write functions.
  
  /*
   * Config space read and write functions.

-@@ -269,7 +479,7 @@
+@@ -269,7 +479,7 @@ static u64 hv_cfg_write_func[4] = {

  static int iSeries_pci_read_config(struct pci_bus *bus, unsigned int devfn,
                int offset, int size, u32 *val)
  {
  static int iSeries_pci_read_config(struct pci_bus *bus, unsigned int devfn,
                int offset, int size, u32 *val)
  {


@@ -50924,7 +51215,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.
        u64 fn;
        struct HvCallPci_LoadReturn ret;
  
        u64 fn;
        struct HvCallPci_LoadReturn ret;
  

-@@ -299,7 +509,7 @@
+@@ -299,7 +509,7 @@ static int iSeries_pci_read_config(struc

  static int iSeries_pci_write_config(struct pci_bus *bus, unsigned int devfn,
                int offset, int size, u32 val)
  {
  static int iSeries_pci_write_config(struct pci_bus *bus, unsigned int devfn,
                int offset, int size, u32 val)
  {


@@ -50933,7 +51224,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.
        u64 fn;
        u64 ret;
  
        u64 fn;
        u64 ret;
  

-@@ -331,22 +541,22 @@
+@@ -331,22 +541,22 @@ static struct pci_ops iSeries_pci_ops = 

   * PCI: Device 23.90 ReadL Retry( 1)
   * PCI: Device 23.90 ReadL Retry Successful(1)
   */
   * PCI: Device 23.90 ReadL Retry( 1)
   * PCI: Device 23.90 ReadL Retry Successful(1)
   */


@@ -50961,7 +51252,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.
                        mf_display_src(0xB6000103);
                        panic_timeout = 0;
                        panic("PCI: Hardware I/O Error, SRC B6000103, "
                        mf_display_src(0xB6000103);
                        panic_timeout = 0;
                        panic("PCI: Hardware I/O Error, SRC B6000103, "

-@@ -363,28 +573,39 @@
+@@ -363,28 +573,39 @@ static int CheckReturnCode(char *TextHdr

   * the exposure of being device global.
   */
  static inline struct device_node *xlate_iomm_address(
   * the exposure of being device global.
   */
  static inline struct device_node *xlate_iomm_address(


@@ -51019,7 +51310,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.
  }
  
  /*
  }
  
  /*

-@@ -392,91 +613,58 @@
+@@ -392,91 +613,58 @@ static inline struct device_node *xlate_

   * On MM I/O error, all ones are returned and iSeries_pci_IoError is cal
   * else, data is returned in Big Endian format.
   */
   * On MM I/O error, all ones are returned and iSeries_pci_IoError is cal
   * else, data is returned in Big Endian format.
   */


@@ -51132,7 +51423,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.
  
        return ret.value;
  }
  
        return ret.value;
  }

-@@ -485,134 +673,72 @@
+@@ -485,134 +673,72 @@ static u32 iSeries_Read_Long(const volat

   * Write MM I/O Instructions for the iSeries
   *
   */
   * Write MM I/O Instructions for the iSeries
   *
   */


@@ -51292,7 +51583,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.
  }
  
  static void iseries_readsb(const volatile void __iomem *addr, void *buf,
  }
  
  static void iseries_readsb(const volatile void __iomem *addr, void *buf,

-@@ -620,7 +746,7 @@
+@@ -620,7 +746,7 @@ static void iseries_readsb(const volatil

  {
        u8 *dst = buf;
        while(count-- > 0)
  {
        u8 *dst = buf;
        while(count-- > 0)


@@ -51301,7 +51592,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.
  }
  
  static void iseries_readsw(const volatile void __iomem *addr, void *buf,
  }
  
  static void iseries_readsw(const volatile void __iomem *addr, void *buf,

-@@ -628,7 +754,7 @@
+@@ -628,7 +754,7 @@ static void iseries_readsw(const volatil

  {
        u16 *dst = buf;
        while(count-- > 0)
  {
        u16 *dst = buf;
        while(count-- > 0)


@@ -51310,7 +51601,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.
  }
  
  static void iseries_readsl(const volatile void __iomem *addr, void *buf,
  }
  
  static void iseries_readsl(const volatile void __iomem *addr, void *buf,

-@@ -636,7 +762,7 @@
+@@ -636,7 +762,7 @@ static void iseries_readsl(const volatil

  {
        u32 *dst = buf;
        while(count-- > 0)
  {
        u32 *dst = buf;
        while(count-- > 0)


@@ -51319,7 +51610,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.
  }
  
  static void iseries_writesb(volatile void __iomem *addr, const void *buf,
  }
  
  static void iseries_writesb(volatile void __iomem *addr, const void *buf,

-@@ -644,7 +770,7 @@
+@@ -644,7 +770,7 @@ static void iseries_writesb(volatile voi

  {
        const u8 *src = buf;
        while(count-- > 0)
  {
        const u8 *src = buf;
        while(count-- > 0)


@@ -51328,7 +51619,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.
  }
  
  static void iseries_writesw(volatile void __iomem *addr, const void *buf,
  }
  
  static void iseries_writesw(volatile void __iomem *addr, const void *buf,

-@@ -652,7 +778,7 @@
+@@ -652,7 +778,7 @@ static void iseries_writesw(volatile voi

  {
        const u16 *src = buf;
        while(count-- > 0)
  {
        const u16 *src = buf;
        while(count-- > 0)


@@ -51337,7 +51628,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.
  }
  
  static void iseries_writesl(volatile void __iomem *addr, const void *buf,
  }
  
  static void iseries_writesl(volatile void __iomem *addr, const void *buf,

-@@ -660,7 +786,7 @@
+@@ -660,7 +786,7 @@ static void iseries_writesl(volatile voi

  {
        const u32 *src = buf;
        while(count-- > 0)
  {
        const u32 *src = buf;
        while(count-- > 0)


@@ -51346,7 +51637,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.
  }
  
  static void iseries_memset_io(volatile void __iomem *addr, int c,
  }
  
  static void iseries_memset_io(volatile void __iomem *addr, int c,

-@@ -669,7 +795,7 @@
+@@ -669,7 +795,7 @@ static void iseries_memset_io(volatile v

        volatile char __iomem *d = addr;
  
        while (n-- > 0)
        volatile char __iomem *d = addr;
  
        while (n-- > 0)


@@ -51355,7 +51646,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.
  }
  
  static void iseries_memcpy_fromio(void *dest, const volatile void __iomem *src,
  }
  
  static void iseries_memcpy_fromio(void *dest, const volatile void __iomem *src,

-@@ -679,7 +805,7 @@
+@@ -679,7 +805,7 @@ static void iseries_memcpy_fromio(void *

        const volatile char __iomem *s = src;
  
        while (n-- > 0)
        const volatile char __iomem *s = src;
  
        while (n-- > 0)


@@ -51364,7 +51655,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.
  }
  
  static void iseries_memcpy_toio(volatile void __iomem *dest, const void *src,
  }
  
  static void iseries_memcpy_toio(volatile void __iomem *dest, const void *src,

-@@ -689,7 +815,7 @@
+@@ -689,7 +815,7 @@ static void iseries_memcpy_toio(volatile

        volatile char __iomem *d = dest;
  
        while (n-- > 0)
        volatile char __iomem *d = dest;
  
        while (n-- > 0)


@@ -51373,7 +51664,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.
  }
  
  /* We only set MMIO ops. The default PIO ops will be default
  }
  
  /* We only set MMIO ops. The default PIO ops will be default

-@@ -742,6 +868,8 @@
+@@ -742,6 +868,8 @@ void __init iSeries_pcibios_init(void)

        /* Install IO hooks */
        ppc_pci_io = iseries_pci_io;
  
        /* Install IO hooks */
        ppc_pci_io = iseries_pci_io;
  


@@ -51382,7 +51673,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.
        /* iSeries has no IO space in the common sense, it needs to set
         * the IO base to 0
         */
        /* iSeries has no IO space in the common sense, it needs to set
         * the IO base to 0
         */

-@@ -767,11 +895,21 @@
+@@ -767,11 +895,21 @@ void __init iSeries_pcibios_init(void)

                phb = pcibios_alloc_controller(node);
                if (phb == NULL)
                        continue;
                phb = pcibios_alloc_controller(node);
                if (phb == NULL)
                        continue;


@@ -51405,9 +51696,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.
        }
  
        of_node_put(root);
        }
  
        of_node_put(root);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.h powerpc.git/arch/powerpc/platforms/iseries/pci.h
---- linux-2.6.24/arch/powerpc/platforms/iseries/pci.h  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/iseries/pci.h   2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/iseries/pci.h
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/iseries/pci.h
++++ linux-2.6.24.7/arch/powerpc/platforms/iseries/pci.h

 @@ -30,10 +30,6 @@
   * End Change Activity
   */
 @@ -30,10 +30,6 @@
   * End Change Activity
   */


@@ -51419,7 +51711,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.
  /*
   * Decodes Linux DevFn to iSeries DevFn, bridge device, or function.
   * For Linux, see PCI_SLOT and PCI_FUNC in include/linux/pci.h
  /*
   * Decodes Linux DevFn to iSeries DevFn, bridge device, or function.
   * For Linux, see PCI_SLOT and PCI_FUNC in include/linux/pci.h

-@@ -47,17 +43,16 @@
+@@ -47,17 +43,16 @@ struct pci_dev;                            /* For Forward Refere

  #define ISERIES_GET_DEVICE_FROM_SUBBUS(subbus)                ((subbus >> 5) & 0x7)
  #define ISERIES_GET_FUNCTION_FROM_SUBBUS(subbus)      ((subbus >> 2) & 0x7)
  
  #define ISERIES_GET_DEVICE_FROM_SUBBUS(subbus)                ((subbus >> 5) & 0x7)
  #define ISERIES_GET_FUNCTION_FROM_SUBBUS(subbus)      ((subbus >> 2) & 0x7)
  


@@ -51447,9 +51739,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.
 +#endif
  
  #endif /* _PLATFORMS_ISERIES_PCI_H */
 +#endif
  
  #endif /* _PLATFORMS_ISERIES_PCI_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/setup.c powerpc.git/arch/powerpc/platforms/iseries/setup.c
---- linux-2.6.24/arch/powerpc/platforms/iseries/setup.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/iseries/setup.c 2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/iseries/setup.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/iseries/setup.c
++++ linux-2.6.24.7/arch/powerpc/platforms/iseries/setup.c

 @@ -63,6 +63,7 @@
  #include "main_store.h"
  #include "call_sm.h"
 @@ -63,6 +63,7 @@
  #include "main_store.h"
  #include "call_sm.h"


@@ -51470,7 +51763,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/setu
  
  
  struct MemoryBlock {
  
  
  struct MemoryBlock {

-@@ -112,13 +108,13 @@
+@@ -112,13 +108,13 @@ static unsigned long iSeries_process_Con

         * correctly.
         */
        mb_array[0].logicalStart = 0;
         * correctly.
         */
        mb_array[0].logicalStart = 0;


@@ -51487,7 +51780,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/setu
                holeStart = addr_to_chunk(holeStart);
                holeFirstChunk = holeStart;
                holeSize = addr_to_chunk(holeSize);
                holeStart = addr_to_chunk(holeStart);
                holeFirstChunk = holeStart;
                holeSize = addr_to_chunk(holeSize);

-@@ -128,9 +124,9 @@
+@@ -128,9 +124,9 @@ static unsigned long iSeries_process_Con

                mb_array[0].logicalEnd = holeFirstChunk;
                mb_array[0].absEnd = holeFirstChunk;
                mb_array[1].logicalStart = holeFirstChunk;
                mb_array[0].logicalEnd = holeFirstChunk;
                mb_array[0].absEnd = holeFirstChunk;
                mb_array[1].logicalStart = holeFirstChunk;


@@ -51499,7 +51792,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/setu
        }
        return numMemoryBlocks;
  }
        }
        return numMemoryBlocks;
  }

-@@ -234,9 +230,9 @@
+@@ -234,9 +230,9 @@ static unsigned long iSeries_process_Reg

                                mb_array[i].logicalEnd,
                                mb_array[i].absStart, mb_array[i].absEnd);
                mb_array[i].absStart = addr_to_chunk(mb_array[i].absStart &
                                mb_array[i].logicalEnd,
                                mb_array[i].absStart, mb_array[i].absEnd);
                mb_array[i].absStart = addr_to_chunk(mb_array[i].absStart &


@@ -51511,7 +51804,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/setu
                mb_array[i].logicalStart =
                        addr_to_chunk(mb_array[i].logicalStart);
                mb_array[i].logicalEnd = addr_to_chunk(mb_array[i].logicalEnd);
                mb_array[i].logicalStart =
                        addr_to_chunk(mb_array[i].logicalStart);
                mb_array[i].logicalEnd = addr_to_chunk(mb_array[i].logicalEnd);

-@@ -320,7 +316,7 @@
+@@ -320,7 +316,7 @@ struct mschunks_map mschunks_map = {

  };
  EXPORT_SYMBOL(mschunks_map);
  
  };
  EXPORT_SYMBOL(mschunks_map);
  


@@ -51520,7 +51813,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/setu
  {
        klimit = _ALIGN(klimit, sizeof(u32));
        mschunks_map.mapping = (u32 *)klimit;
  {
        klimit = _ALIGN(klimit, sizeof(u32));
        mschunks_map.mapping = (u32 *)klimit;

-@@ -499,6 +495,8 @@
+@@ -499,6 +495,8 @@ static void __init iSeries_setup_arch(vo

                        itVpdAreas.xSlicMaxLogicalProcs);
        printk("Max physical processors = %d\n",
                        itVpdAreas.xSlicMaxPhysicalProcs);
                        itVpdAreas.xSlicMaxLogicalProcs);
        printk("Max physical processors = %d\n",
                        itVpdAreas.xSlicMaxPhysicalProcs);


@@ -51529,7 +51822,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/setu
  }
  
  static void iSeries_show_cpuinfo(struct seq_file *m)
  }
  
  static void iSeries_show_cpuinfo(struct seq_file *m)

-@@ -641,24 +639,25 @@
+@@ -641,24 +639,25 @@ static int __init iseries_probe(void)

  }
  
  define_machine(iseries) {
  }
  
  define_machine(iseries) {


@@ -51573,9 +51866,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/setu
        /* XXX Implement enable_pmcs for iSeries */
  };
  
        /* XXX Implement enable_pmcs for iSeries */
  };
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/setup.h powerpc.git/arch/powerpc/platforms/iseries/setup.h
---- linux-2.6.24/arch/powerpc/platforms/iseries/setup.h        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/iseries/setup.h 2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/iseries/setup.h
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/iseries/setup.h
++++ linux-2.6.24.7/arch/powerpc/platforms/iseries/setup.h

 @@ -17,6 +17,7 @@
  #ifndef       __ISERIES_SETUP_H__
  #define       __ISERIES_SETUP_H__
 @@ -17,6 +17,7 @@
  #ifndef       __ISERIES_SETUP_H__
  #define       __ISERIES_SETUP_H__


@@ -51584,9 +51878,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/setu
  extern unsigned long iSeries_get_boot_time(void);
  extern int iSeries_set_rtc_time(struct rtc_time *tm);
  extern void iSeries_get_rtc_time(struct rtc_time *tm);
  extern unsigned long iSeries_get_boot_time(void);
  extern int iSeries_set_rtc_time(struct rtc_time *tm);
  extern void iSeries_get_rtc_time(struct rtc_time *tm);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/vpdinfo.c powerpc.git/arch/powerpc/platforms/iseries/vpdinfo.c
---- linux-2.6.24/arch/powerpc/platforms/iseries/vpdinfo.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/iseries/vpdinfo.c       1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/iseries/vpdinfo.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/iseries/vpdinfo.c
++++ /dev/null

 @@ -1,275 +0,0 @@
 -/*
 - * This code gets the card location of the hardware
 @@ -1,275 +0,0 @@
 -/*
 - * This code gets the card location of the hardware


@@ -51863,9 +52158,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/vpdi
 -                      card, (int)(PciDev->class >> 8));
 -      }
 -}
 -                      card, (int)(PciDev->class >> 8));
 -      }
 -}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/maple/Kconfig powerpc.git/arch/powerpc/platforms/maple/Kconfig
---- linux-2.6.24/arch/powerpc/platforms/maple/Kconfig  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/maple/Kconfig   2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/maple/Kconfig
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/maple/Kconfig
++++ linux-2.6.24.7/arch/powerpc/platforms/maple/Kconfig

 @@ -1,6 +1,7 @@
  config PPC_MAPLE
        depends on PPC_MULTIPLATFORM && PPC64
 @@ -1,6 +1,7 @@
  config PPC_MAPLE
        depends on PPC_MULTIPLATFORM && PPC64


@@ -51874,10 +52170,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/maple/Kconfi
        select MPIC
        select U3_DART
        select MPIC_U3_HT_IRQS
        select MPIC
        select U3_DART
        select MPIC_U3_HT_IRQS

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/maple/pci.c powerpc.git/arch/powerpc/platforms/maple/pci.c
---- linux-2.6.24/arch/powerpc/platforms/maple/pci.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/maple/pci.c     2008-01-28 20:25:49.000000000 +0100
-@@ -558,7 +558,7 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/maple/pci.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/maple/pci.c
++++ linux-2.6.24.7/arch/powerpc/platforms/maple/pci.c
+@@ -558,7 +558,7 @@ void __init maple_pci_init(void)

         * safe assumptions hopefully.
         */
        if (u3_agp) {
         * safe assumptions hopefully.
         */
        if (u3_agp) {


@@ -51886,9 +52183,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/maple/pci.c
                PCI_DN(np)->busno = 0xf0;
                for (np = np->child; np; np = np->sibling)
                        PCI_DN(np)->busno = 0xf0;
                PCI_DN(np)->busno = 0xf0;
                for (np = np->child; np; np = np->sibling)
                        PCI_DN(np)->busno = 0xf0;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/maple/setup.c powerpc.git/arch/powerpc/platforms/maple/setup.c
---- linux-2.6.24/arch/powerpc/platforms/maple/setup.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/maple/setup.c   2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/maple/setup.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/maple/setup.c
++++ linux-2.6.24.7/arch/powerpc/platforms/maple/setup.c

 @@ -42,6 +42,7 @@
  #include <linux/serial.h>
  #include <linux/smp.h>
 @@ -42,6 +42,7 @@
  #include <linux/serial.h>
  #include <linux/smp.h>


@@ -51905,10 +52203,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/maple/setup.
  #include <asm/lmb.h>
  #include <asm/mpic.h>
  #include <asm/rtas.h>
  #include <asm/lmb.h>
  #include <asm/mpic.h>
  #include <asm/rtas.h>

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/Kconfig powerpc.git/arch/powerpc/platforms/pasemi/Kconfig
---- linux-2.6.24/arch/powerpc/platforms/pasemi/Kconfig 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pasemi/Kconfig  2008-01-28 20:25:49.000000000 +0100
-@@ -3,6 +3,7 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/pasemi/Kconfig
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/pasemi/Kconfig
++++ linux-2.6.24.7/arch/powerpc/platforms/pasemi/Kconfig
+@@ -3,6 +3,7 @@ config PPC_PASEMI

        bool "PA Semi SoC-based platforms"
        default n
        select MPIC
        bool "PA Semi SoC-based platforms"
        default n
        select MPIC


@@ -51916,7 +52215,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/Kconf
        select PPC_UDBG_16550
        select PPC_NATIVE
        select MPIC_BROKEN_REGREAD
        select PPC_UDBG_16550
        select PPC_NATIVE
        select MPIC_BROKEN_REGREAD

-@@ -17,7 +18,7 @@
+@@ -17,7 +18,7 @@ config PPC_PASEMI_IOMMU

        bool "PA Semi IOMMU support"
        depends on PPC_PASEMI
        help
        bool "PA Semi IOMMU support"
        depends on PPC_PASEMI
        help


@@ -51925,7 +52224,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/Kconf
  
  config PPC_PASEMI_IOMMU_DMA_FORCE
        bool "Force DMA engine to use IOMMU"
  
  config PPC_PASEMI_IOMMU_DMA_FORCE
        bool "Force DMA engine to use IOMMU"

-@@ -36,13 +37,4 @@
+@@ -36,13 +37,4 @@ config PPC_PASEMI_MDIO

        help
          Driver for MDIO via GPIO on PWRficient platforms
  
        help
          Driver for MDIO via GPIO on PWRficient platforms
  


@@ -51939,17 +52238,19 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/Kconf
 -      interface.
 -
  endmenu
 -      interface.
 -
  endmenu

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/Makefile powerpc.git/arch/powerpc/platforms/pasemi/Makefile
---- linux-2.6.24/arch/powerpc/platforms/pasemi/Makefile        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pasemi/Makefile 2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/pasemi/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/pasemi/Makefile
++++ linux-2.6.24.7/arch/powerpc/platforms/pasemi/Makefile

 @@ -1,4 +1,3 @@
  obj-y += setup.o pci.o time.o idle.o powersave.o iommu.o
  obj-$(CONFIG_PPC_PASEMI_MDIO) += gpio_mdio.o
 -obj-$(CONFIG_ELECTRA_IDE) += electra_ide.o
  obj-$(CONFIG_PPC_PASEMI_CPUFREQ) += cpufreq.o
 @@ -1,4 +1,3 @@
  obj-y += setup.o pci.o time.o idle.o powersave.o iommu.o
  obj-$(CONFIG_PPC_PASEMI_MDIO) += gpio_mdio.o
 -obj-$(CONFIG_ELECTRA_IDE) += electra_ide.o
  obj-$(CONFIG_PPC_PASEMI_CPUFREQ) += cpufreq.o

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/cpufreq.c powerpc.git/arch/powerpc/platforms/pasemi/cpufreq.c
---- linux-2.6.24/arch/powerpc/platforms/pasemi/cpufreq.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pasemi/cpufreq.c        2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/pasemi/cpufreq.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/pasemi/cpufreq.c
++++ linux-2.6.24.7/arch/powerpc/platforms/pasemi/cpufreq.c

 @@ -32,6 +32,7 @@
  #include <asm/io.h>
  #include <asm/prom.h>
 @@ -32,6 +32,7 @@
  #include <asm/io.h>
  #include <asm/prom.h>


@@ -51958,7 +52259,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/cpufr
  
  #define SDCASR_REG            0x0100
  #define SDCASR_REG_STRIDE     0x1000
  
  #define SDCASR_REG            0x0100
  #define SDCASR_REG_STRIDE     0x1000

-@@ -124,6 +125,11 @@
+@@ -124,6 +125,11 @@ static void set_astate(int cpu, unsigned

        local_irq_restore(flags);
  }
  
        local_irq_restore(flags);
  }
  


@@ -51970,7 +52271,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/cpufr
  void restore_astate(int cpu)
  {
        set_astate(cpu, current_astate);
  void restore_astate(int cpu)
  {
        set_astate(cpu, current_astate);

-@@ -147,7 +153,10 @@
+@@ -147,7 +153,10 @@ static int pas_cpufreq_cpu_init(struct c

        if (!cpu)
                goto out;
  
        if (!cpu)
                goto out;
  


@@ -51982,7 +52283,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/cpufr
        if (!dn)
                goto out;
        err = of_address_to_resource(dn, 0, &res);
        if (!dn)
                goto out;
        err = of_address_to_resource(dn, 0, &res);

-@@ -160,7 +169,10 @@
+@@ -160,7 +169,10 @@ static int pas_cpufreq_cpu_init(struct c

                goto out;
        }
  
                goto out;
        }
  


@@ -51994,7 +52295,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/cpufr
        if (!dn) {
                err = -ENODEV;
                goto out_unmap_sdcasr;
        if (!dn) {
                err = -ENODEV;
                goto out_unmap_sdcasr;

-@@ -292,7 +304,8 @@
+@@ -292,7 +304,8 @@ static struct cpufreq_driver pas_cpufreq

  
  static int __init pas_cpufreq_init(void)
  {
  
  static int __init pas_cpufreq_init(void)
  {


@@ -52004,9 +52305,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/cpufr
                return -ENODEV;
  
        return cpufreq_register_driver(&pas_cpufreq_driver);
                return -ENODEV;
  
        return cpufreq_register_driver(&pas_cpufreq_driver);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/electra_ide.c powerpc.git/arch/powerpc/platforms/pasemi/electra_ide.c
---- linux-2.6.24/arch/powerpc/platforms/pasemi/electra_ide.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pasemi/electra_ide.c    1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/pasemi/electra_ide.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/pasemi/electra_ide.c
++++ /dev/null

 @@ -1,96 +0,0 @@
 -/*
 - * Copyright (C) 2007 PA Semi, Inc
 @@ -1,96 +0,0 @@
 -/*
 - * Copyright (C) 2007 PA Semi, Inc


@@ -52104,9 +52406,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/elect
 -MODULE_LICENSE("GPL");
 -MODULE_AUTHOR ("Olof Johansson <olof@lixom.net>");
 -MODULE_DESCRIPTION("PA Semi Electra IDE driver");
 -MODULE_LICENSE("GPL");
 -MODULE_AUTHOR ("Olof Johansson <olof@lixom.net>");
 -MODULE_DESCRIPTION("PA Semi Electra IDE driver");

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/gpio_mdio.c powerpc.git/arch/powerpc/platforms/pasemi/gpio_mdio.c
---- linux-2.6.24/arch/powerpc/platforms/pasemi/gpio_mdio.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pasemi/gpio_mdio.c      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/pasemi/gpio_mdio.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/pasemi/gpio_mdio.c
++++ linux-2.6.24.7/arch/powerpc/platforms/pasemi/gpio_mdio.c

 @@ -30,7 +30,7 @@
  #include <linux/interrupt.h>
  #include <linux/phy.h>
 @@ -30,7 +30,7 @@
  #include <linux/interrupt.h>
  #include <linux/phy.h>


@@ -52116,7 +52419,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/gpio_
  
  #define DELAY 1
  
  
  #define DELAY 1
  

-@@ -218,45 +218,27 @@
+@@ -218,45 +218,27 @@ static int __devinit gpio_mdio_probe(str

                                     const struct of_device_id *match)
  {
        struct device *dev = &ofdev->dev;
                                     const struct of_device_id *match)
  {
        struct device *dev = &ofdev->dev;


@@ -52173,7 +52476,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/gpio_
  
        prop = of_get_property(np, "reg", NULL);
        new_bus->id = *prop;
  
        prop = of_get_property(np, "reg", NULL);
        new_bus->id = *prop;

-@@ -265,9 +247,24 @@
+@@ -265,9 +247,24 @@ static int __devinit gpio_mdio_probe(str

        new_bus->phy_mask = 0;
  
        new_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);
        new_bus->phy_mask = 0;
  
        new_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);


@@ -52200,7 +52503,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/gpio_
  
        prop = of_get_property(np, "mdc-pin", NULL);
        priv->mdc_pin = *prop;
  
        prop = of_get_property(np, "mdc-pin", NULL);
        priv->mdc_pin = *prop;

-@@ -280,17 +277,21 @@
+@@ -280,17 +277,21 @@ static int __devinit gpio_mdio_probe(str

  
        err = mdiobus_register(new_bus);
  
  
        err = mdiobus_register(new_bus);
  


@@ -52226,7 +52529,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/gpio_
        return err;
  }
  
        return err;
  }
  

-@@ -317,6 +318,7 @@
+@@ -317,6 +318,7 @@ static struct of_device_id gpio_mdio_mat

        },
        {},
  };
        },
        {},
  };


@@ -52234,7 +52537,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/gpio_
  
  static struct of_platform_driver gpio_mdio_driver =
  {
  
  static struct of_platform_driver gpio_mdio_driver =
  {

-@@ -330,12 +332,32 @@
+@@ -330,12 +332,32 @@ static struct of_platform_driver gpio_md

  
  int gpio_mdio_init(void)
  {
  
  int gpio_mdio_init(void)
  {


@@ -52268,10 +52571,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/gpio_
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Olof Johansson <olof@lixom.net>");
 +MODULE_DESCRIPTION("Driver for MDIO over GPIO on PA Semi PWRficient-based boards");
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Olof Johansson <olof@lixom.net>");
 +MODULE_DESCRIPTION("Driver for MDIO over GPIO on PA Semi PWRficient-based boards");

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/idle.c powerpc.git/arch/powerpc/platforms/pasemi/idle.c
---- linux-2.6.24/arch/powerpc/platforms/pasemi/idle.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pasemi/idle.c   2008-01-28 20:25:49.000000000 +0100
-@@ -74,9 +74,6 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/pasemi/idle.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/pasemi/idle.c
++++ linux-2.6.24.7/arch/powerpc/platforms/pasemi/idle.c
+@@ -74,9 +74,6 @@ static int pasemi_system_reset_exception

  
  static int __init pasemi_idle_init(void)
  {
  
  static int __init pasemi_idle_init(void)
  {


@@ -52281,7 +52585,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/idle.
  #ifndef CONFIG_PPC_PASEMI_CPUFREQ
        printk(KERN_WARNING "No cpufreq driver, powersavings modes disabled\n");
        current_mode = 0;
  #ifndef CONFIG_PPC_PASEMI_CPUFREQ
        printk(KERN_WARNING "No cpufreq driver, powersavings modes disabled\n");
        current_mode = 0;

-@@ -88,7 +85,7 @@
+@@ -88,7 +85,7 @@ static int __init pasemi_idle_init(void)

  
        return 0;
  }
  
        return 0;
  }


@@ -52290,10 +52594,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/idle.
  
  static int __init idle_param(char *p)
  {
  
  static int __init idle_param(char *p)
  {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/pasemi.h powerpc.git/arch/powerpc/platforms/pasemi/pasemi.h
---- linux-2.6.24/arch/powerpc/platforms/pasemi/pasemi.h        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pasemi/pasemi.h 2008-01-28 20:25:49.000000000 +0100
-@@ -16,8 +16,14 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/pasemi/pasemi.h
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/pasemi/pasemi.h
++++ linux-2.6.24.7/arch/powerpc/platforms/pasemi/pasemi.h
+@@ -16,8 +16,14 @@ extern void idle_doze(void);

  
  /* Restore astate to last set */
  #ifdef CONFIG_PPC_PASEMI_CPUFREQ
  
  /* Restore astate to last set */
  #ifdef CONFIG_PPC_PASEMI_CPUFREQ


@@ -52308,10 +52613,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/pasem
  static inline void restore_astate(int cpu)
  {
  }
  static inline void restore_astate(int cpu)
  {
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/powersave.S powerpc.git/arch/powerpc/platforms/pasemi/powersave.S
---- linux-2.6.24/arch/powerpc/platforms/pasemi/powersave.S     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pasemi/powersave.S      2008-01-28 20:25:49.000000000 +0100
-@@ -62,7 +62,16 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/pasemi/powersave.S
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/pasemi/powersave.S
++++ linux-2.6.24.7/arch/powerpc/platforms/pasemi/powersave.S
+@@ -62,7 +62,16 @@ sleep_common:

        mflr    r0
        std     r0, 16(r1)
        stdu    r1,-64(r1)
        mflr    r0
        std     r0, 16(r1)
        stdu    r1,-64(r1)


@@ -52328,7 +52634,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/power
        LOAD_REG_IMMEDIATE(r6,MSR_DR|MSR_IR|MSR_ME|MSR_EE)
        mfmsr   r4
        andc    r5,r4,r6
        LOAD_REG_IMMEDIATE(r6,MSR_DR|MSR_IR|MSR_ME|MSR_EE)
        mfmsr   r4
        andc    r5,r4,r6

-@@ -73,7 +82,7 @@
+@@ -73,7 +82,7 @@ sleep_common:

  
        mtmsrd  r4,0
  
  
        mtmsrd  r4,0
  


@@ -52337,9 +52643,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/power
        ld      r0,16(r1)
        mtlr    r0
        blr
        ld      r0,16(r1)
        mtlr    r0
        blr

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/setup.c powerpc.git/arch/powerpc/platforms/pasemi/setup.c
---- linux-2.6.24/arch/powerpc/platforms/pasemi/setup.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pasemi/setup.c  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/pasemi/setup.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/pasemi/setup.c
++++ linux-2.6.24.7/arch/powerpc/platforms/pasemi/setup.c

 @@ -27,6 +27,7 @@
  #include <linux/delay.h>
  #include <linux/console.h>
 @@ -27,6 +27,7 @@
  #include <linux/delay.h>
  #include <linux/console.h>


@@ -52368,7 +52675,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/setup
  /* SDC reset register, must be pre-mapped at reset time */
  static void __iomem *reset_reg;
  
  /* SDC reset register, must be pre-mapped at reset time */
  static void __iomem *reset_reg;
  

-@@ -56,10 +61,14 @@
+@@ -56,10 +61,14 @@ struct mce_regs {

  
  static struct mce_regs mce_regs[MAX_MCE_REGS];
  static int num_mce_regs;
  
  static struct mce_regs mce_regs[MAX_MCE_REGS];
  static int num_mce_regs;


@@ -52383,7 +52690,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/setup
        printk("Restarting...\n");
        while (1)
                out_le32(reset_reg, 0x6000000);
        printk("Restarting...\n");
        while (1)
                out_le32(reset_reg, 0x6000000);

-@@ -126,9 +135,6 @@
+@@ -126,9 +135,6 @@ static int __init pas_setup_mce_regs(voi

        struct pci_dev *dev;
        int reg;
  
        struct pci_dev *dev;
        int reg;
  


@@ -52393,7 +52700,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/setup
        /* Remap various SoC status registers for use by the MCE handler */
  
        reg = 0;
        /* Remap various SoC status registers for use by the MCE handler */
  
        reg = 0;

-@@ -172,7 +178,7 @@
+@@ -172,7 +178,7 @@ static int __init pas_setup_mce_regs(voi

  
        return 0;
  }
  
        return 0;
  }


@@ -52402,7 +52709,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/setup
  
  static __init void pas_init_IRQ(void)
  {
  
  static __init void pas_init_IRQ(void)
  {

-@@ -181,6 +187,8 @@
+@@ -181,6 +187,8 @@ static __init void pas_init_IRQ(void)

        unsigned long openpic_addr;
        const unsigned int *opprop;
        int naddr, opplen;
        unsigned long openpic_addr;
        const unsigned int *opprop;
        int naddr, opplen;


@@ -52411,7 +52718,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/setup
        struct mpic *mpic;
  
        mpic_node = NULL;
        struct mpic *mpic;
  
        mpic_node = NULL;

-@@ -213,13 +221,26 @@
+@@ -213,13 +221,26 @@ static __init void pas_init_IRQ(void)

        openpic_addr = of_read_number(opprop, naddr);
        printk(KERN_DEBUG "OpenPIC addr: %lx\n", openpic_addr);
  
        openpic_addr = of_read_number(opprop, naddr);
        printk(KERN_DEBUG "OpenPIC addr: %lx\n", openpic_addr);
  


@@ -52440,7 +52747,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/setup
        of_node_put(mpic_node);
        of_node_put(root);
  }
        of_node_put(mpic_node);
        of_node_put(root);
  }

-@@ -239,6 +260,14 @@
+@@ -239,6 +260,14 @@ static int pas_machine_check_handler(str

  
        srr0 = regs->nip;
        srr1 = regs->msr;
  
        srr0 = regs->nip;
        srr1 = regs->msr;


@@ -52455,7 +52762,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/setup
        dsisr = mfspr(SPRN_DSISR);
        printk(KERN_ERR "Machine Check on CPU %d\n", cpu);
        printk(KERN_ERR "SRR0  0x%016lx SRR1 0x%016lx\n", srr0, srr1);
        dsisr = mfspr(SPRN_DSISR);
        printk(KERN_ERR "Machine Check on CPU %d\n", cpu);
        printk(KERN_ERR "SRR0  0x%016lx SRR1 0x%016lx\n", srr0, srr1);

-@@ -295,14 +324,14 @@
+@@ -295,14 +324,14 @@ static int pas_machine_check_handler(str

                int i;
  
                printk(KERN_ERR "slb contents:\n");
                int i;
  
                printk(KERN_ERR "slb contents:\n");


@@ -52472,7 +52779,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/setup
        /* SRR1[62] is from MSR[62] if recoverable, so pass that back */
        return !!(srr1 & 0x2);
  }
        /* SRR1[62] is from MSR[62] if recoverable, so pass that back */
        return !!(srr1 & 0x2);
  }

-@@ -362,16 +391,17 @@
+@@ -362,16 +391,17 @@ static inline void pasemi_pcmcia_init(vo

  
  
  static struct of_device_id pasemi_bus_ids[] = {
  
  
  static struct of_device_id pasemi_bus_ids[] = {


@@ -52493,7 +52800,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/setup
        pasemi_pcmcia_init();
  
        /* Publish OF platform devices for SDC and other non-PCI devices */
        pasemi_pcmcia_init();
  
        /* Publish OF platform devices for SDC and other non-PCI devices */

-@@ -379,7 +409,7 @@
+@@ -379,7 +409,7 @@ static int __init pasemi_publish_devices

  
        return 0;
  }
  
        return 0;
  }


@@ -52502,7 +52809,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/setup
  
  
  /*
  
  
  /*

-@@ -389,7 +419,8 @@
+@@ -389,7 +419,8 @@ static int __init pas_probe(void)

  {
        unsigned long root = of_get_flat_dt_root();
  
  {
        unsigned long root = of_get_flat_dt_root();
  


@@ -52512,7 +52819,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/setup
                return 0;
  
        hpte_init_native();
                return 0;
  
        hpte_init_native();

-@@ -400,7 +431,7 @@
+@@ -400,7 +431,7 @@ static int __init pas_probe(void)

  }
  
  define_machine(pasemi) {
  }
  
  define_machine(pasemi) {


@@ -52521,10 +52828,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/setup
        .probe                  = pas_probe,
        .setup_arch             = pas_setup_arch,
        .init_early             = pas_init_early,
        .probe                  = pas_probe,
        .setup_arch             = pas_setup_arch,
        .init_early             = pas_init_early,

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/low_i2c.c powerpc.git/arch/powerpc/platforms/powermac/low_i2c.c
---- linux-2.6.24/arch/powerpc/platforms/powermac/low_i2c.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/powermac/low_i2c.c      2008-01-28 20:25:49.000000000 +0100
-@@ -585,8 +585,7 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/powermac/low_i2c.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/powermac/low_i2c.c
++++ linux-2.6.24.7/arch/powerpc/platforms/powermac/low_i2c.c
+@@ -585,8 +585,7 @@ static void __init kw_i2c_probe(void)

        struct device_node *np, *child, *parent;
  
        /* Probe keywest-i2c busses */
        struct device_node *np, *child, *parent;
  
        /* Probe keywest-i2c busses */


@@ -52534,7 +52842,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/low
                struct pmac_i2c_host_kw *host;
                int multibus, chans, i;
  
                struct pmac_i2c_host_kw *host;
                int multibus, chans, i;
  

-@@ -1462,9 +1461,6 @@
+@@ -1462,9 +1461,6 @@ int __init pmac_i2c_init(void)

                return 0;
        i2c_inited = 1;
  
                return 0;
        i2c_inited = 1;
  


@@ -52544,7 +52852,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/low
        /* Probe keywest-i2c busses */
        kw_i2c_probe();
  
        /* Probe keywest-i2c busses */
        kw_i2c_probe();
  

-@@ -1483,7 +1479,7 @@
+@@ -1483,7 +1479,7 @@ int __init pmac_i2c_init(void)

  
        return 0;
  }
  
        return 0;
  }


@@ -52553,15 +52861,16 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/low
  
  /* Since pmac_i2c_init can be called too early for the platform device
   * registration, we need to do it at a later time. In our case, subsys
  
  /* Since pmac_i2c_init can be called too early for the platform device
   * registration, we need to do it at a later time. In our case, subsys

-@@ -1515,4 +1511,4 @@
+@@ -1515,4 +1511,4 @@ static int __init pmac_i2c_create_platfo

  
        return 0;
  }
 -subsys_initcall(pmac_i2c_create_platform_devices);
 +machine_subsys_initcall(powermac, pmac_i2c_create_platform_devices);
  
        return 0;
  }
 -subsys_initcall(pmac_i2c_create_platform_devices);
 +machine_subsys_initcall(powermac, pmac_i2c_create_platform_devices);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pci.c powerpc.git/arch/powerpc/platforms/powermac/pci.c
---- linux-2.6.24/arch/powerpc/platforms/powermac/pci.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/powermac/pci.c  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/powermac/pci.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/powermac/pci.c
++++ linux-2.6.24.7/arch/powerpc/platforms/powermac/pci.c

 @@ -40,8 +40,6 @@
  static int has_uninorth;
  #ifdef CONFIG_PPC64
 @@ -40,8 +40,6 @@
  static int has_uninorth;
  #ifdef CONFIG_PPC64


@@ -52571,7 +52880,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pci
  #else
  static int has_second_ohare;
  #endif /* CONFIG_PPC64 */
  #else
  static int has_second_ohare;
  #endif /* CONFIG_PPC64 */

-@@ -314,12 +312,15 @@
+@@ -314,12 +312,15 @@ static int u3_ht_skip_device(struct pci_

  
        /* We only allow config cycles to devices that are in OF device-tree
         * as we are apparently having some weird things going on with some
  
        /* We only allow config cycles to devices that are in OF device-tree
         * as we are apparently having some weird things going on with some


@@ -52589,7 +52898,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pci
        for (dn = busdn->child; dn; dn = dn->sibling)
                if (PCI_DN(dn) && PCI_DN(dn)->devfn == devfn)
                        break;
        for (dn = busdn->child; dn; dn = dn->sibling)
                if (PCI_DN(dn) && PCI_DN(dn)->devfn == devfn)
                        break;

-@@ -344,14 +345,15 @@
+@@ -344,14 +345,15 @@ static int u3_ht_skip_device(struct pci_

                + (((unsigned int)bus) << 16) \
                + 0x01000000UL)
  
                + (((unsigned int)bus) << 16) \
                + 0x01000000UL)
  


@@ -52611,7 +52920,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pci
        } else
                return hose->cfg_data + U3_HT_CFA1(bus, devfn, offset);
  }
        } else
                return hose->cfg_data + U3_HT_CFA1(bus, devfn, offset);
  }

-@@ -360,14 +362,15 @@
+@@ -360,14 +362,15 @@ static int u3_ht_read_config(struct pci_

                                    int offset, int len, u32 *val)
  {
        struct pci_controller *hose;
                                    int offset, int len, u32 *val)
  {
        struct pci_controller *hose;


@@ -52629,7 +52938,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pci
        if (!addr)
                return PCIBIOS_DEVICE_NOT_FOUND;
  
        if (!addr)
                return PCIBIOS_DEVICE_NOT_FOUND;
  

-@@ -397,10 +400,10 @@
+@@ -397,10 +400,10 @@ static int u3_ht_read_config(struct pci_

                *val = in_8(addr);
                break;
        case 2:
                *val = in_8(addr);
                break;
        case 2:


@@ -52642,7 +52951,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pci
                break;
        }
        return PCIBIOS_SUCCESSFUL;
                break;
        }
        return PCIBIOS_SUCCESSFUL;

-@@ -410,14 +413,15 @@
+@@ -410,14 +413,15 @@ static int u3_ht_write_config(struct pci

                                     int offset, int len, u32 val)
  {
        struct pci_controller *hose;
                                     int offset, int len, u32 val)
  {
        struct pci_controller *hose;


@@ -52660,7 +52969,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pci
        if (!addr)
                return PCIBIOS_DEVICE_NOT_FOUND;
  
        if (!addr)
                return PCIBIOS_DEVICE_NOT_FOUND;
  

-@@ -439,10 +443,10 @@
+@@ -439,10 +443,10 @@ static int u3_ht_write_config(struct pci

                out_8(addr, val);
                break;
        case 2:
                out_8(addr, val);
                break;
        case 2:


@@ -52673,7 +52982,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pci
                break;
        }
        return PCIBIOS_SUCCESSFUL;
                break;
        }
        return PCIBIOS_SUCCESSFUL;

-@@ -725,7 +729,7 @@
+@@ -725,7 +729,7 @@ static void __init setup_bandit(struct p

  static int __init setup_uninorth(struct pci_controller *hose,
                                 struct resource *addr)
  {
  static int __init setup_uninorth(struct pci_controller *hose,
                                 struct resource *addr)
  {


@@ -52682,7 +52991,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pci
        has_uninorth = 1;
        hose->ops = &macrisc_pci_ops;
        hose->cfg_addr = ioremap(addr->start + 0x800000, 0x1000);
        has_uninorth = 1;
        hose->ops = &macrisc_pci_ops;
        hose->cfg_addr = ioremap(addr->start + 0x800000, 0x1000);

-@@ -773,31 +777,72 @@
+@@ -773,31 +777,72 @@ static void __init setup_u4_pcie(struct 

         */
        hose->first_busno = 0x00;
        hose->last_busno = 0xff;
         */
        hose->first_busno = 0x00;
        hose->last_busno = 0xff;


@@ -52770,7 +53079,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pci
         */
        hose->io_base_phys = 0xf4000000;
        hose->pci_io_size = 0x00400000;
         */
        hose->io_base_phys = 0xf4000000;
        hose->pci_io_size = 0x00400000;

-@@ -808,76 +853,33 @@
+@@ -808,76 +853,33 @@ static void __init setup_u3_ht(struct pc

        hose->pci_mem_offset = 0;
        hose->first_busno = 0;
        hose->last_busno = 0xef;
        hose->pci_mem_offset = 0;
        hose->first_busno = 0;
        hose->last_busno = 0xef;


@@ -52872,7 +53181,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pci
  }
  #endif /* CONFIG_PPC64 */
  
  }
  #endif /* CONFIG_PPC64 */
  

-@@ -994,6 +996,8 @@
+@@ -994,6 +996,8 @@ void __init pmac_pci_init(void)

        struct device_node *np, *root;
        struct device_node *ht = NULL;
  
        struct device_node *np, *root;
        struct device_node *ht = NULL;
  


@@ -52881,7 +53190,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pci
        root = of_find_node_by_path("/");
        if (root == NULL) {
                printk(KERN_CRIT "pmac_pci_init: can't find root "
        root = of_find_node_by_path("/");
        if (root == NULL) {
                printk(KERN_CRIT "pmac_pci_init: can't find root "

-@@ -1032,15 +1036,15 @@
+@@ -1032,15 +1036,15 @@ void __init pmac_pci_init(void)

         * future though
         */
        if (u3_agp) {
         * future though
         */
        if (u3_agp) {


@@ -52900,7 +53209,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pci
  
  #else /* CONFIG_PPC64 */
        init_p2pbridge();
  
  #else /* CONFIG_PPC64 */
        init_p2pbridge();

-@@ -1051,13 +1055,13 @@
+@@ -1051,13 +1055,13 @@ void __init pmac_pci_init(void)

         * some offset between bus number and domains for now when we
         * assign all busses should help for now
         */
         * some offset between bus number and domains for now when we
         * assign all busses should help for now
         */


@@ -52917,7 +53226,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pci
  {
        struct device_node* node;
        int updatecfg = 0;
  {
        struct device_node* node;
        int updatecfg = 0;

-@@ -1099,24 +1103,21 @@
+@@ -1099,24 +1103,21 @@ pmac_pci_enable_device_hook(struct pci_d

                updatecfg = 1;
        }
  
                updatecfg = 1;
        }
  


@@ -52949,7 +53258,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pci
                pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE,
                                      L1_CACHE_BYTES >> 2);
        }
                pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE,
                                      L1_CACHE_BYTES >> 2);
        }

-@@ -1124,6 +1125,18 @@
+@@ -1124,6 +1125,18 @@ pmac_pci_enable_device_hook(struct pci_d

        return 0;
  }
  
        return 0;
  }
  


@@ -52968,7 +53277,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pci
  /* We power down some devices after they have been probed. They'll
   * be powered back on later on
   */
  /* We power down some devices after they have been probed. They'll
   * be powered back on later on
   */

-@@ -1171,7 +1184,6 @@
+@@ -1171,7 +1184,6 @@ void __init pmac_pcibios_after_init(void

        of_node_put(nd);
  }
  
        of_node_put(nd);
  }
  


@@ -52976,7 +53285,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pci
  void pmac_pci_fixup_cardbus(struct pci_dev* dev)
  {
        if (!machine_is(powermac))
  void pmac_pci_fixup_cardbus(struct pci_dev* dev)
  {
        if (!machine_is(powermac))

-@@ -1259,7 +1271,7 @@
+@@ -1259,7 +1271,7 @@ void pmac_pci_fixup_pciata(struct pci_de

        }
  }
  DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, pmac_pci_fixup_pciata);
        }
  }
  DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, pmac_pci_fixup_pciata);


@@ -52985,10 +53294,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pci
  
  /*
   * Disable second function on K2-SATA, it's broken
  
  /*
   * Disable second function on K2-SATA, it's broken

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pfunc_base.c powerpc.git/arch/powerpc/platforms/powermac/pfunc_base.c
---- linux-2.6.24/arch/powerpc/platforms/powermac/pfunc_base.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/powermac/pfunc_base.c   2008-01-28 20:25:49.000000000 +0100
-@@ -363,8 +363,7 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/powermac/pfunc_base.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/powermac/pfunc_base.c
++++ linux-2.6.24.7/arch/powerpc/platforms/powermac/pfunc_base.c
+@@ -363,8 +363,7 @@ int __init pmac_pfunc_base_install(void)

  
        return 0;
  }
  
        return 0;
  }


@@ -52998,10 +53308,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pfu
  
  #ifdef CONFIG_PM
  
  
  #ifdef CONFIG_PM
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pic.c powerpc.git/arch/powerpc/platforms/powermac/pic.c
---- linux-2.6.24/arch/powerpc/platforms/powermac/pic.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/powermac/pic.c  2008-01-28 20:25:49.000000000 +0100
-@@ -690,6 +690,5 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/powermac/pic.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/powermac/pic.c
++++ linux-2.6.24.7/arch/powerpc/platforms/powermac/pic.c
+@@ -690,6 +690,5 @@ static int __init init_pmacpic_sysfs(voi

        sysdev_driver_register(&pmacpic_sysclass, &driver_pmacpic);
        return 0;
  }
        sysdev_driver_register(&pmacpic_sysclass, &driver_pmacpic);
        return 0;
  }


@@ -53009,10 +53320,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pic
 -subsys_initcall(init_pmacpic_sysfs);
 +machine_subsys_initcall(powermac, init_pmacpic_sysfs);
  
 -subsys_initcall(init_pmacpic_sysfs);
 +machine_subsys_initcall(powermac, init_pmacpic_sysfs);
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pmac.h powerpc.git/arch/powerpc/platforms/powermac/pmac.h
---- linux-2.6.24/arch/powerpc/platforms/powermac/pmac.h        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/powermac/pmac.h 2008-01-28 20:25:49.000000000 +0100
-@@ -26,7 +26,7 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/powermac/pmac.h
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/powermac/pmac.h
++++ linux-2.6.24.7/arch/powerpc/platforms/powermac/pmac.h
+@@ -26,7 +26,7 @@ extern void pmac_pci_init(void);

  extern void pmac_nvram_update(void);
  extern unsigned char pmac_nvram_read_byte(int addr);
  extern void pmac_nvram_write_byte(int addr, unsigned char val);
  extern void pmac_nvram_update(void);
  extern unsigned char pmac_nvram_read_byte(int addr);
  extern void pmac_nvram_write_byte(int addr, unsigned char val);


@@ -53021,9 +53333,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pma
  extern void pmac_pcibios_after_init(void);
  extern int of_show_percpuinfo(struct seq_file *m, int i);
  
  extern void pmac_pcibios_after_init(void);
  extern int of_show_percpuinfo(struct seq_file *m, int i);
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/setup.c powerpc.git/arch/powerpc/platforms/powermac/setup.c
---- linux-2.6.24/arch/powerpc/platforms/powermac/setup.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/powermac/setup.c        2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/powermac/setup.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/powermac/setup.c
++++ linux-2.6.24.7/arch/powerpc/platforms/powermac/setup.c

 @@ -51,6 +51,8 @@
  #include <linux/root_dev.h>
  #include <linux/bitops.h>
 @@ -51,6 +51,8 @@
  #include <linux/root_dev.h>
  #include <linux/bitops.h>


@@ -53042,7 +53355,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/set
  #include <asm/mmu_context.h>
  #include <asm/iommu.h>
  #include <asm/smu.h>
  #include <asm/mmu_context.h>
  #include <asm/iommu.h>
  #include <asm/smu.h>

-@@ -94,7 +94,6 @@
+@@ -94,7 +94,6 @@ extern struct machdep_calls pmac_md;

  #define DEFAULT_ROOT_DEVICE Root_SDA1 /* sda1 - slightly silly choice */
  
  #ifdef CONFIG_PPC64
  #define DEFAULT_ROOT_DEVICE Root_SDA1 /* sda1 - slightly silly choice */
  
  #ifdef CONFIG_PPC64


@@ -53050,7 +53363,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/set
  int sccdbg;
  #endif
  
  int sccdbg;
  #endif
  

-@@ -398,17 +397,13 @@
+@@ -398,17 +397,13 @@ static int initializing = 1;

  
  static int pmac_late_init(void)
  {
  
  static int pmac_late_init(void)
  {


@@ -53069,7 +53382,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/set
  
  /*
   * This is __init_refok because we check for "initializing" before
  
  /*
   * This is __init_refok because we check for "initializing" before

-@@ -535,9 +530,6 @@
+@@ -535,9 +530,6 @@ static int __init pmac_declare_of_platfo

        if (machine_is(chrp))
                return -1;
  
        if (machine_is(chrp))
                return -1;
  


@@ -53079,7 +53392,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/set
        np = of_find_node_by_name(NULL, "valkyrie");
        if (np)
                of_platform_device_create(np, "valkyrie", NULL);
        np = of_find_node_by_name(NULL, "valkyrie");
        if (np)
                of_platform_device_create(np, "valkyrie", NULL);

-@@ -552,8 +544,7 @@
+@@ -552,8 +544,7 @@ static int __init pmac_declare_of_platfo

  
        return 0;
  }
  
        return 0;
  }


@@ -53089,7 +53402,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/set
  
  /*
   * Called very early, MMU is off, device-tree isn't unflattened
  
  /*
   * Called very early, MMU is off, device-tree isn't unflattened

-@@ -613,9 +604,11 @@
+@@ -613,9 +604,11 @@ static int pmac_pci_probe_mode(struct pc

  
        /* We need to use normal PCI probing for the AGP bus,
         * since the device for the AGP bridge isn't in the tree.
  
        /* We need to use normal PCI probing for the AGP bus,
         * since the device for the AGP bridge isn't in the tree.


@@ -53102,10 +53415,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/set
                return PCI_PROBE_NORMAL;
        return PCI_PROBE_DEVTREE;
  }
                return PCI_PROBE_NORMAL;
        return PCI_PROBE_DEVTREE;
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/time.c powerpc.git/arch/powerpc/platforms/powermac/time.c
---- linux-2.6.24/arch/powerpc/platforms/powermac/time.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/powermac/time.c 2008-01-28 20:25:49.000000000 +0100
-@@ -84,12 +84,14 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/powermac/time.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/powermac/time.c
++++ linux-2.6.24.7/arch/powerpc/platforms/powermac/time.c
+@@ -84,12 +84,14 @@ long __init pmac_time_init(void)

        return delta;
  }
  
        return delta;
  }
  


@@ -53120,10 +53434,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/tim
  
  static unsigned long from_rtc_time(struct rtc_time *tm)
  {
  
  static unsigned long from_rtc_time(struct rtc_time *tm)
  {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/Kconfig powerpc.git/arch/powerpc/platforms/ps3/Kconfig
---- linux-2.6.24/arch/powerpc/platforms/ps3/Kconfig    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/ps3/Kconfig     2008-01-28 20:25:49.000000000 +0100
-@@ -61,17 +61,6 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/ps3/Kconfig
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/ps3/Kconfig
++++ linux-2.6.24.7/arch/powerpc/platforms/ps3/Kconfig
+@@ -61,17 +61,6 @@ config PS3_DYNAMIC_DMA

          This support is mainly for Linux kernel development.  If unsure,
          say N.
  
          This support is mainly for Linux kernel development.  If unsure,
          say N.
  


@@ -53141,7 +53456,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/Kconfig
  config PS3_VUART
        depends on PPC_PS3
        tristate
  config PS3_VUART
        depends on PPC_PS3
        tristate

-@@ -138,4 +127,17 @@
+@@ -138,4 +127,17 @@ config PS3_FLASH

          be disabled on the kernel command line using "ps3flash=off", to
          not allocate this fixed buffer.
  
          be disabled on the kernel command line using "ps3flash=off", to
          not allocate this fixed buffer.
  


@@ -53159,9 +53474,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/Kconfig
 +        oprofile and perfmon2, then say Y or M, otherwise say N.
 +
  endmenu
 +        oprofile and perfmon2, then say Y or M, otherwise say N.
 +
  endmenu

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/device-init.c powerpc.git/arch/powerpc/platforms/ps3/device-init.c
---- linux-2.6.24/arch/powerpc/platforms/ps3/device-init.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/ps3/device-init.c       2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/ps3/device-init.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/ps3/device-init.c
++++ linux-2.6.24.7/arch/powerpc/platforms/ps3/device-init.c

 @@ -23,6 +23,7 @@
  #include <linux/kernel.h>
  #include <linux/kthread.h>
 @@ -23,6 +23,7 @@
  #include <linux/kernel.h>
  #include <linux/kthread.h>


@@ -53260,7 +53576,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/device-i
  /**
   * ps3_setup_gelic_device - Setup and register a gelic device instance.
   *
  /**
   * ps3_setup_gelic_device - Setup and register a gelic device instance.
   *

-@@ -238,166 +322,6 @@
+@@ -238,166 +322,6 @@ static int __init ps3_setup_vuart_device

        return result;
  }
  
        return result;
  }
  


@@ -53427,7 +53743,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/device-i
  static int ps3_setup_storage_dev(const struct ps3_repository_device *repo,
                                 enum ps3_match_id match_id)
  {
  static int ps3_setup_storage_dev(const struct ps3_repository_device *repo,
                                 enum ps3_match_id match_id)
  {

-@@ -449,16 +373,6 @@
+@@ -449,16 +373,6 @@ static int ps3_setup_storage_dev(const s

                goto fail_find_interrupt;
        }
  
                goto fail_find_interrupt;
        }
  


@@ -53444,7 +53760,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/device-i
        for (i = 0; i < num_regions; i++) {
                unsigned int id;
                u64 start, size;
        for (i = 0; i < num_regions; i++) {
                unsigned int id;
                u64 start, size;

-@@ -494,7 +408,6 @@
+@@ -494,7 +408,6 @@ static int ps3_setup_storage_dev(const s

  
  fail_device_register:
  fail_read_region:
  
  fail_device_register:
  fail_read_region:


@@ -53452,7 +53768,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/device-i
  fail_find_interrupt:
        kfree(p);
  fail_malloc:
  fail_find_interrupt:
        kfree(p);
  fail_malloc:

-@@ -659,62 +572,268 @@
+@@ -659,62 +572,268 @@ static int ps3_register_repository_devic

        return result;
  }
  
        return result;
  }
  


@@ -53749,7 +54065,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/device-i
   * ps3_start_probe_thread - Starts the background probe thread.
   *
   */
   * ps3_start_probe_thread - Starts the background probe thread.
   *
   */

-@@ -723,7 +842,7 @@
+@@ -723,7 +842,7 @@ static int __init ps3_start_probe_thread

  {
        int result;
        struct task_struct *task;
  {
        int result;
        struct task_struct *task;


@@ -53758,7 +54074,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/device-i
  
        pr_debug(" -> %s:%d\n", __func__, __LINE__);
  
  
        pr_debug(" -> %s:%d\n", __func__, __LINE__);
  

-@@ -746,7 +865,8 @@
+@@ -746,7 +865,8 @@ static int __init ps3_start_probe_thread

                return -ENODEV;
        }
  
                return -ENODEV;
        }
  


@@ -53768,7 +54084,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/device-i
  
        if (IS_ERR(task)) {
                result = PTR_ERR(task);
  
        if (IS_ERR(task)) {
                result = PTR_ERR(task);

-@@ -755,6 +875,9 @@
+@@ -755,6 +875,9 @@ static int __init ps3_start_probe_thread

                return result;
        }
  
                return result;
        }
  


@@ -53778,7 +54094,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/device-i
        pr_debug(" <- %s:%d\n", __func__, __LINE__);
        return 0;
  }
        pr_debug(" <- %s:%d\n", __func__, __LINE__);
        return 0;
  }

-@@ -787,6 +910,8 @@
+@@ -787,6 +910,8 @@ static int __init ps3_register_devices(v

  
        ps3_register_sound_devices();
  
  
        ps3_register_sound_devices();
  


@@ -53787,9 +54103,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/device-i
        pr_debug(" <- %s:%d\n", __func__, __LINE__);
        return 0;
  }
        pr_debug(" <- %s:%d\n", __func__, __LINE__);
        return 0;
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/mm.c powerpc.git/arch/powerpc/platforms/ps3/mm.c
---- linux-2.6.24/arch/powerpc/platforms/ps3/mm.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/ps3/mm.c        2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/ps3/mm.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/ps3/mm.c
++++ linux-2.6.24.7/arch/powerpc/platforms/ps3/mm.c

 @@ -36,11 +36,6 @@
  #endif
  
 @@ -36,11 +36,6 @@
  #endif
  


@@ -53802,7 +54119,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/mm.c pow
  #if defined(CONFIG_PS3_DYNAMIC_DMA)
        USE_DYNAMIC_DMA = 1,
  #else
  #if defined(CONFIG_PS3_DYNAMIC_DMA)
        USE_DYNAMIC_DMA = 1,
  #else

-@@ -137,11 +132,8 @@
+@@ -137,11 +132,8 @@ static struct map map;

  unsigned long ps3_mm_phys_to_lpar(unsigned long phys_addr)
  {
        BUG_ON(is_kernel_addr(phys_addr));
  unsigned long ps3_mm_phys_to_lpar(unsigned long phys_addr)
  {
        BUG_ON(is_kernel_addr(phys_addr));


@@ -53816,7 +54133,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/mm.c pow
  }
  
  EXPORT_SYMBOL(ps3_mm_phys_to_lpar);
  }
  
  EXPORT_SYMBOL(ps3_mm_phys_to_lpar);

-@@ -309,7 +301,7 @@
+@@ -309,7 +301,7 @@ static int __init ps3_mm_add_memory(void

  
        BUG_ON(!mem_init_done);
  
  
        BUG_ON(!mem_init_done);
  


@@ -53825,7 +54142,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/mm.c pow
        start_pfn = start_addr >> PAGE_SHIFT;
        nr_pages = (map.r1.size + PAGE_SIZE - 1) >> PAGE_SHIFT;
  
        start_pfn = start_addr >> PAGE_SHIFT;
        nr_pages = (map.r1.size + PAGE_SIZE - 1) >> PAGE_SHIFT;
  

-@@ -359,7 +351,7 @@
+@@ -359,7 +351,7 @@ static unsigned long dma_sb_lpar_to_bus(

  static void  __maybe_unused _dma_dump_region(const struct ps3_dma_region *r,
        const char *func, int line)
  {
  static void  __maybe_unused _dma_dump_region(const struct ps3_dma_region *r,
        const char *func, int line)
  {


@@ -53834,7 +54151,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/mm.c pow
                r->dev->dev_id);
        DBG("%s:%d: page_size  %u\n", func, line, r->page_size);
        DBG("%s:%d: bus_addr   %lxh\n", func, line, r->bus_addr);
                r->dev->dev_id);
        DBG("%s:%d: page_size  %u\n", func, line, r->page_size);
        DBG("%s:%d: bus_addr   %lxh\n", func, line, r->bus_addr);

-@@ -394,7 +386,7 @@
+@@ -394,7 +386,7 @@ struct dma_chunk {

  static void _dma_dump_chunk (const struct dma_chunk* c, const char* func,
        int line)
  {
  static void _dma_dump_chunk (const struct dma_chunk* c, const char* func,
        int line)
  {


@@ -53843,7 +54160,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/mm.c pow
                c->region->dev->bus_id, c->region->dev->dev_id);
        DBG("%s:%d: r.bus_addr   %lxh\n", func, line, c->region->bus_addr);
        DBG("%s:%d: r.page_size  %u\n", func, line, c->region->page_size);
                c->region->dev->bus_id, c->region->dev->dev_id);
        DBG("%s:%d: r.bus_addr   %lxh\n", func, line, c->region->bus_addr);
        DBG("%s:%d: r.page_size  %u\n", func, line, c->region->page_size);

-@@ -658,7 +650,7 @@
+@@ -658,7 +650,7 @@ static int dma_sb_region_create(struct p

        BUG_ON(!r);
  
        if (!r->dev->bus_id) {
        BUG_ON(!r);
  
        if (!r->dev->bus_id) {


@@ -53852,7 +54169,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/mm.c pow
                        r->dev->bus_id, r->dev->dev_id);
                return 0;
        }
                        r->dev->bus_id, r->dev->dev_id);
                return 0;
        }

-@@ -724,7 +716,7 @@
+@@ -724,7 +716,7 @@ static int dma_sb_region_free(struct ps3

        BUG_ON(!r);
  
        if (!r->dev->bus_id) {
        BUG_ON(!r);
  
        if (!r->dev->bus_id) {


@@ -53861,7 +54178,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/mm.c pow
                        r->dev->bus_id, r->dev->dev_id);
                return 0;
        }
                        r->dev->bus_id, r->dev->dev_id);
                return 0;
        }

-@@ -1007,7 +999,7 @@
+@@ -1007,7 +999,7 @@ static int dma_sb_region_create_linear(s

  
        if (r->offset + r->len > map.rm.size) {
                /* Map (part of) 2nd RAM chunk */
  
        if (r->offset + r->len > map.rm.size) {
                /* Map (part of) 2nd RAM chunk */


@@ -53870,10 +54187,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/mm.c pow
                len = r->len;
                if (r->offset >= map.rm.size)
                        virt_addr += r->offset - map.rm.size;
                len = r->len;
                if (r->offset >= map.rm.size)
                        virt_addr += r->offset - map.rm.size;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/platform.h powerpc.git/arch/powerpc/platforms/ps3/platform.h
---- linux-2.6.24/arch/powerpc/platforms/ps3/platform.h 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/ps3/platform.h  2008-01-28 20:25:49.000000000 +0100
-@@ -89,13 +89,11 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/ps3/platform.h
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/ps3/platform.h
++++ linux-2.6.24.7/arch/powerpc/platforms/ps3/platform.h
+@@ -89,13 +89,11 @@ enum ps3_dev_type {

        PS3_DEV_TYPE_STOR_ROM = TYPE_ROM,       /* 5 */
        PS3_DEV_TYPE_SB_GPIO = 6,
        PS3_DEV_TYPE_STOR_FLASH = TYPE_RBC,     /* 14 */
        PS3_DEV_TYPE_STOR_ROM = TYPE_ROM,       /* 5 */
        PS3_DEV_TYPE_SB_GPIO = 6,
        PS3_DEV_TYPE_STOR_FLASH = TYPE_RBC,     /* 14 */


@@ -53888,7 +54206,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/platform
  int ps3_repository_read_bus_type(unsigned int bus_index,
        enum ps3_bus_type *bus_type);
  int ps3_repository_read_bus_num_dev(unsigned int bus_index,
  int ps3_repository_read_bus_type(unsigned int bus_index,
        enum ps3_bus_type *bus_type);
  int ps3_repository_read_bus_num_dev(unsigned int bus_index,

-@@ -119,7 +117,7 @@
+@@ -119,7 +117,7 @@ enum ps3_reg_type {

  int ps3_repository_read_dev_str(unsigned int bus_index,
        unsigned int dev_index, const char *dev_str, u64 *value);
  int ps3_repository_read_dev_id(unsigned int bus_index, unsigned int dev_index,
  int ps3_repository_read_dev_str(unsigned int bus_index,
        unsigned int dev_index, const char *dev_str, u64 *value);
  int ps3_repository_read_dev_id(unsigned int bus_index, unsigned int dev_index,


@@ -53897,7 +54215,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/platform
  int ps3_repository_read_dev_type(unsigned int bus_index,
        unsigned int dev_index, enum ps3_dev_type *dev_type);
  int ps3_repository_read_dev_intr(unsigned int bus_index,
  int ps3_repository_read_dev_type(unsigned int bus_index,
        unsigned int dev_index, enum ps3_dev_type *dev_type);
  int ps3_repository_read_dev_intr(unsigned int bus_index,

-@@ -138,21 +136,17 @@
+@@ -138,21 +136,17 @@ int ps3_repository_read_dev_reg(unsigned

  /* repository bus enumerators */
  
  struct ps3_repository_device {
  /* repository bus enumerators */
  
  struct ps3_repository_device {


@@ -53925,7 +54243,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/platform
  int ps3_repository_find_devices(enum ps3_bus_type bus_type,
        int (*callback)(const struct ps3_repository_device *repo));
  int ps3_repository_find_bus(enum ps3_bus_type bus_type, unsigned int from,
  int ps3_repository_find_devices(enum ps3_bus_type bus_type,
        int (*callback)(const struct ps3_repository_device *repo));
  int ps3_repository_find_bus(enum ps3_bus_type bus_type, unsigned int from,

-@@ -186,10 +180,10 @@
+@@ -186,10 +180,10 @@ int ps3_repository_read_stor_dev_region(

        unsigned int dev_index, unsigned int region_index,
        unsigned int *region_id, u64 *region_start, u64 *region_size);
  
        unsigned int dev_index, unsigned int region_index,
        unsigned int *region_id, u64 *region_start, u64 *region_size);
  


@@ -53939,7 +54257,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/platform
  int ps3_repository_read_rm_base(unsigned int ppe_id, u64 *rm_base);
  int ps3_repository_read_rm_size(unsigned int ppe_id, u64 *rm_size);
  int ps3_repository_read_region_total(u64 *region_total);
  int ps3_repository_read_rm_base(unsigned int ppe_id, u64 *rm_base);
  int ps3_repository_read_rm_size(unsigned int ppe_id, u64 *rm_size);
  int ps3_repository_read_region_total(u64 *region_total);

-@@ -200,9 +194,15 @@
+@@ -200,9 +194,15 @@ int ps3_repository_read_mm_info(u64 *rm_

  
  int ps3_repository_read_num_be(unsigned int *num_be);
  int ps3_repository_read_be_node_id(unsigned int be_index, u64 *node_id);
  
  int ps3_repository_read_num_be(unsigned int *num_be);
  int ps3_repository_read_be_node_id(unsigned int be_index, u64 *node_id);


@@ -53955,10 +54273,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/platform
  /* repository 'Other OS' area */
  
  int ps3_repository_read_boot_dat_addr(u64 *lpar_addr);
  /* repository 'Other OS' area */
  
  int ps3_repository_read_boot_dat_addr(u64 *lpar_addr);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/repository.c powerpc.git/arch/powerpc/platforms/ps3/repository.c
---- linux-2.6.24/arch/powerpc/platforms/ps3/repository.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/ps3/repository.c        2008-01-28 20:25:49.000000000 +0100
-@@ -33,7 +33,7 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/ps3/repository.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/ps3/repository.c
++++ linux-2.6.24.7/arch/powerpc/platforms/ps3/repository.c
+@@ -33,7 +33,7 @@ enum ps3_lpar_id {

  };
  
  #define dump_field(_a, _b) _dump_field(_a, _b, __func__, __LINE__)
  };
  
  #define dump_field(_a, _b) _dump_field(_a, _b, __func__, __LINE__)


@@ -53967,7 +54286,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
  {
  #if defined(DEBUG)
        char s[16];
  {
  #if defined(DEBUG)
        char s[16];

-@@ -50,8 +50,8 @@
+@@ -50,8 +50,8 @@ static void _dump_field(const char *hdr,

  
  #define dump_node_name(_a, _b, _c, _d, _e) \
        _dump_node_name(_a, _b, _c, _d, _e, __func__, __LINE__)
  
  #define dump_node_name(_a, _b, _c, _d, _e) \
        _dump_node_name(_a, _b, _c, _d, _e, __func__, __LINE__)


@@ -53978,7 +54297,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
  {
        pr_debug("%s:%d: lpar: %u\n", func, line, lpar_id);
        _dump_field("n1: ", n1, func, line);
  {
        pr_debug("%s:%d: lpar: %u\n", func, line, lpar_id);
        _dump_field("n1: ", n1, func, line);

-@@ -63,7 +63,7 @@
+@@ -63,7 +63,7 @@ static void _dump_node_name (unsigned in

  #define dump_node(_a, _b, _c, _d, _e, _f, _g) \
        _dump_node(_a, _b, _c, _d, _e, _f, _g, __func__, __LINE__)
  static void _dump_node(unsigned int lpar_id, u64 n1, u64 n2, u64 n3, u64 n4,
  #define dump_node(_a, _b, _c, _d, _e, _f, _g) \
        _dump_node(_a, _b, _c, _d, _e, _f, _g, __func__, __LINE__)
  static void _dump_node(unsigned int lpar_id, u64 n1, u64 n2, u64 n3, u64 n4,


@@ -53987,7 +54306,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
  {
        pr_debug("%s:%d: lpar: %u\n", func, line, lpar_id);
        _dump_field("n1: ", n1, func, line);
  {
        pr_debug("%s:%d: lpar: %u\n", func, line, lpar_id);
        _dump_field("n1: ", n1, func, line);

-@@ -165,21 +165,18 @@
+@@ -165,21 +165,18 @@ int ps3_repository_read_bus_str(unsigned

                make_first_field("bus", bus_index),
                make_field(bus_str, 0),
                0, 0,
                make_first_field("bus", bus_index),
                make_field(bus_str, 0),
                0, 0,


@@ -54012,7 +54331,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
        return result;
  }
  
        return result;
  }
  

-@@ -193,7 +190,7 @@
+@@ -193,7 +190,7 @@ int ps3_repository_read_bus_type(unsigne

                make_first_field("bus", bus_index),
                make_field("type", 0),
                0, 0,
                make_first_field("bus", bus_index),
                make_field("type", 0),
                0, 0,


@@ -54021,7 +54340,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
        *bus_type = v1;
        return result;
  }
        *bus_type = v1;
        return result;
  }

-@@ -208,7 +205,7 @@
+@@ -208,7 +205,7 @@ int ps3_repository_read_bus_num_dev(unsi

                make_first_field("bus", bus_index),
                make_field("num_dev", 0),
                0, 0,
                make_first_field("bus", bus_index),
                make_field("num_dev", 0),
                0, 0,


@@ -54030,7 +54349,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
        *num_dev = v1;
        return result;
  }
        *num_dev = v1;
        return result;
  }

-@@ -221,22 +218,20 @@
+@@ -221,22 +218,20 @@ int ps3_repository_read_dev_str(unsigned

                make_field("dev", dev_index),
                make_field(dev_str, 0),
                0,
                make_field("dev", dev_index),
                make_field(dev_str, 0),
                0,


@@ -54056,7 +54375,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
        return result;
  }
  
        return result;
  }
  

-@@ -251,14 +246,14 @@
+@@ -251,14 +246,14 @@ int ps3_repository_read_dev_type(unsigne

                make_field("dev", dev_index),
                make_field("type", 0),
                0,
                make_field("dev", dev_index),
                make_field("type", 0),
                0,


@@ -54073,7 +54392,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
  {
        int result;
        u64 v1;
  {
        int result;
        u64 v1;

-@@ -287,7 +282,7 @@
+@@ -287,7 +282,7 @@ int ps3_repository_read_dev_reg_type(uns

                make_field("dev", dev_index),
                make_field("reg", reg_index),
                make_field("type", 0),
                make_field("dev", dev_index),
                make_field("reg", reg_index),
                make_field("type", 0),


@@ -54082,7 +54401,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
        *reg_type = v1;
        return result;
  }
        *reg_type = v1;
        return result;
  }

-@@ -332,7 +327,7 @@
+@@ -332,7 +327,7 @@ int ps3_repository_find_device(struct ps

                return result;
        }
  
                return result;
        }
  


@@ -54091,7 +54410,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
                __func__, __LINE__, tmp.bus_type, tmp.bus_index, tmp.bus_id,
                num_dev);
  
                __func__, __LINE__, tmp.bus_type, tmp.bus_index, tmp.bus_id,
                num_dev);
  

-@@ -349,47 +344,95 @@
+@@ -349,47 +344,95 @@ int ps3_repository_find_device(struct ps

                return result;
        }
  
                return result;
        }
  


@@ -54215,7 +54534,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
        *repo = tmp;
        return 0;
  }
        *repo = tmp;
        return 0;
  }

-@@ -402,50 +445,34 @@
+@@ -402,50 +445,34 @@ int __devinit ps3_repository_find_device

  
        pr_debug(" -> %s:%d: find bus_type %u\n", __func__, __LINE__, bus_type);
  
  
        pr_debug(" -> %s:%d: find bus_type %u\n", __func__, __LINE__, bus_type);
  


@@ -54288,7 +54607,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
        }
  
        pr_debug(" <- %s:%d\n", __func__, __LINE__);
        }
  
        pr_debug(" <- %s:%d\n", __func__, __LINE__);

-@@ -561,7 +588,7 @@
+@@ -561,7 +588,7 @@ int ps3_repository_read_stor_dev_port(un

                make_first_field("bus", bus_index),
                make_field("dev", dev_index),
                make_field("port", 0),
                make_first_field("bus", bus_index),
                make_field("dev", dev_index),
                make_field("port", 0),


@@ -54297,7 +54616,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
  }
  
  int ps3_repository_read_stor_dev_blk_size(unsigned int bus_index,
  }
  
  int ps3_repository_read_stor_dev_blk_size(unsigned int bus_index,

-@@ -571,7 +598,7 @@
+@@ -571,7 +598,7 @@ int ps3_repository_read_stor_dev_blk_siz

                make_first_field("bus", bus_index),
                make_field("dev", dev_index),
                make_field("blk_size", 0),
                make_first_field("bus", bus_index),
                make_field("dev", dev_index),
                make_field("blk_size", 0),


@@ -54306,7 +54625,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
  }
  
  int ps3_repository_read_stor_dev_num_blocks(unsigned int bus_index,
  }
  
  int ps3_repository_read_stor_dev_num_blocks(unsigned int bus_index,

-@@ -581,7 +608,7 @@
+@@ -581,7 +608,7 @@ int ps3_repository_read_stor_dev_num_blo

                make_first_field("bus", bus_index),
                make_field("dev", dev_index),
                make_field("n_blocks", 0),
                make_first_field("bus", bus_index),
                make_field("dev", dev_index),
                make_field("n_blocks", 0),


@@ -54315,7 +54634,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
  }
  
  int ps3_repository_read_stor_dev_num_regions(unsigned int bus_index,
  }
  
  int ps3_repository_read_stor_dev_num_regions(unsigned int bus_index,

-@@ -594,7 +621,7 @@
+@@ -594,7 +621,7 @@ int ps3_repository_read_stor_dev_num_reg

                make_first_field("bus", bus_index),
                make_field("dev", dev_index),
                make_field("n_regs", 0),
                make_first_field("bus", bus_index),
                make_field("dev", dev_index),
                make_field("n_regs", 0),


@@ -54324,7 +54643,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
        *num_regions = v1;
        return result;
  }
        *num_regions = v1;
        return result;
  }

-@@ -611,7 +638,7 @@
+@@ -611,7 +638,7 @@ int ps3_repository_read_stor_dev_region_

            make_field("dev", dev_index),
            make_field("region", region_index),
            make_field("id", 0),
            make_field("dev", dev_index),
            make_field("region", region_index),
            make_field("id", 0),


@@ -54333,7 +54652,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
        *region_id = v1;
        return result;
  }
        *region_id = v1;
        return result;
  }

-@@ -624,7 +651,7 @@
+@@ -624,7 +651,7 @@ int ps3_repository_read_stor_dev_region_

            make_field("dev", dev_index),
            make_field("region", region_index),
            make_field("size", 0),
            make_field("dev", dev_index),
            make_field("region", region_index),
            make_field("size", 0),


@@ -54342,7 +54661,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
  }
  
  int ps3_repository_read_stor_dev_region_start(unsigned int bus_index,
  }
  
  int ps3_repository_read_stor_dev_region_start(unsigned int bus_index,

-@@ -635,7 +662,7 @@
+@@ -635,7 +662,7 @@ int ps3_repository_read_stor_dev_region_

            make_field("dev", dev_index),
            make_field("region", region_index),
            make_field("start", 0),
            make_field("dev", dev_index),
            make_field("region", region_index),
            make_field("start", 0),


@@ -54351,7 +54670,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
  }
  
  int ps3_repository_read_stor_dev_info(unsigned int bus_index,
  }
  
  int ps3_repository_read_stor_dev_info(unsigned int bus_index,

-@@ -684,6 +711,35 @@
+@@ -684,6 +711,35 @@ int ps3_repository_read_stor_dev_region(

        return result;
  }
  
        return result;
  }
  


@@ -54387,7 +54706,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
  int ps3_repository_read_rm_size(unsigned int ppe_id, u64 *rm_size)
  {
        return read_node(PS3_LPAR_ID_CURRENT,
  int ps3_repository_read_rm_size(unsigned int ppe_id, u64 *rm_size)
  {
        return read_node(PS3_LPAR_ID_CURRENT,

-@@ -691,7 +747,7 @@
+@@ -691,7 +747,7 @@ int ps3_repository_read_rm_size(unsigned

                make_field("pu", 0),
                ppe_id,
                make_field("rm_size", 0),
                make_field("pu", 0),
                ppe_id,
                make_field("rm_size", 0),


@@ -54396,7 +54715,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
  }
  
  int ps3_repository_read_region_total(u64 *region_total)
  }
  
  int ps3_repository_read_region_total(u64 *region_total)

-@@ -700,7 +756,7 @@
+@@ -700,7 +756,7 @@ int ps3_repository_read_region_total(u64

                make_first_field("bi", 0),
                make_field("rgntotal", 0),
                0, 0,
                make_first_field("bi", 0),
                make_field("rgntotal", 0),
                0, 0,


@@ -54405,7 +54724,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
  }
  
  /**
  }
  
  /**

-@@ -736,7 +792,7 @@
+@@ -736,7 +792,7 @@ int ps3_repository_read_num_spu_reserved

                make_first_field("bi", 0),
                make_field("spun", 0),
                0, 0,
                make_first_field("bi", 0),
                make_field("spun", 0),
                0, 0,


@@ -54414,7 +54733,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
        *num_spu_reserved = v1;
        return result;
  }
        *num_spu_reserved = v1;
        return result;
  }

-@@ -755,7 +811,7 @@
+@@ -755,7 +811,7 @@ int ps3_repository_read_num_spu_resource

                make_first_field("bi", 0),
                make_field("spursvn", 0),
                0, 0,
                make_first_field("bi", 0),
                make_field("spursvn", 0),
                0, 0,


@@ -54423,7 +54742,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
        *num_resource_id = v1;
        return result;
  }
        *num_resource_id = v1;
        return result;
  }

-@@ -768,7 +824,7 @@
+@@ -768,7 +824,7 @@ int ps3_repository_read_num_spu_resource

   */
  
  int ps3_repository_read_spu_resource_id(unsigned int res_index,
   */
  
  int ps3_repository_read_spu_resource_id(unsigned int res_index,


@@ -54432,7 +54751,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
  {
        int result;
        u64 v1;
  {
        int result;
        u64 v1;

-@@ -785,14 +841,14 @@
+@@ -785,14 +841,14 @@ int ps3_repository_read_spu_resource_id(

        return result;
  }
  
        return result;
  }
  


@@ -54449,7 +54768,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
  }
  
  int ps3_repository_read_boot_dat_size(unsigned int *size)
  }
  
  int ps3_repository_read_boot_dat_size(unsigned int *size)

-@@ -805,7 +861,7 @@
+@@ -805,7 +861,7 @@ int ps3_repository_read_boot_dat_size(un

                make_field("boot_dat", 0),
                make_field("size", 0),
                0,
                make_field("boot_dat", 0),
                make_field("size", 0),
                0,


@@ -54458,7 +54777,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
        *size = v1;
        return result;
  }
        *size = v1;
        return result;
  }

-@@ -820,7 +876,7 @@
+@@ -820,7 +876,7 @@ int ps3_repository_read_vuart_av_port(un

                make_field("vir_uart", 0),
                make_field("port", 0),
                make_field("avset", 0),
                make_field("vir_uart", 0),
                make_field("port", 0),
                make_field("avset", 0),


@@ -54467,7 +54786,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
        *port = v1;
        return result;
  }
        *port = v1;
        return result;
  }

-@@ -835,7 +891,7 @@
+@@ -835,7 +891,7 @@ int ps3_repository_read_vuart_sysmgr_por

                make_field("vir_uart", 0),
                make_field("port", 0),
                make_field("sysmgr", 0),
                make_field("vir_uart", 0),
                make_field("port", 0),
                make_field("sysmgr", 0),


@@ -54476,7 +54795,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
        *port = v1;
        return result;
  }
        *port = v1;
        return result;
  }

-@@ -856,6 +912,10 @@
+@@ -856,6 +912,10 @@ int ps3_repository_read_boot_dat_info(u6

                : ps3_repository_read_boot_dat_size(size);
  }
  
                : ps3_repository_read_boot_dat_size(size);
  }
  


@@ -54487,7 +54806,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
  int ps3_repository_read_num_be(unsigned int *num_be)
  {
        int result;
  int ps3_repository_read_num_be(unsigned int *num_be)
  {
        int result;

-@@ -866,11 +926,17 @@
+@@ -866,11 +926,17 @@ int ps3_repository_read_num_be(unsigned 

                0,
                0,
                0,
                0,
                0,
                0,


@@ -54506,7 +54825,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
  int ps3_repository_read_be_node_id(unsigned int be_index, u64 *node_id)
  {
        return read_node(PS3_LPAR_ID_PME,
  int ps3_repository_read_be_node_id(unsigned int be_index, u64 *node_id)
  {
        return read_node(PS3_LPAR_ID_PME,

-@@ -878,7 +944,23 @@
+@@ -878,7 +944,23 @@ int ps3_repository_read_be_node_id(unsig

                0,
                0,
                0,
                0,
                0,
                0,


@@ -54531,7 +54850,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
  }
  
  int ps3_repository_read_tb_freq(u64 node_id, u64 *tb_freq)
  }
  
  int ps3_repository_read_tb_freq(u64 node_id, u64 *tb_freq)

-@@ -888,7 +970,7 @@
+@@ -888,7 +970,7 @@ int ps3_repository_read_tb_freq(u64 node

                node_id,
                make_field("clock", 0),
                0,
                node_id,
                make_field("clock", 0),
                0,


@@ -54540,7 +54859,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
  }
  
  int ps3_repository_read_be_tb_freq(unsigned int be_index, u64 *tb_freq)
  }
  
  int ps3_repository_read_be_tb_freq(unsigned int be_index, u64 *tb_freq)

-@@ -897,11 +979,29 @@
+@@ -897,11 +979,29 @@ int ps3_repository_read_be_tb_freq(unsig

        u64 node_id;
  
        *tb_freq = 0;
        u64 node_id;
  
        *tb_freq = 0;


@@ -54571,7 +54890,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
  #if defined(DEBUG)
  
  int ps3_repository_dump_resource_info(const struct ps3_repository_device *repo)
  #if defined(DEBUG)
  
  int ps3_repository_dump_resource_info(const struct ps3_repository_device *repo)

-@@ -1034,7 +1134,7 @@
+@@ -1034,7 +1134,7 @@ static int dump_device_info(struct ps3_r

                        continue;
                }
  
                        continue;
                }
  


@@ -54580,7 +54899,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
                        __LINE__, repo->bus_index, repo->dev_index,
                        repo->dev_type, repo->dev_id);
  
                        __LINE__, repo->bus_index, repo->dev_index,
                        repo->dev_type, repo->dev_id);
  

-@@ -1091,7 +1191,7 @@
+@@ -1091,7 +1191,7 @@ int ps3_repository_dump_bus_info(void)

                        continue;
                }
  
                        continue;
                }
  


@@ -54589,9 +54908,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
                        __func__, __LINE__, repo.bus_index, repo.bus_type,
                        repo.bus_id, num_dev);
  
                        __func__, __LINE__, repo.bus_index, repo.bus_type,
                        repo.bus_id, num_dev);
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/spu.c powerpc.git/arch/powerpc/platforms/ps3/spu.c
---- linux-2.6.24/arch/powerpc/platforms/ps3/spu.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/ps3/spu.c       2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/ps3/spu.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/ps3/spu.c
++++ linux-2.6.24.7/arch/powerpc/platforms/ps3/spu.c

 @@ -28,6 +28,7 @@
  #include <asm/spu_priv1.h>
  #include <asm/lv1call.h>
 @@ -28,6 +28,7 @@
  #include <asm/spu_priv1.h>
  #include <asm/lv1call.h>


@@ -54600,7 +54920,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/spu.c po
  #include "platform.h"
  
  /* spu_management_ops */
  #include "platform.h"
  
  /* spu_management_ops */

-@@ -419,10 +420,34 @@
+@@ -419,10 +420,34 @@ static int ps3_init_affinity(void)

        return 0;
  }
  
        return 0;
  }
  


@@ -54635,7 +54955,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/spu.c po
        .init_affinity = ps3_init_affinity,
  };
  
        .init_affinity = ps3_init_affinity,
  };
  

-@@ -505,8 +530,6 @@
+@@ -505,8 +530,6 @@ static void mfc_sr1_set(struct spu *spu,

        static const u64 allowed = ~(MFC_STATE1_LOCAL_STORAGE_DECODE_MASK
                | MFC_STATE1_PROBLEM_STATE_MASK);
  
        static const u64 allowed = ~(MFC_STATE1_LOCAL_STORAGE_DECODE_MASK
                | MFC_STATE1_PROBLEM_STATE_MASK);
  


@@ -54644,10 +54964,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/spu.c po
        BUG_ON((sr1 & allowed) != (spu_pdata(spu)->cache.sr1 & allowed));
  
        spu_pdata(spu)->cache.sr1 = sr1;
        BUG_ON((sr1 & allowed) != (spu_pdata(spu)->cache.sr1 & allowed));
  
        spu_pdata(spu)->cache.sr1 = sr1;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/system-bus.c powerpc.git/arch/powerpc/platforms/ps3/system-bus.c
---- linux-2.6.24/arch/powerpc/platforms/ps3/system-bus.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/ps3/system-bus.c        2008-01-28 20:25:49.000000000 +0100
-@@ -42,8 +42,8 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/ps3/system-bus.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/ps3/system-bus.c
++++ linux-2.6.24.7/arch/powerpc/platforms/ps3/system-bus.c
+@@ -42,8 +42,8 @@ struct {

        int gpu;
  } static usage_hack;
  
        int gpu;
  } static usage_hack;
  


@@ -54658,7 +54979,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/system-b
  {
        return dev->bus_id == bus_id && dev->dev_id == dev_id;
  }
  {
        return dev->bus_id == bus_id && dev->dev_id == dev_id;
  }

-@@ -182,8 +182,8 @@
+@@ -182,8 +182,8 @@ int ps3_open_hv_device(struct ps3_system

        case PS3_MATCH_ID_SYSTEM_MANAGER:
                pr_debug("%s:%d: unsupported match_id: %u\n", __func__,
                        __LINE__, dev->match_id);
        case PS3_MATCH_ID_SYSTEM_MANAGER:
                pr_debug("%s:%d: unsupported match_id: %u\n", __func__,
                        __LINE__, dev->match_id);


@@ -54669,7 +54990,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/system-b
                BUG();
                return -EINVAL;
  
                BUG();
                return -EINVAL;
  

-@@ -220,8 +220,8 @@
+@@ -220,8 +220,8 @@ int ps3_close_hv_device(struct ps3_syste

        case PS3_MATCH_ID_SYSTEM_MANAGER:
                pr_debug("%s:%d: unsupported match_id: %u\n", __func__,
                        __LINE__, dev->match_id);
        case PS3_MATCH_ID_SYSTEM_MANAGER:
                pr_debug("%s:%d: unsupported match_id: %u\n", __func__,
                        __LINE__, dev->match_id);


@@ -54680,7 +55001,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/system-b
                BUG();
                return -EINVAL;
  
                BUG();
                return -EINVAL;
  

-@@ -240,7 +240,7 @@
+@@ -240,7 +240,7 @@ EXPORT_SYMBOL_GPL(ps3_close_hv_device);

  static void _dump_mmio_region(const struct ps3_mmio_region* r,
        const char* func, int line)
  {
  static void _dump_mmio_region(const struct ps3_mmio_region* r,
        const char* func, int line)
  {


@@ -54689,7 +55010,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/system-b
                r->dev->dev_id);
        pr_debug("%s:%d: bus_addr  %lxh\n", func, line, r->bus_addr);
        pr_debug("%s:%d: len       %lxh\n", func, line, r->len);
                r->dev->dev_id);
        pr_debug("%s:%d: bus_addr  %lxh\n", func, line, r->bus_addr);
        pr_debug("%s:%d: len       %lxh\n", func, line, r->len);

-@@ -715,6 +715,7 @@
+@@ -715,6 +715,7 @@ int ps3_system_bus_device_register(struc

        static unsigned int dev_ioc0_count;
        static unsigned int dev_sb_count;
        static unsigned int dev_vuart_count;
        static unsigned int dev_ioc0_count;
        static unsigned int dev_sb_count;
        static unsigned int dev_vuart_count;


@@ -54697,7 +55018,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/system-b
  
        if (!dev->core.parent)
                dev->core.parent = &ps3_system_bus;
  
        if (!dev->core.parent)
                dev->core.parent = &ps3_system_bus;

-@@ -737,6 +738,10 @@
+@@ -737,6 +738,10 @@ int ps3_system_bus_device_register(struc

                snprintf(dev->core.bus_id, sizeof(dev->core.bus_id),
                        "vuart_%02x", ++dev_vuart_count);
                break;
                snprintf(dev->core.bus_id, sizeof(dev->core.bus_id),
                        "vuart_%02x", ++dev_vuart_count);
                break;


@@ -54708,9 +55029,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/system-b
        default:
                BUG();
        };
        default:
                BUG();
        };

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/eeh.c powerpc.git/arch/powerpc/platforms/pseries/eeh.c
---- linux-2.6.24/arch/powerpc/platforms/pseries/eeh.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pseries/eeh.c   2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/pseries/eeh.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/pseries/eeh.c
++++ linux-2.6.24.7/arch/powerpc/platforms/pseries/eeh.c

 @@ -29,6 +29,8 @@
  #include <linux/rbtree.h>
  #include <linux/seq_file.h>
 @@ -29,6 +29,8 @@
  #include <linux/rbtree.h>
  #include <linux/seq_file.h>


@@ -54720,7 +55042,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/eeh.
  #include <asm/atomic.h>
  #include <asm/eeh.h>
  #include <asm/eeh_event.h>
  #include <asm/atomic.h>
  #include <asm/eeh.h>
  #include <asm/eeh_event.h>

-@@ -169,7 +171,6 @@
+@@ -169,7 +171,6 @@ static void rtas_slot_error_detail(struc

   */
  static size_t gather_pci_data(struct pci_dn *pdn, char * buf, size_t len)
  {
   */
  static size_t gather_pci_data(struct pci_dn *pdn, char * buf, size_t len)
  {


@@ -54728,7 +55050,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/eeh.
        struct pci_dev *dev = pdn->pcidev;
        u32 cfg;
        int cap, i;
        struct pci_dev *dev = pdn->pcidev;
        u32 cfg;
        int cap, i;

-@@ -243,12 +244,12 @@
+@@ -243,12 +244,12 @@ static size_t gather_pci_data(struct pci

  
        /* Gather status on devices under the bridge */
        if (dev->class >> 16 == PCI_BASE_CLASS_BRIDGE) {
  
        /* Gather status on devices under the bridge */
        if (dev->class >> 16 == PCI_BASE_CLASS_BRIDGE) {


@@ -54744,7 +55066,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/eeh.
                }
        }
  
                }
        }
  

-@@ -372,7 +373,7 @@
+@@ -372,7 +373,7 @@ struct device_node * find_device_pe(stru

        return dn;
  }
  
        return dn;
  }
  


@@ -54753,7 +55075,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/eeh.
   *  Mark the device driver too, so that it can see the failure
   *  immediately; this is critical, since some drivers poll
   *  status registers in interrupts ... If a driver is polling,
   *  Mark the device driver too, so that it can see the failure
   *  immediately; this is critical, since some drivers poll
   *  status registers in interrupts ... If a driver is polling,

-@@ -380,9 +381,11 @@
+@@ -380,9 +381,11 @@ struct device_node * find_device_pe(stru

   *  an interrupt context, which is bad.
   */
  
   *  an interrupt context, which is bad.
   */
  


@@ -54767,7 +55089,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/eeh.
                if (PCI_DN(dn)) {
                        /* Mark the pci device driver too */
                        struct pci_dev *dev = PCI_DN(dn)->pcidev;
                if (PCI_DN(dn)) {
                        /* Mark the pci device driver too */
                        struct pci_dev *dev = PCI_DN(dn)->pcidev;

-@@ -392,10 +395,8 @@
+@@ -392,10 +395,8 @@ static void __eeh_mark_slot (struct devi

                        if (dev && dev->driver)
                                dev->error_state = pci_channel_io_frozen;
  
                        if (dev && dev->driver)
                                dev->error_state = pci_channel_io_frozen;
  


@@ -54779,7 +55101,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/eeh.
        }
  }
  
        }
  }
  

-@@ -415,19 +416,19 @@
+@@ -415,19 +416,19 @@ void eeh_mark_slot (struct device_node *

        if (dev)
                dev->error_state = pci_channel_io_frozen;
  
        if (dev)
                dev->error_state = pci_channel_io_frozen;
  


@@ -54805,7 +55127,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/eeh.
        }
  }
  
        }
  }
  

-@@ -444,7 +445,7 @@
+@@ -444,7 +445,7 @@ void eeh_clear_slot (struct device_node 

  
        PCI_DN(dn)->eeh_mode &= ~mode_flag;
        PCI_DN(dn)->eeh_check_count = 0;
  
        PCI_DN(dn)->eeh_mode &= ~mode_flag;
        PCI_DN(dn)->eeh_check_count = 0;


@@ -54814,7 +55136,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/eeh.
        spin_unlock_irqrestore(&confirm_error_lock, flags);
  }
  
        spin_unlock_irqrestore(&confirm_error_lock, flags);
  }
  

-@@ -480,6 +481,7 @@
+@@ -480,6 +481,7 @@ int eeh_dn_check_failure(struct device_n

                no_dn++;
                return 0;
        }
                no_dn++;
                return 0;
        }


@@ -54822,7 +55144,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/eeh.
        pdn = PCI_DN(dn);
  
        /* Access to IO BARs might get this far and still not want checking. */
        pdn = PCI_DN(dn);
  
        /* Access to IO BARs might get this far and still not want checking. */

-@@ -545,7 +547,7 @@
+@@ -545,7 +547,7 @@ int eeh_dn_check_failure(struct device_n

  
        /* Note that config-io to empty slots may fail;
         * they are empty when they don't have children. */
  
        /* Note that config-io to empty slots may fail;
         * they are empty when they don't have children. */


@@ -54831,7 +55153,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/eeh.
                false_positives++;
                pdn->eeh_false_positives ++;
                rc = 0;
                false_positives++;
                pdn->eeh_false_positives ++;
                rc = 0;

-@@ -848,11 +850,8 @@
+@@ -848,11 +850,8 @@ void eeh_restore_bars(struct pci_dn *pdn

        if ((pdn->eeh_mode & EEH_MODE_SUPPORTED) && !IS_BRIDGE(pdn->class_code))
                __restore_bars (pdn);
  
        if ((pdn->eeh_mode & EEH_MODE_SUPPORTED) && !IS_BRIDGE(pdn->class_code))
                __restore_bars (pdn);
  


@@ -54844,7 +55166,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/eeh.
  }
  
  /**
  }
  
  /**

-@@ -1130,7 +1129,8 @@
+@@ -1130,7 +1129,8 @@ static void eeh_add_device_early(struct 

  void eeh_add_device_tree_early(struct device_node *dn)
  {
        struct device_node *sib;
  void eeh_add_device_tree_early(struct device_node *dn)
  {
        struct device_node *sib;


@@ -54854,10 +55176,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/eeh.
                eeh_add_device_tree_early(sib);
        eeh_add_device_early(dn);
  }
                eeh_add_device_tree_early(sib);
        eeh_add_device_early(dn);
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/eeh_driver.c powerpc.git/arch/powerpc/platforms/pseries/eeh_driver.c
---- linux-2.6.24/arch/powerpc/platforms/pseries/eeh_driver.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pseries/eeh_driver.c    2008-01-28 20:25:49.000000000 +0100
-@@ -310,8 +310,6 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/pseries/eeh_driver.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/pseries/eeh_driver.c
++++ linux-2.6.24.7/arch/powerpc/platforms/pseries/eeh_driver.c
+@@ -310,8 +310,6 @@ struct pci_dn * handle_eeh_events (struc

        const char *location, *pci_str, *drv_str;
  
        frozen_dn = find_device_pe(event->dn);
        const char *location, *pci_str, *drv_str;
  
        frozen_dn = find_device_pe(event->dn);


@@ -54866,7 +55189,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/eeh_
        if (!frozen_dn) {
  
                location = of_get_property(event->dn, "ibm,loc-code", NULL);
        if (!frozen_dn) {
  
                location = of_get_property(event->dn, "ibm,loc-code", NULL);

-@@ -321,6 +319,8 @@
+@@ -321,6 +319,8 @@ struct pci_dn * handle_eeh_events (struc

                        location, pci_name(event->dev));
                return NULL;
        }
                        location, pci_name(event->dev));
                return NULL;
        }


@@ -54875,7 +55198,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/eeh_
        location = of_get_property(frozen_dn, "ibm,loc-code", NULL);
        location = location ? location : "unknown";
  
        location = of_get_property(frozen_dn, "ibm,loc-code", NULL);
        location = location ? location : "unknown";
  

-@@ -354,13 +354,6 @@
+@@ -354,13 +354,6 @@ struct pci_dn * handle_eeh_events (struc

        if (frozen_pdn->eeh_freeze_count > EEH_MAX_ALLOWED_FREEZES)
                goto excess_failures;
  
        if (frozen_pdn->eeh_freeze_count > EEH_MAX_ALLOWED_FREEZES)
                goto excess_failures;
  


@@ -54889,7 +55212,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/eeh_
        printk(KERN_WARNING
           "EEH: This PCI device has failed %d times in the last hour:\n",
                frozen_pdn->eeh_freeze_count);
        printk(KERN_WARNING
           "EEH: This PCI device has failed %d times in the last hour:\n",
                frozen_pdn->eeh_freeze_count);

-@@ -376,6 +369,14 @@
+@@ -376,6 +369,14 @@ struct pci_dn * handle_eeh_events (struc

         */
        pci_walk_bus(frozen_bus, eeh_report_error, &result);
  
         */
        pci_walk_bus(frozen_bus, eeh_report_error, &result);
  


@@ -54904,10 +55227,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/eeh_
        /* Since rtas may enable MMIO when posting the error log,
         * don't post the error log until after all dev drivers
         * have been informed.
        /* Since rtas may enable MMIO when posting the error log,
         * don't post the error log until after all dev drivers
         * have been informed.

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/iommu.c powerpc.git/arch/powerpc/platforms/pseries/iommu.c
---- linux-2.6.24/arch/powerpc/platforms/pseries/iommu.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pseries/iommu.c 2008-01-28 20:25:49.000000000 +0100
-@@ -251,7 +251,7 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/pseries/iommu.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/pseries/iommu.c
++++ linux-2.6.24.7/arch/powerpc/platforms/pseries/iommu.c
+@@ -251,7 +251,7 @@ static void iommu_table_setparms(struct 

        const unsigned long *basep;
        const u32 *sizep;
  
        const unsigned long *basep;
        const u32 *sizep;
  


@@ -54916,7 +55240,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/iomm
  
        basep = of_get_property(node, "linux,tce-base", NULL);
        sizep = of_get_property(node, "linux,tce-size", NULL);
  
        basep = of_get_property(node, "linux,tce-base", NULL);
        sizep = of_get_property(node, "linux,tce-size", NULL);

-@@ -296,11 +296,12 @@
+@@ -296,11 +296,12 @@ static void iommu_table_setparms(struct 

  static void iommu_table_setparms_lpar(struct pci_controller *phb,
                                      struct device_node *dn,
                                      struct iommu_table *tbl,
  static void iommu_table_setparms_lpar(struct pci_controller *phb,
                                      struct device_node *dn,
                                      struct iommu_table *tbl,


@@ -54931,7 +55255,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/iomm
        of_parse_dma_window(dn, dma_window, &tbl->it_index, &offset, &size);
  
        tbl->it_base   = 0;
        of_parse_dma_window(dn, dma_window, &tbl->it_index, &offset, &size);
  
        tbl->it_base   = 0;

-@@ -420,17 +421,10 @@
+@@ -420,17 +421,10 @@ static void pci_dma_bus_setup_pSeriesLP(

            pdn->full_name, ppci->iommu_table);
  
        if (!ppci->iommu_table) {
            pdn->full_name, ppci->iommu_table);
  
        if (!ppci->iommu_table) {


@@ -54951,7 +55275,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/iomm
                ppci->iommu_table = iommu_init_table(tbl, ppci->phb->node);
                DBG("  created table: %p\n", ppci->iommu_table);
        }
                ppci->iommu_table = iommu_init_table(tbl, ppci->phb->node);
                DBG("  created table: %p\n", ppci->iommu_table);
        }

-@@ -523,14 +517,10 @@
+@@ -523,14 +517,10 @@ static void pci_dma_dev_setup_pSeriesLP(

  
        pci = PCI_DN(pdn);
        if (!pci->iommu_table) {
  
        pci = PCI_DN(pdn);
        if (!pci->iommu_table) {


@@ -54968,7 +55292,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/iomm
                pci->iommu_table = iommu_init_table(tbl, pci->phb->node);
                DBG("  created table: %p\n", pci->iommu_table);
        } else {
                pci->iommu_table = iommu_init_table(tbl, pci->phb->node);
                DBG("  created table: %p\n", pci->iommu_table);
        } else {

-@@ -556,7 +546,7 @@
+@@ -556,7 +546,7 @@ static int iommu_reconfig_notifier(struc

        case PSERIES_RECONFIG_REMOVE:
                if (pci && pci->iommu_table &&
                    of_get_property(np, "ibm,dma-window", NULL))
        case PSERIES_RECONFIG_REMOVE:
                if (pci && pci->iommu_table &&
                    of_get_property(np, "ibm,dma-window", NULL))


@@ -54977,10 +55301,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/iomm
                break;
        default:
                err = NOTIFY_DONE;
                break;
        default:
                err = NOTIFY_DONE;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/pci_dlpar.c powerpc.git/arch/powerpc/platforms/pseries/pci_dlpar.c
---- linux-2.6.24/arch/powerpc/platforms/pseries/pci_dlpar.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pseries/pci_dlpar.c     2008-01-28 20:25:49.000000000 +0100
-@@ -83,7 +83,7 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/pseries/pci_dlpar.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/pseries/pci_dlpar.c
++++ linux-2.6.24.7/arch/powerpc/platforms/pseries/pci_dlpar.c
+@@ -83,7 +83,7 @@ EXPORT_SYMBOL_GPL(pcibios_remove_pci_dev

  
  /* Must be called before pci_bus_add_devices */
  void
  
  /* Must be called before pci_bus_add_devices */
  void


@@ -54989,7 +55314,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/pci_
  {
        struct pci_dev *dev;
  
  {
        struct pci_dev *dev;
  

-@@ -98,8 +98,6 @@
+@@ -98,8 +98,6 @@ pcibios_fixup_new_pci_devices(struct pci

                        /* Fill device archdata and setup iommu table */
                        pcibios_setup_new_device(dev);
  
                        /* Fill device archdata and setup iommu table */
                        pcibios_setup_new_device(dev);
  


@@ -54998,7 +55323,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/pci_
                        pci_read_irq_line(dev);
                        for (i = 0; i < PCI_NUM_RESOURCES; i++) {
                                struct resource *r = &dev->resource[i];
                        pci_read_irq_line(dev);
                        for (i = 0; i < PCI_NUM_RESOURCES; i++) {
                                struct resource *r = &dev->resource[i];

-@@ -132,8 +130,8 @@
+@@ -132,8 +130,8 @@ pcibios_pci_config_bridge(struct pci_dev

  
        pci_scan_child_bus(child_bus);
  
  
        pci_scan_child_bus(child_bus);
  


@@ -55009,7 +55334,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/pci_
  
        /* Make the discovered devices available */
        pci_bus_add_devices(child_bus);
  
        /* Make the discovered devices available */
        pci_bus_add_devices(child_bus);

-@@ -169,7 +167,7 @@
+@@ -169,7 +167,7 @@ pcibios_add_pci_devices(struct pci_bus *

                /* use ofdt-based probe */
                of_scan_bus(dn, bus);
                if (!list_empty(&bus->devices)) {
                /* use ofdt-based probe */
                of_scan_bus(dn, bus);
                if (!list_empty(&bus->devices)) {


@@ -55018,7 +55343,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/pci_
                        pci_bus_add_devices(bus);
                        eeh_add_device_tree_late(bus);
                }
                        pci_bus_add_devices(bus);
                        eeh_add_device_tree_late(bus);
                }

-@@ -178,7 +176,7 @@
+@@ -178,7 +176,7 @@ pcibios_add_pci_devices(struct pci_bus *

                slotno = PCI_SLOT(PCI_DN(dn->child)->devfn);
                num = pci_scan_slot(bus, PCI_DEVFN(slotno, 0));
                if (num) {
                slotno = PCI_SLOT(PCI_DN(dn->child)->devfn);
                num = pci_scan_slot(bus, PCI_DEVFN(slotno, 0));
                if (num) {


@@ -55027,7 +55352,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/pci_
                        pci_bus_add_devices(bus);
                        eeh_add_device_tree_late(bus);
                }
                        pci_bus_add_devices(bus);
                        eeh_add_device_tree_late(bus);
                }

-@@ -208,7 +206,7 @@
+@@ -208,7 +206,7 @@ struct pci_controller * __devinit init_p

                eeh_add_device_tree_early(dn);
  
        scan_phb(phb);
                eeh_add_device_tree_early(dn);
  
        scan_phb(phb);


@@ -55036,10 +55361,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/pci_
        pci_bus_add_devices(phb->bus);
        eeh_add_device_tree_late(phb->bus);
  
        pci_bus_add_devices(phb->bus);
        eeh_add_device_tree_late(phb->bus);
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/plpar_wrappers.h powerpc.git/arch/powerpc/platforms/pseries/plpar_wrappers.h
---- linux-2.6.24/arch/powerpc/platforms/pseries/plpar_wrappers.h       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pseries/plpar_wrappers.h        2008-01-28 20:25:49.000000000 +0100
-@@ -8,11 +8,6 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/pseries/plpar_wrappers.h
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/pseries/plpar_wrappers.h
++++ linux-2.6.24.7/arch/powerpc/platforms/pseries/plpar_wrappers.h
+@@ -8,11 +8,6 @@ static inline long poll_pending(void)

        return plpar_hcall_norets(H_POLL_PENDING);
  }
  
        return plpar_hcall_norets(H_POLL_PENDING);
  }
  


@@ -55051,9 +55377,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/plpa
  static inline long cede_processor(void)
  {
        return plpar_hcall_norets(H_CEDE);
  static inline long cede_processor(void)
  {
        return plpar_hcall_norets(H_CEDE);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/smp.c powerpc.git/arch/powerpc/platforms/pseries/smp.c
---- linux-2.6.24/arch/powerpc/platforms/pseries/smp.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pseries/smp.c   2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/platforms/pseries/smp.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/pseries/smp.c
++++ linux-2.6.24.7/arch/powerpc/platforms/pseries/smp.c

 @@ -46,6 +46,7 @@
  #include <asm/pSeries_reconfig.h>
  #include <asm/mpic.h>
 @@ -46,6 +46,7 @@
  #include <asm/pSeries_reconfig.h>
  #include <asm/mpic.h>


@@ -55062,7 +55389,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/smp.
  
  #include "plpar_wrappers.h"
  #include "pseries.h"
  
  #include "plpar_wrappers.h"
  #include "pseries.h"

-@@ -202,7 +203,7 @@
+@@ -202,7 +203,7 @@ static int smp_pSeries_cpu_bootable(unsi

         */
        if (system_state < SYSTEM_RUNNING &&
            cpu_has_feature(CPU_FTR_SMT) &&
         */
        if (system_state < SYSTEM_RUNNING &&
            cpu_has_feature(CPU_FTR_SMT) &&


@@ -55071,10 +55398,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/smp.
                return 0;
  
        return 1;
                return 0;
  
        return 1;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/xics.c powerpc.git/arch/powerpc/platforms/pseries/xics.c
---- linux-2.6.24/arch/powerpc/platforms/pseries/xics.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pseries/xics.c  2008-01-28 20:25:49.000000000 +0100
-@@ -87,19 +87,25 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/pseries/xics.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/pseries/xics.c
++++ linux-2.6.24.7/arch/powerpc/platforms/pseries/xics.c
+@@ -87,19 +87,25 @@ static int ibm_int_off;

  /* Direct HW low level accessors */
  
  
  /* Direct HW low level accessors */
  
  


@@ -55106,7 +55434,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/xics
  }
  
  static inline void direct_qirr_info(int n_cpu, u8 value)
  }
  
  static inline void direct_qirr_info(int n_cpu, u8 value)

-@@ -111,7 +117,7 @@
+@@ -111,7 +117,7 @@ static inline void direct_qirr_info(int 

  /* LPAR low level accessors */
  
  
  /* LPAR low level accessors */
  
  


@@ -55115,7 +55443,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/xics
  {
        unsigned long lpar_rc;
        unsigned long return_value;
  {
        unsigned long lpar_rc;
        unsigned long return_value;

-@@ -122,7 +128,7 @@
+@@ -122,7 +128,7 @@ static inline unsigned int lpar_xirr_inf

        return (unsigned int)return_value;
  }
  
        return (unsigned int)return_value;
  }
  


@@ -55124,7 +55452,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/xics
  {
        unsigned long lpar_rc;
        unsigned long val64 = value & 0xffffffff;
  {
        unsigned long lpar_rc;
        unsigned long val64 = value & 0xffffffff;

-@@ -133,7 +139,7 @@
+@@ -133,7 +139,7 @@ static inline void lpar_xirr_info_set(in

                      val64);
  }
  
                      val64);
  }
  


@@ -55133,7 +55461,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/xics
  {
        unsigned long lpar_rc;
  
  {
        unsigned long lpar_rc;
  

-@@ -275,21 +281,19 @@
+@@ -275,21 +281,19 @@ static unsigned int xics_startup(unsigne

  
  static void xics_eoi_direct(unsigned int virq)
  {
  
  static void xics_eoi_direct(unsigned int virq)
  {


@@ -55157,7 +55485,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/xics
  }
  
  static inline unsigned int xics_remap_irq(unsigned int vec)
  }
  
  static inline unsigned int xics_remap_irq(unsigned int vec)

-@@ -312,16 +316,12 @@
+@@ -312,16 +316,12 @@ static inline unsigned int xics_remap_ir

  
  static unsigned int xics_get_irq_direct(void)
  {
  
  static unsigned int xics_get_irq_direct(void)
  {


@@ -55176,7 +55504,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/xics
  }
  
  #ifdef CONFIG_SMP
  }
  
  #ifdef CONFIG_SMP

-@@ -387,12 +387,12 @@
+@@ -387,12 +387,12 @@ void xics_cause_IPI(int cpu)

  
  #endif /* CONFIG_SMP */
  
  
  #endif /* CONFIG_SMP */
  


@@ -55192,7 +55520,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/xics
        iosync();
  }
  
        iosync();
  }
  

-@@ -440,9 +440,7 @@
+@@ -440,9 +440,7 @@ static void xics_set_affinity(unsigned i

  
  void xics_setup_cpu(void)
  {
  
  void xics_setup_cpu(void)
  {


@@ -55203,7 +55531,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/xics
  
        /*
         * Put the calling processor into the GIQ.  This is really only
  
        /*
         * Put the calling processor into the GIQ.  This is really only

-@@ -783,7 +781,7 @@
+@@ -783,7 +781,7 @@ void xics_teardown_cpu(int secondary)

        unsigned int ipi;
        struct irq_desc *desc;
  
        unsigned int ipi;
        struct irq_desc *desc;
  


@@ -55212,7 +55540,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/xics
  
        /*
         * Clear IPI
  
        /*
         * Clear IPI

-@@ -824,10 +822,11 @@
+@@ -824,10 +822,11 @@ void xics_teardown_cpu(int secondary)

  void xics_migrate_irqs_away(void)
  {
        int status;
  void xics_migrate_irqs_away(void)
  {
        int status;


@@ -55226,7 +55554,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/xics
  
        /* remove ourselves from the global interrupt queue */
        status = rtas_set_indicator_fast(GLOBAL_INTERRUPT_QUEUE,
  
        /* remove ourselves from the global interrupt queue */
        status = rtas_set_indicator_fast(GLOBAL_INTERRUPT_QUEUE,

-@@ -835,7 +834,7 @@
+@@ -835,7 +834,7 @@ void xics_migrate_irqs_away(void)

        WARN_ON(status < 0);
  
        /* Allow IPIs again... */
        WARN_ON(status < 0);
  
        /* Allow IPIs again... */


@@ -55235,7 +55563,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/xics
  
        for_each_irq(virq) {
                struct irq_desc *desc;
  
        for_each_irq(virq) {
                struct irq_desc *desc;

-@@ -874,7 +873,7 @@
+@@ -874,7 +873,7 @@ void xics_migrate_irqs_away(void)

                 * The irq has to be migrated only in the single cpu
                 * case.
                 */
                 * The irq has to be migrated only in the single cpu
                 * case.
                 */


@@ -55244,10 +55572,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/xics
                        goto unlock;
  
                printk(KERN_WARNING "IRQ %u affinity broken off cpu %u\n",
                        goto unlock;
  
                printk(KERN_WARNING "IRQ %u affinity broken off cpu %u\n",

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/xics.h powerpc.git/arch/powerpc/platforms/pseries/xics.h
---- linux-2.6.24/arch/powerpc/platforms/pseries/xics.h 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pseries/xics.h  2008-01-28 20:25:49.000000000 +0100
-@@ -21,9 +21,6 @@
+Index: linux-2.6.24.7/arch/powerpc/platforms/pseries/xics.h
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/platforms/pseries/xics.h
++++ linux-2.6.24.7/arch/powerpc/platforms/pseries/xics.h
+@@ -21,9 +21,6 @@ extern void xics_cause_IPI(int cpu);

  extern  void xics_request_IPIs(void);
  extern void xics_migrate_irqs_away(void);
  
  extern  void xics_request_IPIs(void);
  extern void xics_migrate_irqs_away(void);
  


@@ -55257,9 +55586,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/xics
  struct xics_ipi_struct {
        volatile unsigned long value;
  } ____cacheline_aligned;
  struct xics_ipi_struct {
        volatile unsigned long value;
  } ____cacheline_aligned;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/Kconfig powerpc.git/arch/powerpc/sysdev/Kconfig
---- linux-2.6.24/arch/powerpc/sysdev/Kconfig   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/Kconfig    2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/sysdev/Kconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/sysdev/Kconfig

 @@ -0,0 +1,8 @@
 +# For a description of the syntax of this configuration file,
 +# see Documentation/kbuild/kconfig-language.txt.
 @@ -0,0 +1,8 @@
 +# For a description of the syntax of this configuration file,
 +# see Documentation/kbuild/kconfig-language.txt.


@@ -55269,10 +55599,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/Kconfig powerpc
 +      bool
 +      depends on PCI && 4xx
 +      default n
 +      bool
 +      depends on PCI && 4xx
 +      default n

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/Makefile powerpc.git/arch/powerpc/sysdev/Makefile
---- linux-2.6.24/arch/powerpc/sysdev/Makefile  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/Makefile   2008-01-28 20:25:49.000000000 +0100
-@@ -2,7 +2,7 @@
+Index: linux-2.6.24.7/arch/powerpc/sysdev/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/sysdev/Makefile
++++ linux-2.6.24.7/arch/powerpc/sysdev/Makefile
+@@ -2,7 +2,7 @@ ifeq ($(CONFIG_PPC64),y)

  EXTRA_CFLAGS                  += -mno-minimal-toc
  endif
  
  EXTRA_CFLAGS                  += -mno-minimal-toc
  endif
  


@@ -55281,7 +55612,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/Makefile powerp
  obj-$(CONFIG_MPIC)            += mpic.o $(mpic-msi-obj-y)
  
  obj-$(CONFIG_PPC_MPC106)      += grackle.o
  obj-$(CONFIG_MPIC)            += mpic.o $(mpic-msi-obj-y)
  
  obj-$(CONFIG_PPC_MPC106)      += grackle.o

-@@ -12,6 +12,7 @@
+@@ -12,6 +12,7 @@ obj-$(CONFIG_U3_DART)                += dart_iommu.o

  obj-$(CONFIG_MMIO_NVRAM)      += mmio_nvram.o
  obj-$(CONFIG_FSL_SOC)         += fsl_soc.o
  obj-$(CONFIG_FSL_PCI)         += fsl_pci.o
  obj-$(CONFIG_MMIO_NVRAM)      += mmio_nvram.o
  obj-$(CONFIG_FSL_SOC)         += fsl_soc.o
  obj-$(CONFIG_FSL_PCI)         += fsl_pci.o


@@ -55289,7 +55620,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/Makefile powerp
  obj-$(CONFIG_TSI108_BRIDGE)   += tsi108_pci.o tsi108_dev.o
  obj-$(CONFIG_QUICC_ENGINE)    += qe_lib/
  obj-$(CONFIG_PPC_BESTCOMM)    += bestcomm/
  obj-$(CONFIG_TSI108_BRIDGE)   += tsi108_pci.o tsi108_dev.o
  obj-$(CONFIG_QUICC_ENGINE)    += qe_lib/
  obj-$(CONFIG_PPC_BESTCOMM)    += bestcomm/

-@@ -24,9 +25,13 @@
+@@ -24,9 +25,13 @@ obj-$(CONFIG_AXON_RAM)              += axonram.o

  ifeq ($(CONFIG_PPC_MERGE),y)
  obj-$(CONFIG_PPC_INDIRECT_PCI)        += indirect_pci.o
  obj-$(CONFIG_PPC_I8259)               += i8259.o
  ifeq ($(CONFIG_PPC_MERGE),y)
  obj-$(CONFIG_PPC_INDIRECT_PCI)        += indirect_pci.o
  obj-$(CONFIG_PPC_I8259)               += i8259.o


@@ -55304,9 +55635,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/Makefile powerp
  endif
  
  # Temporary hack until we have migrated to asm-powerpc
  endif
  
  # Temporary hack until we have migrated to asm-powerpc

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/axonram.c powerpc.git/arch/powerpc/sysdev/axonram.c
---- linux-2.6.24/arch/powerpc/sysdev/axonram.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/axonram.c  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/sysdev/axonram.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/sysdev/axonram.c
++++ linux-2.6.24.7/arch/powerpc/sysdev/axonram.c

 @@ -42,8 +42,9 @@
  #include <linux/slab.h>
  #include <linux/string.h>
 @@ -42,8 +42,9 @@
  #include <linux/slab.h>
  #include <linux/string.h>


@@ -55319,10 +55651,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/axonram.c power
  #include <asm/page.h>
  #include <asm/prom.h>
  
  #include <asm/page.h>
  #include <asm/prom.h>
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/bestcomm/bestcomm.h powerpc.git/arch/powerpc/sysdev/bestcomm/bestcomm.h
---- linux-2.6.24/arch/powerpc/sysdev/bestcomm/bestcomm.h       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/bestcomm/bestcomm.h        2008-01-28 20:25:49.000000000 +0100
-@@ -20,7 +20,7 @@
+Index: linux-2.6.24.7/arch/powerpc/sysdev/bestcomm/bestcomm.h
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/sysdev/bestcomm/bestcomm.h
++++ linux-2.6.24.7/arch/powerpc/sysdev/bestcomm/bestcomm.h
+@@ -20,7 +20,7 @@ struct bcom_bd; /* defined later on ... 

  
  
  /* ======================================================================== */
  
  
  /* ======================================================================== */


@@ -55331,10 +55664,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/bestcomm/bestco
  /* ======================================================================== */
  
  /**
  /* ======================================================================== */
  
  /**

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/commproc.c powerpc.git/arch/powerpc/sysdev/commproc.c
---- linux-2.6.24/arch/powerpc/sysdev/commproc.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/commproc.c 2008-01-28 20:25:49.000000000 +0100
-@@ -240,6 +240,34 @@
+Index: linux-2.6.24.7/arch/powerpc/sysdev/commproc.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/sysdev/commproc.c
++++ linux-2.6.24.7/arch/powerpc/sysdev/commproc.c
+@@ -240,6 +240,34 @@ void __init cpm_reset(void)

  #endif
  }
  
  #endif
  }
  


@@ -55369,7 +55703,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/commproc.c powe
  /* We used to do this earlier, but have to postpone as long as possible
   * to ensure the kernel VM is now running.
   */
  /* We used to do this earlier, but have to postpone as long as possible
   * to ensure the kernel VM is now running.
   */

-@@ -408,7 +436,7 @@
+@@ -408,7 +436,7 @@ EXPORT_SYMBOL(cpm_dpram_phys);

  #endif /* !CONFIG_PPC_CPM_NEW_BINDING */
  
  struct cpm_ioport16 {
  #endif /* !CONFIG_PPC_CPM_NEW_BINDING */
  
  struct cpm_ioport16 {


@@ -55378,7 +55712,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/commproc.c powe
        __be16 res[3];
  };
  
        __be16 res[3];
  };
  

-@@ -438,6 +466,13 @@
+@@ -438,6 +466,13 @@ static void cpm1_set_pin32(int port, int

        else
                clrbits32(&iop->par, pin);
  
        else
                clrbits32(&iop->par, pin);
  


@@ -55392,7 +55726,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/commproc.c powe
        if (port == CPM_PORTE) {
                if (flags & CPM_PIN_SECONDARY)
                        setbits32(&iop->sor, pin);
        if (port == CPM_PORTE) {
                if (flags & CPM_PIN_SECONDARY)
                        setbits32(&iop->sor, pin);

-@@ -471,11 +506,17 @@
+@@ -471,11 +506,17 @@ static void cpm1_set_pin16(int port, int

        else
                clrbits16(&iop->par, pin);
  
        else
                clrbits16(&iop->par, pin);
  


@@ -55412,10 +55746,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/commproc.c powe
        }
  }
  
        }
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/cpm2_common.c powerpc.git/arch/powerpc/sysdev/cpm2_common.c
---- linux-2.6.24/arch/powerpc/sysdev/cpm2_common.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/cpm2_common.c      2008-01-28 20:25:49.000000000 +0100
-@@ -82,6 +82,31 @@
+Index: linux-2.6.24.7/arch/powerpc/sysdev/cpm2_common.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/sysdev/cpm2_common.c
++++ linux-2.6.24.7/arch/powerpc/sysdev/cpm2_common.c
+@@ -82,6 +82,31 @@ void __init cpm2_reset(void)

        cpmp = &cpm2_immr->im_cpm;
  }
  
        cpmp = &cpm2_immr->im_cpm;
  }
  


@@ -55447,10 +55782,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/cpm2_common.c p
  /* Set a baud rate generator.  This needs lots of work.  There are
   * eight BRGs, which can be connected to the CPM channels or output
   * as clocks.  The BRGs are in two different block of internal
  /* Set a baud rate generator.  This needs lots of work.  There are
   * eight BRGs, which can be connected to the CPM channels or output
   * as clocks.  The BRGs are in two different block of internal

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_pci.c powerpc.git/arch/powerpc/sysdev/fsl_pci.c
---- linux-2.6.24/arch/powerpc/sysdev/fsl_pci.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/fsl_pci.c  2008-01-28 20:25:49.000000000 +0100
-@@ -33,8 +33,8 @@
+Index: linux-2.6.24.7/arch/powerpc/sysdev/fsl_pci.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/sysdev/fsl_pci.c
++++ linux-2.6.24.7/arch/powerpc/sysdev/fsl_pci.c
+@@ -33,8 +33,8 @@ void __init setup_pci_atmu(struct pci_co

        struct ccsr_pci __iomem *pci;
        int i;
  
        struct ccsr_pci __iomem *pci;
        int i;
  


@@ -55461,7 +55797,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_pci.c power
        pci = ioremap(rsrc->start, rsrc->end - rsrc->start + 1);
  
        /* Disable all windows (except powar0 since its ignored) */
        pci = ioremap(rsrc->start, rsrc->end - rsrc->start + 1);
  
        /* Disable all windows (except powar0 since its ignored) */

-@@ -46,17 +46,17 @@
+@@ -46,17 +46,17 @@ void __init setup_pci_atmu(struct pci_co

        /* Setup outbound MEM window */
        for(i = 0; i < 3; i++)
                if (hose->mem_resources[i].flags & IORESOURCE_MEM){
        /* Setup outbound MEM window */
        for(i = 0; i < 3; i++)
                if (hose->mem_resources[i].flags & IORESOURCE_MEM){


@@ -55488,7 +55824,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_pci.c power
                        /* Enable, Mem R/W */
                        out_be32(&pci->pow[i+1].powar, 0x80044000
                                | (__ilog2(hose->mem_resources[i].end
                        /* Enable, Mem R/W */
                        out_be32(&pci->pow[i+1].powar, 0x80044000
                                | (__ilog2(hose->mem_resources[i].end

-@@ -65,15 +65,14 @@
+@@ -65,15 +65,14 @@ void __init setup_pci_atmu(struct pci_co

  
        /* Setup outbound IO window */
        if (hose->io_resource.flags & IORESOURCE_IO){
  
        /* Setup outbound IO window */
        if (hose->io_resource.flags & IORESOURCE_IO){


@@ -55511,7 +55847,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_pci.c power
                /* Enable, IO R/W */
                out_be32(&pci->pow[i+1].powar, 0x80088000
                        | (__ilog2(hose->io_resource.end
                /* Enable, IO R/W */
                out_be32(&pci->pow[i+1].powar, 0x80088000
                        | (__ilog2(hose->io_resource.end

-@@ -107,55 +106,17 @@
+@@ -107,55 +106,17 @@ void __init setup_pci_cmd(struct pci_con

        }
  }
  
        }
  }
  


@@ -55573,7 +55909,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_pci.c power
  }
  
  int __init fsl_pcie_check_link(struct pci_controller *hose)
  }
  
  int __init fsl_pcie_check_link(struct pci_controller *hose)

-@@ -172,11 +133,24 @@
+@@ -172,11 +133,24 @@ void fsl_pcibios_fixup_bus(struct pci_bu

        struct pci_controller *hose = (struct pci_controller *) bus->sysdata;
        int i;
  
        struct pci_controller *hose = (struct pci_controller *) bus->sysdata;
        int i;
  


@@ -55603,7 +55939,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_pci.c power
                }
        }
  }
                }
        }
  }

-@@ -202,7 +176,7 @@
+@@ -202,7 +176,7 @@ int __init fsl_add_bridge(struct device_

                printk(KERN_WARNING "Can't get bus-range for %s, assume"
                        " bus 0\n", dev->full_name);
  
                printk(KERN_WARNING "Can't get bus-range for %s, assume"
                        " bus 0\n", dev->full_name);
  


@@ -55612,7 +55948,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_pci.c power
        hose = pcibios_alloc_controller(dev);
        if (!hose)
                return -ENOMEM;
        hose = pcibios_alloc_controller(dev);
        if (!hose)
                return -ENOMEM;

-@@ -222,7 +196,7 @@
+@@ -222,7 +196,7 @@ int __init fsl_add_bridge(struct device_

                        hose->indirect_type |= PPC_INDIRECT_TYPE_NO_PCIE_LINK;
        }
  
                        hose->indirect_type |= PPC_INDIRECT_TYPE_NO_PCIE_LINK;
        }
  


@@ -55621,7 +55957,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_pci.c power
                "Firmware bus number: %d->%d\n",
                (unsigned long long)rsrc.start, hose->first_busno,
                hose->last_busno);
                "Firmware bus number: %d->%d\n",
                (unsigned long long)rsrc.start, hose->first_busno,
                hose->last_busno);

-@@ -240,23 +214,23 @@
+@@ -240,23 +214,23 @@ int __init fsl_add_bridge(struct device_

        return 0;
  }
  
        return 0;
  }
  


@@ -55665,9 +56001,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_pci.c power
 +DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8641, quirk_fsl_pcie_header);
 +DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8641D, quirk_fsl_pcie_header);
 +DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8610, quirk_fsl_pcie_header);
 +DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8641, quirk_fsl_pcie_header);
 +DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8641D, quirk_fsl_pcie_header);
 +DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8610, quirk_fsl_pcie_header);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_rio.c powerpc.git/arch/powerpc/sysdev/fsl_rio.c
---- linux-2.6.24/arch/powerpc/sysdev/fsl_rio.c 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/fsl_rio.c  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/sysdev/fsl_rio.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/sysdev/fsl_rio.c

 @@ -0,0 +1,932 @@
 +/*
 + * MPC85xx RapidIO support
 @@ -0,0 +1,932 @@
 +/*
 + * MPC85xx RapidIO support


@@ -56601,9 +56938,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_rio.c power
 +      out_be32((void *)&dbell_atmu_regs->rowar, 0x8004200b);
 +      mpc85xx_rio_doorbell_init(port);
 +}
 +      out_be32((void *)&dbell_atmu_regs->rowar, 0x8004200b);
 +      mpc85xx_rio_doorbell_init(port);
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_rio.h powerpc.git/arch/powerpc/sysdev/fsl_rio.h
---- linux-2.6.24/arch/powerpc/sysdev/fsl_rio.h 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/fsl_rio.h  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/sysdev/fsl_rio.h
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/sysdev/fsl_rio.h

 @@ -0,0 +1,20 @@
 +/*
 + * MPC85xx RapidIO definitions
 @@ -0,0 +1,20 @@
 +/*
 + * MPC85xx RapidIO definitions


@@ -56625,9 +56963,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_rio.h power
 +extern void mpc85xx_rio_setup(int law_start, int law_size);
 +
 +#endif                                /* __PPC_SYSLIB_PPC85XX_RIO_H */
 +extern void mpc85xx_rio_setup(int law_start, int law_size);
 +
 +#endif                                /* __PPC_SYSLIB_PPC85XX_RIO_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_soc.c powerpc.git/arch/powerpc/sysdev/fsl_soc.c
---- linux-2.6.24/arch/powerpc/sysdev/fsl_soc.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/fsl_soc.c  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/sysdev/fsl_soc.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/sysdev/fsl_soc.c
++++ linux-2.6.24.7/arch/powerpc/sysdev/fsl_soc.c

 @@ -24,6 +24,7 @@
  #include <linux/platform_device.h>
  #include <linux/of_platform.h>
 @@ -24,6 +24,7 @@
  #include <linux/platform_device.h>
  #include <linux/of_platform.h>


@@ -56636,7 +56975,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_soc.c power
  #include <linux/spi/spi.h>
  #include <linux/fsl_devices.h>
  #include <linux/fs_enet_pd.h>
  #include <linux/spi/spi.h>
  #include <linux/fsl_devices.h>
  #include <linux/fs_enet_pd.h>

-@@ -54,10 +55,18 @@
+@@ -54,10 +55,18 @@ phys_addr_t get_immrbase(void)

        soc = of_find_node_by_type(NULL, "soc");
        if (soc) {
                int size;
        soc = of_find_node_by_type(NULL, "soc");
        if (soc) {
                int size;


@@ -56657,7 +56996,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_soc.c power
                of_node_put(soc);
        }
  
                of_node_put(soc);
        }
  

-@@ -130,17 +139,51 @@
+@@ -130,17 +139,51 @@ u32 get_baudrate(void)

  EXPORT_SYMBOL(get_baudrate);
  #endif /* CONFIG_CPM2 */
  
  EXPORT_SYMBOL(get_baudrate);
  #endif /* CONFIG_CPM2 */
  


@@ -56714,7 +57053,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_soc.c power
                int k;
                struct device_node *child = NULL;
                struct gianfar_mdio_data mdio_data;
                int k;
                struct device_node *child = NULL;
                struct gianfar_mdio_data mdio_data;

-@@ -179,11 +222,13 @@
+@@ -179,11 +222,13 @@ static int __init gfar_mdio_of_init(void

                        goto unreg;
        }
  
                        goto unreg;
        }
  


@@ -56728,7 +57067,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_soc.c power
        return ret;
  }
  
        return ret;
  }
  

-@@ -193,7 +238,6 @@
+@@ -193,7 +238,6 @@ static const char *gfar_tx_intr = "tx";

  static const char *gfar_rx_intr = "rx";
  static const char *gfar_err_intr = "error";
  
  static const char *gfar_rx_intr = "rx";
  static const char *gfar_err_intr = "error";
  


@@ -56736,7 +57075,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_soc.c power
  static int __init gfar_of_init(void)
  {
        struct device_node *np;
  static int __init gfar_of_init(void)
  {
        struct device_node *np;

-@@ -277,29 +321,43 @@
+@@ -277,29 +321,43 @@ static int __init gfar_of_init(void)

                        gfar_data.interface = PHY_INTERFACE_MODE_MII;
  
                ph = of_get_property(np, "phy-handle", NULL);
                        gfar_data.interface = PHY_INTERFACE_MODE_MII;
  
                ph = of_get_property(np, "phy-handle", NULL);


@@ -56796,7 +57135,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_soc.c power
                ret =
                    platform_device_add_data(gfar_dev, &gfar_data,
                                             sizeof(struct
                ret =
                    platform_device_add_data(gfar_dev, &gfar_data,
                                             sizeof(struct

-@@ -390,13 +448,11 @@
+@@ -390,13 +448,11 @@ static void __init of_register_i2c_devic

  static int __init fsl_i2c_of_init(void)
  {
        struct device_node *np;
  static int __init fsl_i2c_of_init(void)
  {
        struct device_node *np;


@@ -56812,7 +57151,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_soc.c power
                struct resource r[2];
                struct fsl_i2c_platform_data i2c_data;
                const unsigned char *flags = NULL;
                struct resource r[2];
                struct fsl_i2c_platform_data i2c_data;
                const unsigned char *flags = NULL;

-@@ -432,7 +488,7 @@
+@@ -432,7 +488,7 @@ static int __init fsl_i2c_of_init(void)

                if (ret)
                        goto unreg;
  
                if (ret)
                        goto unreg;
  


@@ -56821,7 +57160,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_soc.c power
        }
  
        return 0;
        }
  
        return 0;

-@@ -528,14 +584,12 @@
+@@ -528,14 +584,12 @@ static enum fsl_usb2_phy_modes determine

  static int __init fsl_usb_of_init(void)
  {
        struct device_node *np;
  static int __init fsl_usb_of_init(void)
  {
        struct device_node *np;


@@ -56838,7 +57177,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_soc.c power
                struct resource r[2];
                struct fsl_usb2_platform_data usb_data;
                const unsigned char *prop = NULL;
                struct resource r[2];
                struct fsl_usb2_platform_data usb_data;
                const unsigned char *prop = NULL;

-@@ -578,11 +632,10 @@
+@@ -578,11 +632,10 @@ static int __init fsl_usb_of_init(void)

                                                    fsl_usb2_platform_data));
                if (ret)
                        goto unreg_mph;
                                                    fsl_usb2_platform_data));
                if (ret)
                        goto unreg_mph;


@@ -56852,7 +57191,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_soc.c power
                struct resource r[2];
                struct fsl_usb2_platform_data usb_data;
                const unsigned char *prop = NULL;
                struct resource r[2];
                struct fsl_usb2_platform_data usb_data;
                const unsigned char *prop = NULL;

-@@ -654,6 +707,7 @@
+@@ -654,6 +707,7 @@ static int __init fsl_usb_of_init(void)

                                                fsl_usb2_platform_data))))
                                goto unreg_dr;
                }
                                                fsl_usb2_platform_data))))
                                goto unreg_dr;
                }


@@ -56860,7 +57199,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_soc.c power
        }
        return 0;
  
        }
        return 0;
  

-@@ -1125,13 +1179,12 @@
+@@ -1125,13 +1179,12 @@ arch_initcall(fs_enet_of_init);

  
  static int __init fsl_pcmcia_of_init(void)
  {
  
  static int __init fsl_pcmcia_of_init(void)
  {


@@ -56877,10 +57216,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_soc.c power
        return 0;
  }
  
        return 0;
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/grackle.c powerpc.git/arch/powerpc/sysdev/grackle.c
---- linux-2.6.24/arch/powerpc/sysdev/grackle.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/grackle.c  2008-01-28 20:25:49.000000000 +0100
-@@ -57,7 +57,7 @@
+Index: linux-2.6.24.7/arch/powerpc/sysdev/grackle.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/sysdev/grackle.c
++++ linux-2.6.24.7/arch/powerpc/sysdev/grackle.c
+@@ -57,7 +57,7 @@ void __init setup_grackle(struct pci_con

  {
        setup_indirect_pci(hose, 0xfec00000, 0xfee00000, 0);
        if (machine_is_compatible("PowerMac1,1"))
  {
        setup_indirect_pci(hose, 0xfec00000, 0xfee00000, 0);
        if (machine_is_compatible("PowerMac1,1"))


@@ -56889,9 +57229,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/grackle.c power
        if (machine_is_compatible("AAPL,PowerBook1998"))
                grackle_set_loop_snoop(hose, 1);
  #if 0 /* Disabled for now, HW problems ??? */
        if (machine_is_compatible("AAPL,PowerBook1998"))
                grackle_set_loop_snoop(hose, 1);
  #if 0 /* Disabled for now, HW problems ??? */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.git/arch/powerpc/sysdev/ipic.c
---- linux-2.6.24/arch/powerpc/sysdev/ipic.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/ipic.c     2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/sysdev/ipic.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/sysdev/ipic.c
++++ linux-2.6.24.7/arch/powerpc/sysdev/ipic.c

 @@ -30,11 +30,67 @@
  #include "ipic.h"
  
 @@ -30,11 +30,67 @@
  #include "ipic.h"
  


@@ -56961,7 +57302,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
                .mask   = IPIC_SIMSR_H,
                .prio   = IPIC_SIPRR_D,
                .force  = IPIC_SIFCR_H,
                .mask   = IPIC_SIMSR_H,
                .prio   = IPIC_SIPRR_D,
                .force  = IPIC_SIFCR_H,

-@@ -42,7 +98,6 @@
+@@ -42,7 +98,6 @@ static struct ipic_info ipic_info[] = {

                .prio_mask = 0,
        },
        [10] = {
                .prio_mask = 0,
        },
        [10] = {


@@ -56969,7 +57310,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
                .mask   = IPIC_SIMSR_H,
                .prio   = IPIC_SIPRR_D,
                .force  = IPIC_SIFCR_H,
                .mask   = IPIC_SIMSR_H,
                .prio   = IPIC_SIPRR_D,
                .force  = IPIC_SIFCR_H,

-@@ -50,15 +105,27 @@
+@@ -50,15 +105,27 @@ static struct ipic_info ipic_info[] = {

                .prio_mask = 1,
        },
        [11] = {
                .prio_mask = 1,
        },
        [11] = {


@@ -56999,7 +57340,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
                .mask   = IPIC_SIMSR_H,
                .prio   = IPIC_SIPRR_D,
                .force  = IPIC_SIFCR_H,
                .mask   = IPIC_SIMSR_H,
                .prio   = IPIC_SIPRR_D,
                .force  = IPIC_SIFCR_H,

-@@ -66,7 +133,6 @@
+@@ -66,7 +133,6 @@ static struct ipic_info ipic_info[] = {

                .prio_mask = 5,
        },
        [15] = {
                .prio_mask = 5,
        },
        [15] = {


@@ -57007,7 +57348,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
                .mask   = IPIC_SIMSR_H,
                .prio   = IPIC_SIPRR_D,
                .force  = IPIC_SIFCR_H,
                .mask   = IPIC_SIMSR_H,
                .prio   = IPIC_SIPRR_D,
                .force  = IPIC_SIFCR_H,

-@@ -74,7 +140,6 @@
+@@ -74,7 +140,6 @@ static struct ipic_info ipic_info[] = {

                .prio_mask = 6,
        },
        [16] = {
                .prio_mask = 6,
        },
        [16] = {


@@ -57015,7 +57356,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
                .mask   = IPIC_SIMSR_H,
                .prio   = IPIC_SIPRR_D,
                .force  = IPIC_SIFCR_H,
                .mask   = IPIC_SIMSR_H,
                .prio   = IPIC_SIPRR_D,
                .force  = IPIC_SIFCR_H,

-@@ -82,7 +147,7 @@
+@@ -82,7 +147,7 @@ static struct ipic_info ipic_info[] = {

                .prio_mask = 7,
        },
        [17] = {
                .prio_mask = 7,
        },
        [17] = {


@@ -57024,7 +57365,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
                .mask   = IPIC_SEMSR,
                .prio   = IPIC_SMPRR_A,
                .force  = IPIC_SEFCR,
                .mask   = IPIC_SEMSR,
                .prio   = IPIC_SMPRR_A,
                .force  = IPIC_SEFCR,

-@@ -90,7 +155,7 @@
+@@ -90,7 +155,7 @@ static struct ipic_info ipic_info[] = {

                .prio_mask = 5,
        },
        [18] = {
                .prio_mask = 5,
        },
        [18] = {


@@ -57033,7 +57374,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
                .mask   = IPIC_SEMSR,
                .prio   = IPIC_SMPRR_A,
                .force  = IPIC_SEFCR,
                .mask   = IPIC_SEMSR,
                .prio   = IPIC_SMPRR_A,
                .force  = IPIC_SEFCR,

-@@ -98,7 +163,7 @@
+@@ -98,7 +163,7 @@ static struct ipic_info ipic_info[] = {

                .prio_mask = 6,
        },
        [19] = {
                .prio_mask = 6,
        },
        [19] = {


@@ -57042,7 +57383,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
                .mask   = IPIC_SEMSR,
                .prio   = IPIC_SMPRR_A,
                .force  = IPIC_SEFCR,
                .mask   = IPIC_SEMSR,
                .prio   = IPIC_SMPRR_A,
                .force  = IPIC_SEFCR,

-@@ -106,7 +171,7 @@
+@@ -106,7 +171,7 @@ static struct ipic_info ipic_info[] = {

                .prio_mask = 7,
        },
        [20] = {
                .prio_mask = 7,
        },
        [20] = {


@@ -57051,7 +57392,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
                .mask   = IPIC_SEMSR,
                .prio   = IPIC_SMPRR_B,
                .force  = IPIC_SEFCR,
                .mask   = IPIC_SEMSR,
                .prio   = IPIC_SMPRR_B,
                .force  = IPIC_SEFCR,

-@@ -114,7 +179,7 @@
+@@ -114,7 +179,7 @@ static struct ipic_info ipic_info[] = {

                .prio_mask = 4,
        },
        [21] = {
                .prio_mask = 4,
        },
        [21] = {


@@ -57060,7 +57401,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
                .mask   = IPIC_SEMSR,
                .prio   = IPIC_SMPRR_B,
                .force  = IPIC_SEFCR,
                .mask   = IPIC_SEMSR,
                .prio   = IPIC_SMPRR_B,
                .force  = IPIC_SEFCR,

-@@ -122,7 +187,7 @@
+@@ -122,7 +187,7 @@ static struct ipic_info ipic_info[] = {

                .prio_mask = 5,
        },
        [22] = {
                .prio_mask = 5,
        },
        [22] = {


@@ -57069,7 +57410,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
                .mask   = IPIC_SEMSR,
                .prio   = IPIC_SMPRR_B,
                .force  = IPIC_SEFCR,
                .mask   = IPIC_SEMSR,
                .prio   = IPIC_SMPRR_B,
                .force  = IPIC_SEFCR,

-@@ -130,7 +195,7 @@
+@@ -130,7 +195,7 @@ static struct ipic_info ipic_info[] = {

                .prio_mask = 6,
        },
        [23] = {
                .prio_mask = 6,
        },
        [23] = {


@@ -57078,7 +57419,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
                .mask   = IPIC_SEMSR,
                .prio   = IPIC_SMPRR_B,
                .force  = IPIC_SEFCR,
                .mask   = IPIC_SEMSR,
                .prio   = IPIC_SMPRR_B,
                .force  = IPIC_SEFCR,

-@@ -138,7 +203,6 @@
+@@ -138,7 +203,6 @@ static struct ipic_info ipic_info[] = {

                .prio_mask = 7,
        },
        [32] = {
                .prio_mask = 7,
        },
        [32] = {


@@ -57086,7 +57427,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
                .mask   = IPIC_SIMSR_H,
                .prio   = IPIC_SIPRR_A,
                .force  = IPIC_SIFCR_H,
                .mask   = IPIC_SIMSR_H,
                .prio   = IPIC_SIPRR_A,
                .force  = IPIC_SIFCR_H,

-@@ -146,7 +210,6 @@
+@@ -146,7 +210,6 @@ static struct ipic_info ipic_info[] = {

                .prio_mask = 0,
        },
        [33] = {
                .prio_mask = 0,
        },
        [33] = {


@@ -57094,7 +57435,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
                .mask   = IPIC_SIMSR_H,
                .prio   = IPIC_SIPRR_A,
                .force  = IPIC_SIFCR_H,
                .mask   = IPIC_SIMSR_H,
                .prio   = IPIC_SIPRR_A,
                .force  = IPIC_SIFCR_H,

-@@ -154,7 +217,6 @@
+@@ -154,7 +217,6 @@ static struct ipic_info ipic_info[] = {

                .prio_mask = 1,
        },
        [34] = {
                .prio_mask = 1,
        },
        [34] = {


@@ -57102,7 +57443,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
                .mask   = IPIC_SIMSR_H,
                .prio   = IPIC_SIPRR_A,
                .force  = IPIC_SIFCR_H,
                .mask   = IPIC_SIMSR_H,
                .prio   = IPIC_SIPRR_A,
                .force  = IPIC_SIFCR_H,

-@@ -162,7 +224,6 @@
+@@ -162,7 +224,6 @@ static struct ipic_info ipic_info[] = {

                .prio_mask = 2,
        },
        [35] = {
                .prio_mask = 2,
        },
        [35] = {


@@ -57110,7 +57451,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
                .mask   = IPIC_SIMSR_H,
                .prio   = IPIC_SIPRR_A,
                .force  = IPIC_SIFCR_H,
                .mask   = IPIC_SIMSR_H,
                .prio   = IPIC_SIPRR_A,
                .force  = IPIC_SIFCR_H,

-@@ -170,7 +231,6 @@
+@@ -170,7 +231,6 @@ static struct ipic_info ipic_info[] = {

                .prio_mask = 3,
        },
        [36] = {
                .prio_mask = 3,
        },
        [36] = {


@@ -57118,7 +57459,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
                .mask   = IPIC_SIMSR_H,
                .prio   = IPIC_SIPRR_A,
                .force  = IPIC_SIFCR_H,
                .mask   = IPIC_SIMSR_H,
                .prio   = IPIC_SIPRR_A,
                .force  = IPIC_SIFCR_H,

-@@ -178,7 +238,6 @@
+@@ -178,7 +238,6 @@ static struct ipic_info ipic_info[] = {

                .prio_mask = 4,
        },
        [37] = {
                .prio_mask = 4,
        },
        [37] = {


@@ -57126,7 +57467,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
                .mask   = IPIC_SIMSR_H,
                .prio   = IPIC_SIPRR_A,
                .force  = IPIC_SIFCR_H,
                .mask   = IPIC_SIMSR_H,
                .prio   = IPIC_SIPRR_A,
                .force  = IPIC_SIFCR_H,

-@@ -186,7 +245,6 @@
+@@ -186,7 +245,6 @@ static struct ipic_info ipic_info[] = {

                .prio_mask = 5,
        },
        [38] = {
                .prio_mask = 5,
        },
        [38] = {


@@ -57134,7 +57475,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
                .mask   = IPIC_SIMSR_H,
                .prio   = IPIC_SIPRR_A,
                .force  = IPIC_SIFCR_H,
                .mask   = IPIC_SIMSR_H,
                .prio   = IPIC_SIPRR_A,
                .force  = IPIC_SIFCR_H,

-@@ -194,15 +252,69 @@
+@@ -194,15 +252,69 @@ static struct ipic_info ipic_info[] = {

                .prio_mask = 6,
        },
        [39] = {
                .prio_mask = 6,
        },
        [39] = {


@@ -57206,7 +57547,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
                .mask   = IPIC_SEMSR,
                .prio   = IPIC_SMPRR_A,
                .force  = IPIC_SEFCR,
                .mask   = IPIC_SEMSR,
                .prio   = IPIC_SMPRR_A,
                .force  = IPIC_SEFCR,

-@@ -210,7 +322,6 @@
+@@ -210,7 +322,6 @@ static struct ipic_info ipic_info[] = {

                .prio_mask = 4,
        },
        [64] = {
                .prio_mask = 4,
        },
        [64] = {


@@ -57214,7 +57555,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
                .mask   = IPIC_SIMSR_L,
                .prio   = IPIC_SMPRR_A,
                .force  = IPIC_SIFCR_L,
                .mask   = IPIC_SIMSR_L,
                .prio   = IPIC_SMPRR_A,
                .force  = IPIC_SIFCR_L,

-@@ -218,7 +329,6 @@
+@@ -218,7 +329,6 @@ static struct ipic_info ipic_info[] = {

                .prio_mask = 0,
        },
        [65] = {
                .prio_mask = 0,
        },
        [65] = {


@@ -57222,7 +57563,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
                .mask   = IPIC_SIMSR_L,
                .prio   = IPIC_SMPRR_A,
                .force  = IPIC_SIFCR_L,
                .mask   = IPIC_SIMSR_L,
                .prio   = IPIC_SMPRR_A,
                .force  = IPIC_SIFCR_L,

-@@ -226,7 +336,6 @@
+@@ -226,7 +336,6 @@ static struct ipic_info ipic_info[] = {

                .prio_mask = 1,
        },
        [66] = {
                .prio_mask = 1,
        },
        [66] = {


@@ -57230,7 +57571,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
                .mask   = IPIC_SIMSR_L,
                .prio   = IPIC_SMPRR_A,
                .force  = IPIC_SIFCR_L,
                .mask   = IPIC_SIMSR_L,
                .prio   = IPIC_SMPRR_A,
                .force  = IPIC_SIFCR_L,

-@@ -234,7 +343,6 @@
+@@ -234,7 +343,6 @@ static struct ipic_info ipic_info[] = {

                .prio_mask = 2,
        },
        [67] = {
                .prio_mask = 2,
        },
        [67] = {


@@ -57238,7 +57579,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
                .mask   = IPIC_SIMSR_L,
                .prio   = IPIC_SMPRR_A,
                .force  = IPIC_SIFCR_L,
                .mask   = IPIC_SIMSR_L,
                .prio   = IPIC_SMPRR_A,
                .force  = IPIC_SIFCR_L,

-@@ -242,7 +350,6 @@
+@@ -242,7 +350,6 @@ static struct ipic_info ipic_info[] = {

                .prio_mask = 3,
        },
        [68] = {
                .prio_mask = 3,
        },
        [68] = {


@@ -57246,7 +57587,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
                .mask   = IPIC_SIMSR_L,
                .prio   = IPIC_SMPRR_B,
                .force  = IPIC_SIFCR_L,
                .mask   = IPIC_SIMSR_L,
                .prio   = IPIC_SMPRR_B,
                .force  = IPIC_SIFCR_L,

-@@ -250,7 +357,6 @@
+@@ -250,7 +357,6 @@ static struct ipic_info ipic_info[] = {

                .prio_mask = 0,
        },
        [69] = {
                .prio_mask = 0,
        },
        [69] = {


@@ -57254,7 +57595,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
                .mask   = IPIC_SIMSR_L,
                .prio   = IPIC_SMPRR_B,
                .force  = IPIC_SIFCR_L,
                .mask   = IPIC_SIMSR_L,
                .prio   = IPIC_SMPRR_B,
                .force  = IPIC_SIFCR_L,

-@@ -258,7 +364,6 @@
+@@ -258,7 +364,6 @@ static struct ipic_info ipic_info[] = {

                .prio_mask = 1,
        },
        [70] = {
                .prio_mask = 1,
        },
        [70] = {


@@ -57262,7 +57603,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
                .mask   = IPIC_SIMSR_L,
                .prio   = IPIC_SMPRR_B,
                .force  = IPIC_SIFCR_L,
                .mask   = IPIC_SIMSR_L,
                .prio   = IPIC_SMPRR_B,
                .force  = IPIC_SIFCR_L,

-@@ -266,7 +371,6 @@
+@@ -266,7 +371,6 @@ static struct ipic_info ipic_info[] = {

                .prio_mask = 2,
        },
        [71] = {
                .prio_mask = 2,
        },
        [71] = {


@@ -57270,7 +57611,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
                .mask   = IPIC_SIMSR_L,
                .prio   = IPIC_SMPRR_B,
                .force  = IPIC_SIFCR_L,
                .mask   = IPIC_SIMSR_L,
                .prio   = IPIC_SMPRR_B,
                .force  = IPIC_SIFCR_L,

-@@ -274,91 +378,120 @@
+@@ -274,91 +378,120 @@ static struct ipic_info ipic_info[] = {

                .prio_mask = 3,
        },
        [72] = {
                .prio_mask = 3,
        },
        [72] = {


@@ -57404,7 +57745,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
                .mask   = IPIC_SIMSR_L,
                .prio   = 0,
                .force  = IPIC_SIFCR_L,
                .mask   = IPIC_SIMSR_L,
                .prio   = 0,
                .force  = IPIC_SIFCR_L,

-@@ -412,6 +545,10 @@
+@@ -412,6 +545,10 @@ static void ipic_mask_irq(unsigned int v

        temp &= ~(1 << (31 - ipic_info[src].bit));
        ipic_write(ipic->regs, ipic_info[src].mask, temp);
  
        temp &= ~(1 << (31 - ipic_info[src].bit));
        ipic_write(ipic->regs, ipic_info[src].mask, temp);
  


@@ -57415,7 +57756,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
        spin_unlock_irqrestore(&ipic_lock, flags);
  }
  
        spin_unlock_irqrestore(&ipic_lock, flags);
  }
  

-@@ -424,9 +561,13 @@
+@@ -424,9 +561,13 @@ static void ipic_ack_irq(unsigned int vi

  
        spin_lock_irqsave(&ipic_lock, flags);
  
  
        spin_lock_irqsave(&ipic_lock, flags);
  


@@ -57431,7 +57772,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
  
        spin_unlock_irqrestore(&ipic_lock, flags);
  }
  
        spin_unlock_irqrestore(&ipic_lock, flags);
  }

-@@ -444,9 +585,13 @@
+@@ -444,9 +585,13 @@ static void ipic_mask_irq_and_ack(unsign

        temp &= ~(1 << (31 - ipic_info[src].bit));
        ipic_write(ipic->regs, ipic_info[src].mask, temp);
  
        temp &= ~(1 << (31 - ipic_info[src].bit));
        ipic_write(ipic->regs, ipic_info[src].mask, temp);
  


@@ -57447,7 +57788,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
  
        spin_unlock_irqrestore(&ipic_lock, flags);
  }
  
        spin_unlock_irqrestore(&ipic_lock, flags);
  }

-@@ -468,14 +613,22 @@
+@@ -468,14 +613,22 @@ static int ipic_set_irq_type(unsigned in

                        flow_type);
                return -EINVAL;
        }
                        flow_type);
                return -EINVAL;
        }


@@ -57470,7 +57811,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
        }
  
        /* only EXT IRQ senses are programmable on ipic
        }
  
        /* only EXT IRQ senses are programmable on ipic

-@@ -500,7 +653,16 @@
+@@ -500,7 +653,16 @@ static int ipic_set_irq_type(unsigned in

        return 0;
  }
  
        return 0;
  }
  


@@ -57488,7 +57829,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
        .typename       = " IPIC  ",
        .unmask         = ipic_unmask_irq,
        .mask           = ipic_mask_irq,
        .typename       = " IPIC  ",
        .unmask         = ipic_unmask_irq,
        .mask           = ipic_mask_irq,

-@@ -519,13 +681,9 @@
+@@ -519,13 +681,9 @@ static int ipic_host_map(struct irq_host

                         irq_hw_number_t hw)
  {
        struct ipic *ipic = h->host_data;
                         irq_hw_number_t hw)
  {
        struct ipic *ipic = h->host_data;


@@ -57503,7 +57844,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
  
        /* Set default irq type */
        set_irq_type(virq, IRQ_TYPE_NONE);
  
        /* Set default irq type */
        set_irq_type(virq, IRQ_TYPE_NONE);

-@@ -584,7 +742,6 @@
+@@ -584,7 +742,6 @@ struct ipic * __init ipic_init(struct de

        ipic->regs = ioremap(res.start, res.end - res.start + 1);
  
        ipic->irqhost->host_data = ipic;
        ipic->regs = ioremap(res.start, res.end - res.start + 1);
  
        ipic->irqhost->host_data = ipic;


@@ -57511,7 +57852,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
  
        /* init hw */
        ipic_write(ipic->regs, IPIC_SICNR, 0x0);
  
        /* init hw */
        ipic_write(ipic->regs, IPIC_SICNR, 0x0);

-@@ -593,6 +750,10 @@
+@@ -593,6 +750,10 @@ struct ipic * __init ipic_init(struct de

         * configure SICFR accordingly */
        if (flags & IPIC_SPREADMODE_GRP_A)
                temp |= SICFR_IPSA;
         * configure SICFR accordingly */
        if (flags & IPIC_SPREADMODE_GRP_A)
                temp |= SICFR_IPSA;


@@ -57522,7 +57863,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
        if (flags & IPIC_SPREADMODE_GRP_D)
                temp |= SICFR_IPSD;
        if (flags & IPIC_SPREADMODE_MIX_A)
        if (flags & IPIC_SPREADMODE_GRP_D)
                temp |= SICFR_IPSD;
        if (flags & IPIC_SPREADMODE_MIX_A)

-@@ -600,7 +761,7 @@
+@@ -600,7 +761,7 @@ struct ipic * __init ipic_init(struct de

        if (flags & IPIC_SPREADMODE_MIX_B)
                temp |= SICFR_MPSB;
  
        if (flags & IPIC_SPREADMODE_MIX_B)
                temp |= SICFR_MPSB;
  


@@ -57531,7 +57872,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
  
        /* handle MCP route */
        temp = 0;
  
        /* handle MCP route */
        temp = 0;

-@@ -672,10 +833,12 @@
+@@ -672,10 +833,12 @@ void ipic_set_highest_priority(unsigned 

  
  void ipic_set_default_priority(void)
  {
  
  void ipic_set_default_priority(void)
  {


@@ -57548,9 +57889,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
  }
  
  void ipic_enable_mcp(enum ipic_mcp_irq mcp_irq)
  }
  
  void ipic_enable_mcp(enum ipic_mcp_irq mcp_irq)

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.h powerpc.git/arch/powerpc/sysdev/ipic.h
---- linux-2.6.24/arch/powerpc/sysdev/ipic.h    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/ipic.h     2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/sysdev/ipic.h
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/sysdev/ipic.h
++++ linux-2.6.24.7/arch/powerpc/sysdev/ipic.h

 @@ -23,13 +23,12 @@
  #define IPIC_IRQ_EXT7 23
  
 @@ -23,13 +23,12 @@
  #define IPIC_IRQ_EXT7 23
  


@@ -57568,7 +57910,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.h powerpc.
  #define       SICFR_IPSD      0x00080000
  #define       SICFR_MPSA      0x00200000
  #define       SICFR_MPSB      0x00400000
  #define       SICFR_IPSD      0x00080000
  #define       SICFR_MPSA      0x00200000
  #define       SICFR_MPSB      0x00400000

-@@ -45,13 +44,11 @@
+@@ -45,13 +44,11 @@ struct ipic {

  
        /* The remapper for this IPIC */
        struct irq_host         *irqhost;
  
        /* The remapper for this IPIC */
        struct irq_host         *irqhost;


@@ -57584,10 +57926,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.h powerpc.
        u8      mask;           /* mask register offset from base */
        u8      prio;           /* priority register offset from base */
        u8      force;          /* force register offset from base */
        u8      mask;           /* mask register offset from base */
        u8      prio;           /* priority register offset from base */
        u8      force;          /* force register offset from base */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mmio_nvram.c powerpc.git/arch/powerpc/sysdev/mmio_nvram.c
---- linux-2.6.24/arch/powerpc/sysdev/mmio_nvram.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/mmio_nvram.c       2008-01-28 20:25:49.000000000 +0100
-@@ -99,7 +99,7 @@
+Index: linux-2.6.24.7/arch/powerpc/sysdev/mmio_nvram.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/sysdev/mmio_nvram.c
++++ linux-2.6.24.7/arch/powerpc/sysdev/mmio_nvram.c
+@@ -99,7 +99,7 @@ int __init mmio_nvram_init(void)

        nvram_addr = r.start;
        mmio_nvram_len = r.end - r.start + 1;
        if ( (!mmio_nvram_len) || (!nvram_addr) ) {
        nvram_addr = r.start;
        mmio_nvram_len = r.end - r.start + 1;
        if ( (!mmio_nvram_len) || (!nvram_addr) ) {


@@ -57596,10 +57939,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mmio_nvram.c po
                ret = -EIO;
                goto out;
        }
                ret = -EIO;
                goto out;
        }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mpic.c powerpc.git/arch/powerpc/sysdev/mpic.c
---- linux-2.6.24/arch/powerpc/sysdev/mpic.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/mpic.c     2008-01-28 20:25:49.000000000 +0100
-@@ -83,6 +83,7 @@
+Index: linux-2.6.24.7/arch/powerpc/sysdev/mpic.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/sysdev/mpic.c
++++ linux-2.6.24.7/arch/powerpc/sysdev/mpic.c
+@@ -83,6 +83,7 @@ static u32 mpic_infos[][MPIC_IDX_END] = 

                MPIC_CPU_WHOAMI,
                MPIC_CPU_INTACK,
                MPIC_CPU_EOI,
                MPIC_CPU_WHOAMI,
                MPIC_CPU_INTACK,
                MPIC_CPU_EOI,


@@ -57607,7 +57951,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mpic.c powerpc.
  
                MPIC_IRQ_BASE,
                MPIC_IRQ_STRIDE,
  
                MPIC_IRQ_BASE,
                MPIC_IRQ_STRIDE,

-@@ -121,6 +122,7 @@
+@@ -121,6 +122,7 @@ static u32 mpic_infos[][MPIC_IDX_END] = 

                TSI108_CPU_WHOAMI,
                TSI108_CPU_INTACK,
                TSI108_CPU_EOI,
                TSI108_CPU_WHOAMI,
                TSI108_CPU_INTACK,
                TSI108_CPU_EOI,


@@ -57615,7 +57959,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mpic.c powerpc.
  
                TSI108_IRQ_BASE,
                TSI108_IRQ_STRIDE,
  
                TSI108_IRQ_BASE,
                TSI108_IRQ_STRIDE,

-@@ -265,7 +267,7 @@
+@@ -265,7 +267,7 @@ static inline void _mpic_irq_write(struc

   */
  
  
   */
  
  


@@ -57624,7 +57968,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mpic.c powerpc.
                           struct mpic_reg_bank *rb, unsigned int offset,
                           unsigned int size)
  {
                           struct mpic_reg_bank *rb, unsigned int offset,
                           unsigned int size)
  {

-@@ -285,7 +287,7 @@
+@@ -285,7 +287,7 @@ static void _mpic_map_dcr(struct mpic *m

        BUG_ON(!DCR_MAP_OK(rb->dhost));
  }
  
        BUG_ON(!DCR_MAP_OK(rb->dhost));
  }
  


@@ -57633,7 +57977,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mpic.c powerpc.
                            struct mpic_reg_bank *rb, unsigned int offset,
                            unsigned int size)
  {
                            struct mpic_reg_bank *rb, unsigned int offset,
                            unsigned int size)
  {

-@@ -612,12 +614,11 @@
+@@ -612,12 +614,11 @@ static inline void mpic_eoi(struct mpic 

  }
  
  #ifdef CONFIG_SMP
  }
  
  #ifdef CONFIG_SMP


@@ -57649,7 +57993,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mpic.c powerpc.
  
        return IRQ_HANDLED;
  }
  
        return IRQ_HANDLED;
  }

-@@ -842,6 +843,24 @@
+@@ -842,6 +843,24 @@ int mpic_set_irq_type(unsigned int virq,

        return 0;
  }
  
        return 0;
  }
  


@@ -57674,7 +58018,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mpic.c powerpc.
  static struct irq_chip mpic_irq_chip = {
        .mask           = mpic_mask_irq,
        .unmask         = mpic_unmask_irq,
  static struct irq_chip mpic_irq_chip = {
        .mask           = mpic_mask_irq,
        .unmask         = mpic_unmask_irq,

-@@ -1109,6 +1128,11 @@
+@@ -1109,6 +1128,11 @@ struct mpic * __init mpic_alloc(struct d

                        mb();
        }
  
                        mb();
        }
  


@@ -57686,7 +58030,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mpic.c powerpc.
        /* Read feature register, calculate num CPUs and, for non-ISU
         * MPICs, num sources as well. On ISU MPICs, sources are counted
         * as ISUs are added
        /* Read feature register, calculate num CPUs and, for non-ISU
         * MPICs, num sources as well. On ISU MPICs, sources are counted
         * as ISUs are added

-@@ -1230,6 +1254,8 @@
+@@ -1230,6 +1254,8 @@ void __init mpic_init(struct mpic *mpic)

                mpic_u3msi_init(mpic);
        }
  
                mpic_u3msi_init(mpic);
        }
  


@@ -57695,7 +58039,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mpic.c powerpc.
        for (i = 0; i < mpic->num_sources; i++) {
                /* start with vector = source number, and masked */
                u32 vecpri = MPIC_VECPRI_MASK | i |
        for (i = 0; i < mpic->num_sources; i++) {
                /* start with vector = source number, and masked */
                u32 vecpri = MPIC_VECPRI_MASK | i |

-@@ -1253,6 +1279,11 @@
+@@ -1253,6 +1279,11 @@ void __init mpic_init(struct mpic *mpic)

                           mpic_read(mpic->gregs, MPIC_INFO(GREG_GLOBAL_CONF_0))
                           | MPIC_GREG_GCONF_8259_PTHROU_DIS);
  
                           mpic_read(mpic->gregs, MPIC_INFO(GREG_GLOBAL_CONF_0))
                           | MPIC_GREG_GCONF_8259_PTHROU_DIS);
  


@@ -57707,7 +58051,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mpic.c powerpc.
        /* Set current processor priority to 0 */
        mpic_cpu_write(MPIC_INFO(CPU_CURRENT_TASK_PRI), 0);
  
        /* Set current processor priority to 0 */
        mpic_cpu_write(MPIC_INFO(CPU_CURRENT_TASK_PRI), 0);
  

-@@ -1419,13 +1450,13 @@
+@@ -1419,13 +1450,13 @@ void mpic_send_ipi(unsigned int ipi_no, 

                       mpic_physmask(cpu_mask & cpus_addr(cpu_online_map)[0]));
  }
  
                       mpic_physmask(cpu_mask & cpus_addr(cpu_online_map)[0]));
  }
  


@@ -57724,7 +58068,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mpic.c powerpc.
  #endif
        if (unlikely(src == mpic->spurious_vec)) {
                if (mpic->flags & MPIC_SPV_EOI)
  #endif
        if (unlikely(src == mpic->spurious_vec)) {
                if (mpic->flags & MPIC_SPV_EOI)

-@@ -1443,6 +1474,11 @@
+@@ -1443,6 +1474,11 @@ unsigned int mpic_get_one_irq(struct mpi

        return irq_linear_revmap(mpic->irqhost, src);
  }
  
        return irq_linear_revmap(mpic->irqhost, src);
  }
  


@@ -57736,7 +58080,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mpic.c powerpc.
  unsigned int mpic_get_irq(void)
  {
        struct mpic *mpic = mpic_primary;
  unsigned int mpic_get_irq(void)
  {
        struct mpic *mpic = mpic_primary;

-@@ -1452,12 +1488,20 @@
+@@ -1452,12 +1488,20 @@ unsigned int mpic_get_irq(void)

        return mpic_get_one_irq(mpic);
  }
  
        return mpic_get_one_irq(mpic);
  }
  


@@ -57758,7 +58102,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mpic.c powerpc.
        static char *ipi_names[] = {
                "IPI0 (call function)",
                "IPI1 (reschedule)",
        static char *ipi_names[] = {
                "IPI0 (call function)",
                "IPI1 (reschedule)",

-@@ -1472,14 +1516,14 @@
+@@ -1472,14 +1516,14 @@ void mpic_request_ipis(void)

                unsigned int vipi = irq_create_mapping(mpic->irqhost,
                                                       mpic->ipi_vecs[0] + i);
                if (vipi == NO_IRQ) {
                unsigned int vipi = irq_create_mapping(mpic->irqhost,
                                                       mpic->ipi_vecs[0] + i);
                if (vipi == NO_IRQ) {


@@ -57776,10 +58120,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mpic.c powerpc.
                               vipi, i);
                        break;
                }
                               vipi, i);
                        break;
                }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mpic.h powerpc.git/arch/powerpc/sysdev/mpic.h
---- linux-2.6.24/arch/powerpc/sysdev/mpic.h    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/mpic.h     2008-01-28 20:25:49.000000000 +0100
-@@ -17,6 +17,7 @@
+Index: linux-2.6.24.7/arch/powerpc/sysdev/mpic.h
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/sysdev/mpic.h
++++ linux-2.6.24.7/arch/powerpc/sysdev/mpic.h
+@@ -17,6 +17,7 @@ extern int mpic_msi_init_allocator(struc

  extern irq_hw_number_t mpic_msi_alloc_hwirqs(struct mpic *mpic, int num);
  extern void mpic_msi_free_hwirqs(struct mpic *mpic, int offset, int num);
  extern int mpic_u3msi_init(struct mpic *mpic);
  extern irq_hw_number_t mpic_msi_alloc_hwirqs(struct mpic *mpic, int num);
  extern void mpic_msi_free_hwirqs(struct mpic *mpic, int offset, int num);
  extern int mpic_u3msi_init(struct mpic *mpic);


@@ -57787,7 +58132,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mpic.h powerpc.
  #else
  static inline void mpic_msi_reserve_hwirq(struct mpic *mpic,
                                          irq_hw_number_t hwirq)
  #else
  static inline void mpic_msi_reserve_hwirq(struct mpic *mpic,
                                          irq_hw_number_t hwirq)

-@@ -28,12 +29,15 @@
+@@ -28,12 +29,15 @@ static inline int mpic_u3msi_init(struct

  {
        return -1;
  }
  {
        return -1;
  }


@@ -57806,9 +58151,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mpic.h powerpc.
  extern void mpic_set_affinity(unsigned int irq, cpumask_t cpumask);
  
  #endif /* _POWERPC_SYSDEV_MPIC_H */
  extern void mpic_set_affinity(unsigned int irq, cpumask_t cpumask);
  
  #endif /* _POWERPC_SYSDEV_MPIC_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mpic_pasemi_msi.c powerpc.git/arch/powerpc/sysdev/mpic_pasemi_msi.c
---- linux-2.6.24/arch/powerpc/sysdev/mpic_pasemi_msi.c 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/mpic_pasemi_msi.c  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/sysdev/mpic_pasemi_msi.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/sysdev/mpic_pasemi_msi.c

 @@ -0,0 +1,172 @@
 +/*
 + * Copyright 2007, Olof Johansson, PA Semi
 @@ -0,0 +1,172 @@
 +/*
 + * Copyright 2007, Olof Johansson, PA Semi


@@ -57982,10 +58328,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mpic_pasemi_msi
 +
 +      return 0;
 +}
 +
 +      return 0;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mv64x60_dev.c powerpc.git/arch/powerpc/sysdev/mv64x60_dev.c
---- linux-2.6.24/arch/powerpc/sysdev/mv64x60_dev.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/mv64x60_dev.c      2008-01-28 20:25:49.000000000 +0100
-@@ -241,7 +241,7 @@
+Index: linux-2.6.24.7/arch/powerpc/sysdev/mv64x60_dev.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/sysdev/mv64x60_dev.c
++++ linux-2.6.24.7/arch/powerpc/sysdev/mv64x60_dev.c
+@@ -241,7 +241,7 @@ static int __init mv64x60_eth_device_set

  
        /* only register the shared platform device the first time through */
        if (id == 0 && (err = eth_register_shared_pdev(np)))
  
        /* only register the shared platform device the first time through */
        if (id == 0 && (err = eth_register_shared_pdev(np)))


@@ -57994,7 +58341,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mv64x60_dev.c p
  
        memset(r, 0, sizeof(r));
        of_irq_to_resource(np, 0, &r[0]);
  
        memset(r, 0, sizeof(r));
        of_irq_to_resource(np, 0, &r[0]);

-@@ -451,22 +451,19 @@
+@@ -451,22 +451,19 @@ static int __init mv64x60_device_setup(v

        int id;
        int err;
  
        int id;
        int err;
  


@@ -58026,7 +58373,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mv64x60_dev.c p
                        goto error;
  
        /* support up to one watchdog timer */
                        goto error;
  
        /* support up to one watchdog timer */

-@@ -477,7 +474,6 @@
+@@ -477,7 +474,6 @@ static int __init mv64x60_device_setup(v

                of_node_put(np);
        }
  
                of_node_put(np);
        }
  


@@ -58034,10 +58381,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mv64x60_dev.c p
        return 0;
  
  error:
        return 0;
  
  error:

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mv64x60_pci.c powerpc.git/arch/powerpc/sysdev/mv64x60_pci.c
---- linux-2.6.24/arch/powerpc/sysdev/mv64x60_pci.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/mv64x60_pci.c      2008-01-28 20:25:49.000000000 +0100
-@@ -164,8 +164,8 @@
+Index: linux-2.6.24.7/arch/powerpc/sysdev/mv64x60_pci.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/sysdev/mv64x60_pci.c
++++ linux-2.6.24.7/arch/powerpc/sysdev/mv64x60_pci.c
+@@ -164,8 +164,8 @@ static int __init mv64x60_add_bridge(str

  
  void __init mv64x60_pci_init(void)
  {
  
  void __init mv64x60_pci_init(void)
  {


@@ -58048,10 +58396,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mv64x60_pci.c p
 +      for_each_compatible_node(np, "pci", "marvell,mv64x60-pci")
                mv64x60_add_bridge(np);
  }
 +      for_each_compatible_node(np, "pci", "marvell,mv64x60-pci")
                mv64x60_add_bridge(np);
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mv64x60_udbg.c powerpc.git/arch/powerpc/sysdev/mv64x60_udbg.c
---- linux-2.6.24/arch/powerpc/sysdev/mv64x60_udbg.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/mv64x60_udbg.c     2008-01-28 20:25:49.000000000 +0100
-@@ -85,10 +85,10 @@
+Index: linux-2.6.24.7/arch/powerpc/sysdev/mv64x60_udbg.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/sysdev/mv64x60_udbg.c
++++ linux-2.6.24.7/arch/powerpc/sysdev/mv64x60_udbg.c
+@@ -85,10 +85,10 @@ static void mv64x60_udbg_init(void)

        if (!stdout)
                return;
  
        if (!stdout)
                return;
  


@@ -58064,9 +58413,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mv64x60_udbg.c
  
        of_node_put(stdout);
        if (!np)
  
        of_node_put(stdout);
        if (!np)

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/of_rtc.c powerpc.git/arch/powerpc/sysdev/of_rtc.c
---- linux-2.6.24/arch/powerpc/sysdev/of_rtc.c  1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/of_rtc.c   2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/sysdev/of_rtc.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/sysdev/of_rtc.c

 @@ -0,0 +1,59 @@
 +/*
 + * Instantiate mmio-mapped RTC chips based on device tree information
 @@ -0,0 +1,59 @@
 +/*
 + * Instantiate mmio-mapped RTC chips based on device tree information


@@ -58127,9 +58477,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/of_rtc.c powerp
 +              }
 +      }
 +}
 +              }
 +      }
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/pmi.c powerpc.git/arch/powerpc/sysdev/pmi.c
---- linux-2.6.24/arch/powerpc/sysdev/pmi.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/pmi.c      2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/sysdev/pmi.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/sysdev/pmi.c
++++ linux-2.6.24.7/arch/powerpc/sysdev/pmi.c

 @@ -28,9 +28,9 @@
  #include <linux/completion.h>
  #include <linux/spinlock.h>
 @@ -28,9 +28,9 @@
  #include <linux/completion.h>
  #include <linux/spinlock.h>


@@ -58142,9 +58493,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/pmi.c powerpc.g
  #include <asm/io.h>
  #include <asm/pmi.h>
  #include <asm/prom.h>
  #include <asm/io.h>
  #include <asm/pmi.h>
  #include <asm/prom.h>

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ppc4xx_pci.c powerpc.git/arch/powerpc/sysdev/ppc4xx_pci.c
---- linux-2.6.24/arch/powerpc/sysdev/ppc4xx_pci.c      1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/ppc4xx_pci.c       2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/sysdev/ppc4xx_pci.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/sysdev/ppc4xx_pci.c

 @@ -0,0 +1,1528 @@
 +/*
 + * PCI / PCI-X / PCI-Express support for 4xx parts
 @@ -0,0 +1,1528 @@
 +/*
 + * PCI / PCI-X / PCI-Express support for 4xx parts


@@ -59674,9 +60026,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ppc4xx_pci.c po
 +}
 +arch_initcall(ppc4xx_pci_find_bridges);
 +
 +}
 +arch_initcall(ppc4xx_pci_find_bridges);
 +

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ppc4xx_pci.h powerpc.git/arch/powerpc/sysdev/ppc4xx_pci.h
---- linux-2.6.24/arch/powerpc/sysdev/ppc4xx_pci.h      1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/ppc4xx_pci.h       2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/sysdev/ppc4xx_pci.h
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/arch/powerpc/sysdev/ppc4xx_pci.h

 @@ -0,0 +1,369 @@
 +/*
 + * PCI / PCI-X / PCI-Express support for 4xx parts
 @@ -0,0 +1,369 @@
 +/*
 + * PCI / PCI-X / PCI-Express support for 4xx parts


@@ -60047,9 +60400,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ppc4xx_pci.h po
 +
 +
 +#endif /* __PPC4XX_PCI_H__ */
 +
 +
 +#endif /* __PPC4XX_PCI_H__ */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/qe_lib/Kconfig powerpc.git/arch/powerpc/sysdev/qe_lib/Kconfig
---- linux-2.6.24/arch/powerpc/sysdev/qe_lib/Kconfig    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/qe_lib/Kconfig     2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/sysdev/qe_lib/Kconfig
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/sysdev/qe_lib/Kconfig
++++ linux-2.6.24.7/arch/powerpc/sysdev/qe_lib/Kconfig

 @@ -4,7 +4,7 @@
  
  config UCC_SLOW
 @@ -4,7 +4,7 @@
  
  config UCC_SLOW


@@ -60059,9 +60413,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/qe_lib/Kconfig
        help
          This option provides qe_lib support to UCC slow
          protocols: UART, BISYNC, QMC
        help
          This option provides qe_lib support to UCC slow
          protocols: UART, BISYNC, QMC

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/qe_lib/qe.c powerpc.git/arch/powerpc/sysdev/qe_lib/qe.c
---- linux-2.6.24/arch/powerpc/sysdev/qe_lib/qe.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/qe_lib/qe.c        2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/sysdev/qe_lib/qe.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/sysdev/qe_lib/qe.c
++++ linux-2.6.24.7/arch/powerpc/sysdev/qe_lib/qe.c

 @@ -25,6 +25,7 @@
  #include <linux/module.h>
  #include <linux/delay.h>
 @@ -25,6 +25,7 @@
  #include <linux/module.h>
  #include <linux/delay.h>


@@ -60070,7 +60425,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/qe_lib/qe.c pow
  #include <asm/irq.h>
  #include <asm/page.h>
  #include <asm/pgtable.h>
  #include <asm/irq.h>
  #include <asm/page.h>
  #include <asm/pgtable.h>

-@@ -167,19 +168,20 @@
+@@ -167,19 +168,20 @@ unsigned int get_brg_clk(void)

  
  /* Program the BRG to the given sampling rate and multiplier
   *
  
  /* Program the BRG to the given sampling rate and multiplier
   *


@@ -60095,7 +60450,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/qe_lib/qe.c pow
        divisor = get_brg_clk() / (rate * multiplier);
  
        if (divisor > QE_BRGC_DIVISOR_MAX + 1) {
        divisor = get_brg_clk() / (rate * multiplier);
  
        if (divisor > QE_BRGC_DIVISOR_MAX + 1) {

-@@ -196,8 +198,43 @@
+@@ -196,8 +198,43 @@ void qe_setbrg(unsigned int brg, unsigne

        tempval = ((divisor - 1) << QE_BRGC_DIVISOR_SHIFT) |
                QE_BRGC_ENABLE | div16;
  
        tempval = ((divisor - 1) << QE_BRGC_DIVISOR_SHIFT) |
                QE_BRGC_ENABLE | div16;
  


@@ -60140,7 +60495,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/qe_lib/qe.c pow
  
  /* Initialize SNUMs (thread serial numbers) according to
   * QE Module Control chapter, SNUM table
  
  /* Initialize SNUMs (thread serial numbers) according to
   * QE Module Control chapter, SNUM table

-@@ -358,3 +395,249 @@
+@@ -358,3 +395,249 @@ void *qe_muram_addr(unsigned long offset

        return (void *)&qe_immr->muram[offset];
  }
  EXPORT_SYMBOL(qe_muram_addr);
        return (void *)&qe_immr->muram[offset];
  }
  EXPORT_SYMBOL(qe_muram_addr);


@@ -60390,9 +60745,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/qe_lib/qe.c pow
 +}
 +EXPORT_SYMBOL(qe_get_firmware_info);
 +
 +}
 +EXPORT_SYMBOL(qe_get_firmware_info);
 +

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/qe_lib/ucc_slow.c powerpc.git/arch/powerpc/sysdev/qe_lib/ucc_slow.c
---- linux-2.6.24/arch/powerpc/sysdev/qe_lib/ucc_slow.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/qe_lib/ucc_slow.c  2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/sysdev/qe_lib/ucc_slow.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/sysdev/qe_lib/ucc_slow.c
++++ linux-2.6.24.7/arch/powerpc/sysdev/qe_lib/ucc_slow.c

 @@ -19,6 +19,7 @@
  #include <linux/stddef.h>
  #include <linux/interrupt.h>
 @@ -19,6 +19,7 @@
  #include <linux/stddef.h>
  #include <linux/interrupt.h>


@@ -60401,7 +60757,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/qe_lib/ucc_slow
  
  #include <asm/io.h>
  #include <asm/immap_qe.h>
  
  #include <asm/io.h>
  #include <asm/immap_qe.h>

-@@ -41,6 +42,7 @@
+@@ -41,6 +42,7 @@ u32 ucc_slow_get_qe_cr_subblock(int uccs

        default: return QE_CR_SUBBLOCK_INVALID;
        }
  }
        default: return QE_CR_SUBBLOCK_INVALID;
        }
  }


@@ -60409,7 +60765,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/qe_lib/ucc_slow
  
  void ucc_slow_poll_transmitter_now(struct ucc_slow_private * uccs)
  {
  
  void ucc_slow_poll_transmitter_now(struct ucc_slow_private * uccs)
  {

-@@ -56,6 +58,7 @@
+@@ -56,6 +58,7 @@ void ucc_slow_graceful_stop_tx(struct uc

        qe_issue_cmd(QE_GRACEFUL_STOP_TX, id,
                         QE_CR_PROTOCOL_UNSPECIFIED, 0);
  }
        qe_issue_cmd(QE_GRACEFUL_STOP_TX, id,
                         QE_CR_PROTOCOL_UNSPECIFIED, 0);
  }


@@ -60417,7 +60773,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/qe_lib/ucc_slow
  
  void ucc_slow_stop_tx(struct ucc_slow_private * uccs)
  {
  
  void ucc_slow_stop_tx(struct ucc_slow_private * uccs)
  {

-@@ -65,6 +68,7 @@
+@@ -65,6 +68,7 @@ void ucc_slow_stop_tx(struct ucc_slow_pr

        id = ucc_slow_get_qe_cr_subblock(us_info->ucc_num);
        qe_issue_cmd(QE_STOP_TX, id, QE_CR_PROTOCOL_UNSPECIFIED, 0);
  }
        id = ucc_slow_get_qe_cr_subblock(us_info->ucc_num);
        qe_issue_cmd(QE_STOP_TX, id, QE_CR_PROTOCOL_UNSPECIFIED, 0);
  }


@@ -60425,7 +60781,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/qe_lib/ucc_slow
  
  void ucc_slow_restart_tx(struct ucc_slow_private * uccs)
  {
  
  void ucc_slow_restart_tx(struct ucc_slow_private * uccs)
  {

-@@ -74,6 +78,7 @@
+@@ -74,6 +78,7 @@ void ucc_slow_restart_tx(struct ucc_slow

        id = ucc_slow_get_qe_cr_subblock(us_info->ucc_num);
        qe_issue_cmd(QE_RESTART_TX, id, QE_CR_PROTOCOL_UNSPECIFIED, 0);
  }
        id = ucc_slow_get_qe_cr_subblock(us_info->ucc_num);
        qe_issue_cmd(QE_RESTART_TX, id, QE_CR_PROTOCOL_UNSPECIFIED, 0);
  }


@@ -60433,7 +60789,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/qe_lib/ucc_slow
  
  void ucc_slow_enable(struct ucc_slow_private * uccs, enum comm_dir mode)
  {
  
  void ucc_slow_enable(struct ucc_slow_private * uccs, enum comm_dir mode)
  {

-@@ -94,6 +99,7 @@
+@@ -94,6 +99,7 @@ void ucc_slow_enable(struct ucc_slow_pri

        }
        out_be32(&us_regs->gumr_l, gumr_l);
  }
        }
        out_be32(&us_regs->gumr_l, gumr_l);
  }


@@ -60441,7 +60797,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/qe_lib/ucc_slow
  
  void ucc_slow_disable(struct ucc_slow_private * uccs, enum comm_dir mode)
  {
  
  void ucc_slow_disable(struct ucc_slow_private * uccs, enum comm_dir mode)
  {

-@@ -114,6 +120,7 @@
+@@ -114,6 +120,7 @@ void ucc_slow_disable(struct ucc_slow_pr

        }
        out_be32(&us_regs->gumr_l, gumr_l);
  }
        }
        out_be32(&us_regs->gumr_l, gumr_l);
  }


@@ -60449,7 +60805,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/qe_lib/ucc_slow
  
  /* Initialize the UCC for Slow operations
   *
  
  /* Initialize the UCC for Slow operations
   *

-@@ -347,6 +354,7 @@
+@@ -347,6 +354,7 @@ int ucc_slow_init(struct ucc_slow_info *

        *uccs_ret = uccs;
        return 0;
  }
        *uccs_ret = uccs;
        return 0;
  }


@@ -60457,17 +60813,18 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/qe_lib/ucc_slow
  
  void ucc_slow_free(struct ucc_slow_private * uccs)
  {
  
  void ucc_slow_free(struct ucc_slow_private * uccs)
  {

-@@ -366,5 +374,5 @@
+@@ -366,5 +374,5 @@ void ucc_slow_free(struct ucc_slow_priva

  
        kfree(uccs);
  }
 -
 +EXPORT_SYMBOL(ucc_slow_free);
  
  
        kfree(uccs);
  }
 -
 +EXPORT_SYMBOL(ucc_slow_free);
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/tsi108_dev.c powerpc.git/arch/powerpc/sysdev/tsi108_dev.c
---- linux-2.6.24/arch/powerpc/sysdev/tsi108_dev.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/tsi108_dev.c       2008-01-28 20:25:49.000000000 +0100
-@@ -66,14 +66,12 @@
+Index: linux-2.6.24.7/arch/powerpc/sysdev/tsi108_dev.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/sysdev/tsi108_dev.c
++++ linux-2.6.24.7/arch/powerpc/sysdev/tsi108_dev.c
+@@ -66,14 +66,12 @@ EXPORT_SYMBOL(get_vir_csrbase);

  static int __init tsi108_eth_of_init(void)
  {
        struct device_node *np;
  static int __init tsi108_eth_of_init(void)
  {
        struct device_node *np;


@@ -60484,7 +60841,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/tsi108_dev.c po
                struct resource r[2];
                struct device_node *phy, *mdio;
                hw_info tsi_eth_data;
                struct resource r[2];
                struct device_node *phy, *mdio;
                hw_info tsi_eth_data;

-@@ -98,7 +96,7 @@
+@@ -98,7 +96,7 @@ static int __init tsi108_eth_of_init(voi

                        __FUNCTION__,r[1].name, r[1].start, r[1].end);
  
                tsi_eth_dev =
                        __FUNCTION__,r[1].name, r[1].start, r[1].end);
  
                tsi_eth_dev =


@@ -60493,7 +60850,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/tsi108_dev.c po
                                                    1);
  
                if (IS_ERR(tsi_eth_dev)) {
                                                    1);
  
                if (IS_ERR(tsi_eth_dev)) {

-@@ -154,6 +152,7 @@
+@@ -154,6 +152,7 @@ static int __init tsi108_eth_of_init(voi

  unreg:
        platform_device_unregister(tsi_eth_dev);
  err:
  unreg:
        platform_device_unregister(tsi_eth_dev);
  err:


@@ -60501,10 +60858,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/tsi108_dev.c po
        return ret;
  }
  
        return ret;
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/uic.c powerpc.git/arch/powerpc/sysdev/uic.c
---- linux-2.6.24/arch/powerpc/sysdev/uic.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/uic.c      2008-01-28 20:25:49.000000000 +0100
-@@ -53,21 +53,23 @@
+Index: linux-2.6.24.7/arch/powerpc/sysdev/uic.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/sysdev/uic.c
++++ linux-2.6.24.7/arch/powerpc/sysdev/uic.c
+@@ -53,21 +53,23 @@ struct uic {

  
        /* The remapper for this UIC */
        struct irq_host *irqhost;
  
        /* The remapper for this UIC */
        struct irq_host *irqhost;


@@ -60533,7 +60891,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/uic.c powerpc.g
        mtdcr(uic->dcrbase + UIC_ER, er);
        spin_unlock_irqrestore(&uic->lock, flags);
  }
        mtdcr(uic->dcrbase + UIC_ER, er);
        spin_unlock_irqrestore(&uic->lock, flags);
  }

-@@ -99,6 +101,7 @@
+@@ -99,6 +101,7 @@ static void uic_ack_irq(unsigned int vir

  
  static void uic_mask_ack_irq(unsigned int virq)
  {
  
  static void uic_mask_ack_irq(unsigned int virq)
  {


@@ -60541,7 +60899,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/uic.c powerpc.g
        struct uic *uic = get_irq_chip_data(virq);
        unsigned int src = uic_irq_to_hw(virq);
        unsigned long flags;
        struct uic *uic = get_irq_chip_data(virq);
        unsigned int src = uic_irq_to_hw(virq);
        unsigned long flags;

-@@ -109,7 +112,16 @@
+@@ -109,7 +112,16 @@ static void uic_mask_ack_irq(unsigned in

        er = mfdcr(uic->dcrbase + UIC_ER);
        er &= ~sr;
        mtdcr(uic->dcrbase + UIC_ER, er);
        er = mfdcr(uic->dcrbase + UIC_ER);
        er &= ~sr;
        mtdcr(uic->dcrbase + UIC_ER, er);


@@ -60559,7 +60917,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/uic.c powerpc.g
        spin_unlock_irqrestore(&uic->lock, flags);
  }
  
        spin_unlock_irqrestore(&uic->lock, flags);
  }
  

-@@ -173,64 +185,6 @@
+@@ -173,64 +185,6 @@ static struct irq_chip uic_irq_chip = {

        .set_type       = uic_set_irq_type,
  };
  
        .set_type       = uic_set_irq_type,
  };
  


@@ -60624,7 +60982,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/uic.c powerpc.g
  static int uic_host_map(struct irq_host *h, unsigned int virq,
                        irq_hw_number_t hw)
  {
  static int uic_host_map(struct irq_host *h, unsigned int virq,
                        irq_hw_number_t hw)
  {

-@@ -239,7 +193,7 @@
+@@ -239,7 +193,7 @@ static int uic_host_map(struct irq_host 

        set_irq_chip_data(virq, uic);
        /* Despite the name, handle_level_irq() works for both level
         * and edge irqs on UIC.  FIXME: check this is correct */
        set_irq_chip_data(virq, uic);
        /* Despite the name, handle_level_irq() works for both level
         * and edge irqs on UIC.  FIXME: check this is correct */


@@ -60633,7 +60991,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/uic.c powerpc.g
  
        /* Set default irq type */
        set_irq_type(virq, IRQ_TYPE_NONE);
  
        /* Set default irq type */
        set_irq_type(virq, IRQ_TYPE_NONE);

-@@ -264,23 +218,36 @@
+@@ -264,23 +218,36 @@ static struct irq_host_ops uic_host_ops 

        .xlate  = uic_host_xlate,
  };
  
        .xlate  = uic_host_xlate,
  };
  


@@ -60674,7 +61032,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/uic.c powerpc.g
  }
  
  static struct uic * __init uic_init_one(struct device_node *node)
  }
  
  static struct uic * __init uic_init_one(struct device_node *node)

-@@ -342,33 +309,27 @@
+@@ -342,33 +309,27 @@ void __init uic_init_tree(void)

        const u32 *interrupts;
  
        /* First locate and initialize the top-level UIC */
        const u32 *interrupts;
  
        /* First locate and initialize the top-level UIC */


@@ -60712,7 +61070,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/uic.c powerpc.g
  
                        uic = uic_init_one(np);
                        if (! uic)
  
                        uic = uic_init_one(np);
                        if (! uic)

-@@ -377,20 +338,11 @@
+@@ -377,20 +338,11 @@ void __init uic_init_tree(void)

  
                        cascade_virq = irq_of_parse_and_map(np, 0);
  
  
                        cascade_virq = irq_of_parse_and_map(np, 0);
  


@@ -60735,10 +61093,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/uic.c powerpc.g
        }
  }
  
        }
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/xilinx_intc.c powerpc.git/arch/powerpc/sysdev/xilinx_intc.c
---- linux-2.6.24/arch/powerpc/sysdev/xilinx_intc.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/xilinx_intc.c      2008-01-28 20:25:49.000000000 +0100
-@@ -135,10 +135,16 @@
+Index: linux-2.6.24.7/arch/powerpc/sysdev/xilinx_intc.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/sysdev/xilinx_intc.c
++++ linux-2.6.24.7/arch/powerpc/sysdev/xilinx_intc.c
+@@ -135,10 +135,16 @@ void __init xilinx_intc_init_tree(void)

        struct device_node *np;
  
        /* find top level interrupt controller */
        struct device_node *np;
  
        /* find top level interrupt controller */


@@ -60756,9 +61115,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/xilinx_intc.c p
  
        /* xilinx interrupt controller needs to be top level */
        BUG_ON(!np);
  
        /* xilinx interrupt controller needs to be top level */
        BUG_ON(!np);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/xmon/setjmp.S powerpc.git/arch/powerpc/xmon/setjmp.S
---- linux-2.6.24/arch/powerpc/xmon/setjmp.S    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/xmon/setjmp.S     2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/xmon/setjmp.S
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/xmon/setjmp.S
++++ linux-2.6.24.7/arch/powerpc/xmon/setjmp.S

 @@ -12,67 +12,6 @@
  #include <asm/ppc_asm.h>
  #include <asm/asm-offsets.h>
 @@ -12,67 +12,6 @@
  #include <asm/ppc_asm.h>
  #include <asm/asm-offsets.h>


@@ -60827,9 +61187,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/xmon/setjmp.S powerpc.
  /*
   * Grab the register values as they are now.
   * This won't do a particularily good job because we really
  /*
   * Grab the register values as they are now.
   * This won't do a particularily good job because we really

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/xmon/xmon.c powerpc.git/arch/powerpc/xmon/xmon.c
---- linux-2.6.24/arch/powerpc/xmon/xmon.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/xmon/xmon.c       2008-01-28 20:25:49.000000000 +0100
+Index: linux-2.6.24.7/arch/powerpc/xmon/xmon.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/powerpc/xmon/xmon.c
++++ linux-2.6.24.7/arch/powerpc/xmon/xmon.c

 @@ -40,6 +40,7 @@
  #include <asm/spu.h>
  #include <asm/spu_priv1.h>
 @@ -40,6 +40,7 @@
  #include <asm/spu.h>
  #include <asm/spu_priv1.h>


@@ -60838,7 +61199,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/xmon/xmon.c powerpc.gi
  
  #ifdef CONFIG_PPC64
  #include <asm/hvcall.h>
  
  #ifdef CONFIG_PPC64
  #include <asm/hvcall.h>

-@@ -71,12 +72,9 @@
+@@ -71,12 +72,9 @@ static unsigned long ncsum = 4096;

  static int termch;
  static char tmpstr[128];
  
  static int termch;
  static char tmpstr[128];
  


@@ -60851,7 +61212,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/xmon/xmon.c powerpc.gi
  
  /* Breakpoint stuff */
  struct bpt {
  
  /* Breakpoint stuff */
  struct bpt {

-@@ -153,13 +151,15 @@
+@@ -153,13 +151,15 @@ static const char *getvecname(unsigned l

  
  static int do_spu_cmd(void);
  
  
  static int do_spu_cmd(void);
  


@@ -60869,7 +61230,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/xmon/xmon.c powerpc.gi
  extern void xmon_save_regs(struct pt_regs *);
  
  #ifdef CONFIG_PPC64
  extern void xmon_save_regs(struct pt_regs *);
  
  #ifdef CONFIG_PPC64

-@@ -231,6 +231,9 @@
+@@ -231,6 +231,9 @@ Commands:\n\

  #ifdef CONFIG_PPC_STD_MMU_32
  "  u  dump segment registers\n"
  #endif
  #ifdef CONFIG_PPC_STD_MMU_32
  "  u  dump segment registers\n"
  #endif


@@ -60879,7 +61240,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/xmon/xmon.c powerpc.gi
  "  ?  help\n"
  "  zr reboot\n\
    zh  halt\n"
  "  ?  help\n"
  "  zr reboot\n\
    zh  halt\n"

-@@ -856,6 +859,11 @@
+@@ -856,6 +859,11 @@ cmds(struct pt_regs *excp)

                        dump_segments();
                        break;
  #endif
                        dump_segments();
                        break;
  #endif


@@ -60891,7 +61252,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/xmon/xmon.c powerpc.gi
                default:
                        printf("Unrecognized command: ");
                        do {
                default:
                        printf("Unrecognized command: ");
                        do {

-@@ -2527,16 +2535,33 @@
+@@ -2527,16 +2535,33 @@ static void xmon_print_symbol(unsigned l

  static void dump_slb(void)
  {
        int i;
  static void dump_slb(void)
  {
        int i;


@@ -60932,7 +61293,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/xmon/xmon.c powerpc.gi
        }
  }
  
        }
  }
  

-@@ -2581,6 +2606,32 @@
+@@ -2581,6 +2606,32 @@ void dump_segments(void)

  }
  #endif
  
  }
  #endif
  


@@ -60965,10 +61326,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/xmon/xmon.c powerpc.gi
  void xmon_init(int enable)
  {
  #ifdef CONFIG_PPC_ISERIES
  void xmon_init(int enable)
  {
  #ifdef CONFIG_PPC_ISERIES

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/kernel/Makefile powerpc.git/arch/ppc/kernel/Makefile
---- linux-2.6.24/arch/ppc/kernel/Makefile      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/kernel/Makefile       2008-01-28 20:25:50.000000000 +0100
-@@ -13,7 +13,6 @@
+Index: linux-2.6.24.7/arch/ppc/kernel/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/arch/ppc/kernel/Makefile
++++ linux-2.6.24.7/arch/ppc/kernel/Makefile
+@@ -13,7 +13,6 @@ obj-y                                := entry.o traps.o time.o misc.

                                        ppc_htab.o
  obj-$(CONFIG_MODULES)         += ppc_ksyms.o
  obj-$(CONFIG_PCI)             += pci.o
                                        ppc_htab.o
  obj-$(CONFIG_MODULES)         += ppc_ksyms.o
  obj-$(CONFIG_PCI)             += pci.o


@@ -60976,10 +61338,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/kernel/Makefile powerpc.gi
  obj-$(CONFIG_KGDB)            += ppc-stub.o
  obj-$(CONFIG_SMP)             += smp.o smp-tbsync.o
  obj-$(CONFIG_KEXEC)           += machine_kexec.o relocate_kernel.o
  obj-$(CONFIG_KGDB)            += ppc-stub.o
  obj-$(CONFIG_SMP)             += smp.o smp-tbsync.o
  obj-$(CONFIG_KEXEC)           += machine_kexec.o relocate_kernel.o

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/kernel/head_44x.S powerpc.git/arch/ppc/kernel/head_44x.S
---- linux-2.6.24/arch/ppc/kernel/head_44x.S    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/kernel/head_44x.S     2008-01-28 20:25:50.000000000 +0100
-@@ -195,7 +195,7 @@
+Index: linux-2.6.24.7/arch/ppc/kernel/head_44x.S
+===================================================================
+--- linux-2.6.24.7.orig/arch/ppc/kernel/head_44x.S
++++ linux-2.6.24.7/arch/ppc/kernel/head_44x.S
+@@ -195,7 +195,7 @@ skpinv:    addi    r4,r4,1                         /* Increment */

        li      r5,0
        ori     r5,r5,(PPC44x_TLB_SW | PPC44x_TLB_SR | PPC44x_TLB_I | PPC44x_TLB_G)
  
        li      r5,0
        ori     r5,r5,(PPC44x_TLB_SW | PPC44x_TLB_SR | PPC44x_TLB_I | PPC44x_TLB_G)
  


@@ -60988,9 +61351,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/kernel/head_44x.S powerpc.
  
        tlbwe   r3,r0,PPC44x_TLB_PAGEID /* Load the pageid fields */
        tlbwe   r4,r0,PPC44x_TLB_XLAT   /* Load the translation fields */
  
        tlbwe   r3,r0,PPC44x_TLB_PAGEID /* Load the pageid fields */
        tlbwe   r4,r0,PPC44x_TLB_XLAT   /* Load the translation fields */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/kernel/rio.c powerpc.git/arch/ppc/kernel/rio.c
---- linux-2.6.24/arch/ppc/kernel/rio.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/kernel/rio.c  1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.24.7/arch/ppc/kernel/rio.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/ppc/kernel/rio.c
++++ /dev/null

 @@ -1,52 +0,0 @@
 -/*
 - * RapidIO PPC32 support
 @@ -1,52 +0,0 @@
 -/*
 - * RapidIO PPC32 support


@@ -61044,9 +61408,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/kernel/rio.c powerpc.git/a
 -}
 -
 -subsys_initcall(ppc_rio_init);
 -}
 -
 -subsys_initcall(ppc_rio_init);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/kernel/setup.c powerpc.git/arch/ppc/kernel/setup.c
---- linux-2.6.24/arch/ppc/kernel/setup.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/kernel/setup.c        2008-01-28 20:25:50.000000000 +0100
+Index: linux-2.6.24.7/arch/ppc/kernel/setup.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/ppc/kernel/setup.c
++++ linux-2.6.24.7/arch/ppc/kernel/setup.c

 @@ -37,7 +37,6 @@
  #include <asm/nvram.h>
  #include <asm/xmon.h>
 @@ -37,7 +37,6 @@
  #include <asm/nvram.h>
  #include <asm/xmon.h>


@@ -61055,10 +61420,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/kernel/setup.c powerpc.git
  
  #define USES_PPC_SYS (defined(CONFIG_85xx) || defined(CONFIG_83xx) || \
                      defined(CONFIG_MPC10X_BRIDGE) || defined(CONFIG_8260) || \
  
  #define USES_PPC_SYS (defined(CONFIG_85xx) || defined(CONFIG_83xx) || \
                      defined(CONFIG_MPC10X_BRIDGE) || defined(CONFIG_8260) || \

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/kernel/traps.c powerpc.git/arch/ppc/kernel/traps.c
---- linux-2.6.24/arch/ppc/kernel/traps.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/kernel/traps.c        2008-01-28 20:25:50.000000000 +0100
-@@ -231,39 +231,25 @@
+Index: linux-2.6.24.7/arch/ppc/kernel/traps.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/ppc/kernel/traps.c
++++ linux-2.6.24.7/arch/ppc/kernel/traps.c
+@@ -231,39 +231,25 @@ platform_machine_check(struct pt_regs *r

  {
  }
  
  {
  }
  


@@ -61108,7 +61474,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/kernel/traps.c powerpc.git
        printk("Machine check in kernel mode.\n");
        if (reason & ESR_IMCP){
                printk("Instruction Synchronous Machine Check exception\n");
        printk("Machine check in kernel mode.\n");
        if (reason & ESR_IMCP){
                printk("Instruction Synchronous Machine Check exception\n");

-@@ -293,7 +279,13 @@
+@@ -293,7 +279,13 @@ void machine_check_exception(struct pt_r

                /* Clear MCSR */
                mtspr(SPRN_MCSR, mcsr);
        }
                /* Clear MCSR */
                mtspr(SPRN_MCSR, mcsr);
        }


@@ -61123,7 +61489,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/kernel/traps.c powerpc.git
        printk("Machine check in kernel mode.\n");
        printk("Caused by (from MCSR=%lx): ", reason);
  
        printk("Machine check in kernel mode.\n");
        printk("Caused by (from MCSR=%lx): ", reason);
  

-@@ -305,8 +297,6 @@
+@@ -305,8 +297,6 @@ void machine_check_exception(struct pt_r

                printk("Data Cache Push Parity Error\n");
        if (reason & MCSR_DCPERR)
                printk("Data Cache Parity Error\n");
                printk("Data Cache Push Parity Error\n");
        if (reason & MCSR_DCPERR)
                printk("Data Cache Parity Error\n");


@@ -61132,7 +61498,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/kernel/traps.c powerpc.git
        if (reason & MCSR_BUS_IAERR)
                printk("Bus - Instruction Address Error\n");
        if (reason & MCSR_BUS_RAERR)
        if (reason & MCSR_BUS_IAERR)
                printk("Bus - Instruction Address Error\n");
        if (reason & MCSR_BUS_RAERR)

-@@ -318,12 +308,19 @@
+@@ -318,12 +308,19 @@ void machine_check_exception(struct pt_r

        if (reason & MCSR_BUS_RBERR)
                printk("Bus - Read Data Bus Error\n");
        if (reason & MCSR_BUS_WBERR)
        if (reason & MCSR_BUS_RBERR)
                printk("Bus - Read Data Bus Error\n");
        if (reason & MCSR_BUS_WBERR)


@@ -61154,7 +61520,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/kernel/traps.c powerpc.git
        printk("Machine check in kernel mode.\n");
        printk("Caused by (from MCSR=%lx): ", reason);
  
        printk("Machine check in kernel mode.\n");
        printk("Caused by (from MCSR=%lx): ", reason);
  

-@@ -341,7 +338,14 @@
+@@ -341,7 +338,14 @@ void machine_check_exception(struct pt_r

                printk("Bus - Read Bus Error on data load\n");
        if (reason & MCSR_BUS_WRERR)
                printk("Bus - Write Bus Error on buffered store or cache line push\n");
                printk("Bus - Read Bus Error on data load\n");
        if (reason & MCSR_BUS_WRERR)
                printk("Bus - Write Bus Error on buffered store or cache line push\n");


@@ -61170,7 +61536,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/kernel/traps.c powerpc.git
        printk("Machine check in kernel mode.\n");
        printk("Caused by (from SRR1=%lx): ", reason);
        switch (reason & 0x601F0000) {
        printk("Machine check in kernel mode.\n");
        printk("Caused by (from SRR1=%lx): ", reason);
        switch (reason & 0x601F0000) {

-@@ -371,7 +375,39 @@
+@@ -371,7 +375,39 @@ void machine_check_exception(struct pt_r

        default:
                printk("Unknown values in msr\n");
        }
        default:
                printk("Unknown values in msr\n");
        }


@@ -61211,10 +61577,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/kernel/traps.c powerpc.git
  
        /*
         * Optional platform-provided routine to print out
  
        /*
         * Optional platform-provided routine to print out

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/mm/44x_mmu.c powerpc.git/arch/ppc/mm/44x_mmu.c
---- linux-2.6.24/arch/ppc/mm/44x_mmu.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/mm/44x_mmu.c  2008-01-28 20:25:51.000000000 +0100
-@@ -60,38 +60,28 @@
+Index: linux-2.6.24.7/arch/ppc/mm/44x_mmu.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/ppc/mm/44x_mmu.c
++++ linux-2.6.24.7/arch/ppc/mm/44x_mmu.c
+@@ -60,38 +60,28 @@ extern char etext[], _stext[];

   * Just needed it declared someplace.
   */
  unsigned int tlb_44x_index = 0;
   * Just needed it declared someplace.
   */
  unsigned int tlb_44x_index = 0;


@@ -61263,7 +61630,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/mm/44x_mmu.c powerpc.git/a
  void __init MMU_init_hw(void)
  {
        flush_instruction_cache();
  void __init MMU_init_hw(void)
  {
        flush_instruction_cache();

-@@ -99,22 +89,13 @@
+@@ -99,22 +89,13 @@ void __init MMU_init_hw(void)

  
  unsigned long __init mmu_mapin_ram(void)
  {
  
  unsigned long __init mmu_mapin_ram(void)
  {


@@ -61292,9 +61659,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/mm/44x_mmu.c powerpc.git/a
  
        return total_lowmem;
  }
  
        return total_lowmem;
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/platforms/85xx/mpc85xx_ads_common.c powerpc.git/arch/ppc/platforms/85xx/mpc85xx_ads_common.c
---- linux-2.6.24/arch/ppc/platforms/85xx/mpc85xx_ads_common.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/platforms/85xx/mpc85xx_ads_common.c   2008-01-28 20:25:51.000000000 +0100
+Index: linux-2.6.24.7/arch/ppc/platforms/85xx/mpc85xx_ads_common.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/ppc/platforms/85xx/mpc85xx_ads_common.c
++++ linux-2.6.24.7/arch/ppc/platforms/85xx/mpc85xx_ads_common.c

 @@ -42,8 +42,6 @@
  
  #include <mm/mmu_decl.h>
 @@ -42,8 +42,6 @@
  
  #include <mm/mmu_decl.h>


@@ -61304,7 +61672,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/platforms/85xx/mpc85xx_ads
  #include <platforms/85xx/mpc85xx_ads_common.h>
  
  #ifndef CONFIG_PCI
  #include <platforms/85xx/mpc85xx_ads_common.h>
  
  #ifndef CONFIG_PCI

-@@ -190,6 +188,7 @@
+@@ -190,6 +188,7 @@ mpc85xx_exclude_device(u_char bus, u_cha

  #endif /* CONFIG_PCI */
  
  #ifdef CONFIG_RAPIDIO
  #endif /* CONFIG_PCI */
  
  #ifdef CONFIG_RAPIDIO


@@ -61312,9 +61680,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/platforms/85xx/mpc85xx_ads
  void platform_rio_init(void)
  {
        /* 512MB RIO LAW at 0xc0000000 */
  void platform_rio_init(void)
  {
        /* 512MB RIO LAW at 0xc0000000 */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/platforms/85xx/stx_gp3.c powerpc.git/arch/ppc/platforms/85xx/stx_gp3.c
---- linux-2.6.24/arch/ppc/platforms/85xx/stx_gp3.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/platforms/85xx/stx_gp3.c      2008-01-28 20:25:51.000000000 +0100
+Index: linux-2.6.24.7/arch/ppc/platforms/85xx/stx_gp3.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/ppc/platforms/85xx/stx_gp3.c
++++ linux-2.6.24.7/arch/ppc/platforms/85xx/stx_gp3.c

 @@ -50,12 +50,10 @@
  #include <asm/irq.h>
  #include <asm/immap_85xx.h>
 @@ -50,12 +50,10 @@
  #include <asm/irq.h>
  #include <asm/immap_85xx.h>


@@ -61328,7 +61697,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/platforms/85xx/stx_gp3.c p
  
  
  unsigned char __res[sizeof(bd_t)];
  
  
  unsigned char __res[sizeof(bd_t)];

-@@ -271,6 +269,7 @@
+@@ -271,6 +269,7 @@ int mpc85xx_exclude_device(u_char bus, u

  #endif /* CONFIG_PCI */
  
  #ifdef CONFIG_RAPIDIO
  #endif /* CONFIG_PCI */
  
  #ifdef CONFIG_RAPIDIO


@@ -61336,9 +61705,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/platforms/85xx/stx_gp3.c p
  void
  platform_rio_init(void)
  {
  void
  platform_rio_init(void)
  {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/platforms/85xx/tqm85xx.c powerpc.git/arch/ppc/platforms/85xx/tqm85xx.c
---- linux-2.6.24/arch/ppc/platforms/85xx/tqm85xx.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/platforms/85xx/tqm85xx.c      2008-01-28 20:25:51.000000000 +0100
+Index: linux-2.6.24.7/arch/ppc/platforms/85xx/tqm85xx.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/ppc/platforms/85xx/tqm85xx.c
++++ linux-2.6.24.7/arch/ppc/platforms/85xx/tqm85xx.c

 @@ -54,7 +54,6 @@
  #include <syslib/ppc85xx_setup.h>
  #include <syslib/cpm2_pic.h>
 @@ -54,7 +54,6 @@
  #include <syslib/ppc85xx_setup.h>
  #include <syslib/cpm2_pic.h>


@@ -61347,7 +61717,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/platforms/85xx/tqm85xx.c p
  
  #ifndef CONFIG_PCI
  unsigned long isa_io_base = 0;
  
  #ifndef CONFIG_PCI
  unsigned long isa_io_base = 0;

-@@ -309,6 +308,7 @@
+@@ -309,6 +308,7 @@ int mpc85xx_exclude_device(u_char bus, u

  #endif /* CONFIG_PCI */
  
  #ifdef CONFIG_RAPIDIO
  #endif /* CONFIG_PCI */
  
  #ifdef CONFIG_RAPIDIO


@@ -61355,10 +61725,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/platforms/85xx/tqm85xx.c p
  void platform_rio_init(void)
  {
        /* 512MB RIO LAW at 0xc0000000 */
  void platform_rio_init(void)
  {
        /* 512MB RIO LAW at 0xc0000000 */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/platforms/ev64260.c powerpc.git/arch/ppc/platforms/ev64260.c
---- linux-2.6.24/arch/ppc/platforms/ev64260.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/platforms/ev64260.c   2008-01-28 20:25:51.000000000 +0100
-@@ -336,7 +336,7 @@
+Index: linux-2.6.24.7/arch/ppc/platforms/ev64260.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/ppc/platforms/ev64260.c
++++ linux-2.6.24.7/arch/ppc/platforms/ev64260.c
+@@ -336,7 +336,7 @@ ev64260_early_serial_map(void)

  #endif
  
                if (early_serial_setup(&port) != 0)
  #endif
  
                if (early_serial_setup(&port) != 0)


@@ -61367,7 +61738,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/platforms/ev64260.c powerp
                                "failed\n");
  
                first_time = 0;
                                "failed\n");
  
                first_time = 0;

-@@ -388,7 +388,7 @@
+@@ -388,7 +388,7 @@ ev64260_setup_arch(void)

        ev64260_early_serial_map();
  #endif
  
        ev64260_early_serial_map();
  #endif
  


@@ -61376,10 +61747,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/platforms/ev64260.c powerp
                "(source@mvista.com)\n", BOARD_VENDOR, BOARD_MACHINE);
  
        if (ppc_md.progress)
                "(source@mvista.com)\n", BOARD_VENDOR, BOARD_MACHINE);
  
        if (ppc_md.progress)

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/platforms/prep_pci.c powerpc.git/arch/ppc/platforms/prep_pci.c
---- linux-2.6.24/arch/ppc/platforms/prep_pci.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/platforms/prep_pci.c  2008-01-28 20:25:52.000000000 +0100
-@@ -1099,7 +1099,6 @@
+Index: linux-2.6.24.7/arch/ppc/platforms/prep_pci.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/ppc/platforms/prep_pci.c
++++ linux-2.6.24.7/arch/ppc/platforms/prep_pci.c
+@@ -1099,7 +1099,6 @@ prep_pib_init(void)

                                pci_write_config_byte(dev, 0x43, reg);
                        }
                }
                                pci_write_config_byte(dev, 0x43, reg);
                        }
                }


@@ -61387,10 +61759,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/platforms/prep_pci.c power
        }
  
        if ((dev = pci_get_device(PCI_VENDOR_ID_WINBOND,
        }
  
        if ((dev = pci_get_device(PCI_VENDOR_ID_WINBOND,

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/Makefile powerpc.git/arch/ppc/syslib/Makefile
---- linux-2.6.24/arch/ppc/syslib/Makefile      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/syslib/Makefile       2008-01-28 20:25:52.000000000 +0100
-@@ -93,7 +93,6 @@
+Index: linux-2.6.24.7/arch/ppc/syslib/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/arch/ppc/syslib/Makefile
++++ linux-2.6.24.7/arch/ppc/syslib/Makefile
+@@ -93,7 +93,6 @@ obj-$(CONFIG_85xx)           += open_pic.o ppc85x

  ifeq ($(CONFIG_85xx),y)
  obj-$(CONFIG_PCI)             += pci_auto.o
  endif
  ifeq ($(CONFIG_85xx),y)
  obj-$(CONFIG_PCI)             += pci_auto.o
  endif


@@ -61398,9 +61771,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/Makefile powerpc.gi
  obj-$(CONFIG_83xx)            += ppc83xx_setup.o ppc_sys.o \
                                        mpc83xx_sys.o mpc83xx_devices.o ipic.o
  ifeq ($(CONFIG_83xx),y)
  obj-$(CONFIG_83xx)            += ppc83xx_setup.o ppc_sys.o \
                                        mpc83xx_sys.o mpc83xx_devices.o ipic.o
  ifeq ($(CONFIG_83xx),y)

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/gt64260_pic.c powerpc.git/arch/ppc/syslib/gt64260_pic.c
---- linux-2.6.24/arch/ppc/syslib/gt64260_pic.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/syslib/gt64260_pic.c  2008-01-28 20:25:52.000000000 +0100
+Index: linux-2.6.24.7/arch/ppc/syslib/gt64260_pic.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/ppc/syslib/gt64260_pic.c
++++ linux-2.6.24.7/arch/ppc/syslib/gt64260_pic.c

 @@ -35,7 +35,6 @@
  #include <linux/interrupt.h>
  #include <linux/sched.h>
 @@ -35,7 +35,6 @@
  #include <linux/interrupt.h>
  #include <linux/sched.h>


@@ -61409,9 +61783,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/gt64260_pic.c power
  #include <linux/delay.h>
  #include <linux/irq.h>
  
  #include <linux/delay.h>
  #include <linux/irq.h>
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/mpc52xx_pic.c powerpc.git/arch/ppc/syslib/mpc52xx_pic.c
---- linux-2.6.24/arch/ppc/syslib/mpc52xx_pic.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/syslib/mpc52xx_pic.c  2008-01-28 20:25:52.000000000 +0100
+Index: linux-2.6.24.7/arch/ppc/syslib/mpc52xx_pic.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/ppc/syslib/mpc52xx_pic.c
++++ linux-2.6.24.7/arch/ppc/syslib/mpc52xx_pic.c

 @@ -20,7 +20,6 @@
  #include <linux/init.h>
  #include <linux/sched.h>
 @@ -20,7 +20,6 @@
  #include <linux/init.h>
  #include <linux/sched.h>


@@ -61420,9 +61795,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/mpc52xx_pic.c power
  #include <linux/delay.h>
  #include <linux/irq.h>
  
  #include <linux/delay.h>
  #include <linux/irq.h>
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/mv64360_pic.c powerpc.git/arch/ppc/syslib/mv64360_pic.c
---- linux-2.6.24/arch/ppc/syslib/mv64360_pic.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/syslib/mv64360_pic.c  2008-01-28 20:25:52.000000000 +0100
+Index: linux-2.6.24.7/arch/ppc/syslib/mv64360_pic.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/ppc/syslib/mv64360_pic.c
++++ linux-2.6.24.7/arch/ppc/syslib/mv64360_pic.c

 @@ -36,7 +36,6 @@
  #include <linux/init.h>
  #include <linux/sched.h>
 @@ -36,7 +36,6 @@
  #include <linux/init.h>
  #include <linux/sched.h>


@@ -61431,10 +61807,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/mv64360_pic.c power
  #include <linux/delay.h>
  #include <linux/irq.h>
  #include <linux/interrupt.h>
  #include <linux/delay.h>
  #include <linux/irq.h>
  #include <linux/interrupt.h>

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/ocp.c powerpc.git/arch/ppc/syslib/ocp.c
---- linux-2.6.24/arch/ppc/syslib/ocp.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/syslib/ocp.c  2008-01-28 20:25:52.000000000 +0100
-@@ -376,7 +376,7 @@
+Index: linux-2.6.24.7/arch/ppc/syslib/ocp.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/ppc/syslib/ocp.c
++++ linux-2.6.24.7/arch/ppc/syslib/ocp.c
+@@ -376,7 +376,7 @@ ocp_remove_one_device(unsigned int vendo

  
        down_write(&ocp_devices_sem);
        dev = __ocp_find_device(vendor, function, index);
  
        down_write(&ocp_devices_sem);
        dev = __ocp_find_device(vendor, function, index);


@@ -61443,9 +61820,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/ocp.c powerpc.git/a
        up_write(&ocp_devices_sem);
  
        DBG(("ocp: ocp_remove_one_device(vendor: %x, function: %x, index: %d)... done.\n", vendor, function, index));
        up_write(&ocp_devices_sem);
  
        DBG(("ocp: ocp_remove_one_device(vendor: %x, function: %x, index: %d)... done.\n", vendor, function, index));

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/ppc83xx_setup.c powerpc.git/arch/ppc/syslib/ppc83xx_setup.c
---- linux-2.6.24/arch/ppc/syslib/ppc83xx_setup.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/syslib/ppc83xx_setup.c        2008-01-28 20:25:52.000000000 +0100
+Index: linux-2.6.24.7/arch/ppc/syslib/ppc83xx_setup.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/ppc/syslib/ppc83xx_setup.c
++++ linux-2.6.24.7/arch/ppc/syslib/ppc83xx_setup.c

 @@ -41,7 +41,6 @@
  
  #include <syslib/ppc83xx_setup.h>
 @@ -41,7 +41,6 @@
  
  #include <syslib/ppc83xx_setup.h>


@@ -61454,9 +61832,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/ppc83xx_setup.c pow
  #include <syslib/ppc83xx_pci.h>
  #endif
  
  #include <syslib/ppc83xx_pci.h>
  #endif
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/ppc85xx_rio.c powerpc.git/arch/ppc/syslib/ppc85xx_rio.c
---- linux-2.6.24/arch/ppc/syslib/ppc85xx_rio.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/syslib/ppc85xx_rio.c  1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.24.7/arch/ppc/syslib/ppc85xx_rio.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/ppc/syslib/ppc85xx_rio.c
++++ /dev/null

 @@ -1,932 +0,0 @@
 -/*
 - * MPC85xx RapidIO support
 @@ -1,932 +0,0 @@
 -/*
 - * MPC85xx RapidIO support


@@ -62390,9 +62769,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/ppc85xx_rio.c power
 -      out_be32((void *)&dbell_atmu_regs->rowar, 0x8004200b);
 -      mpc85xx_rio_doorbell_init(port);
 -}
 -      out_be32((void *)&dbell_atmu_regs->rowar, 0x8004200b);
 -      mpc85xx_rio_doorbell_init(port);
 -}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/ppc85xx_rio.h powerpc.git/arch/ppc/syslib/ppc85xx_rio.h
---- linux-2.6.24/arch/ppc/syslib/ppc85xx_rio.h 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/syslib/ppc85xx_rio.h  1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.24.7/arch/ppc/syslib/ppc85xx_rio.h
+===================================================================
+--- linux-2.6.24.7.orig/arch/ppc/syslib/ppc85xx_rio.h
++++ /dev/null

 @@ -1,20 +0,0 @@
 -/*
 - * MPC85xx RapidIO definitions
 @@ -1,20 +0,0 @@
 -/*
 - * MPC85xx RapidIO definitions


@@ -62414,10 +62794,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/ppc85xx_rio.h power
 -extern void mpc85xx_rio_setup(int law_start, int law_size);
 -
 -#endif                                /* __PPC_SYSLIB_PPC85XX_RIO_H */
 -extern void mpc85xx_rio_setup(int law_start, int law_size);
 -
 -#endif                                /* __PPC_SYSLIB_PPC85XX_RIO_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/ppc8xx_pic.c powerpc.git/arch/ppc/syslib/ppc8xx_pic.c
---- linux-2.6.24/arch/ppc/syslib/ppc8xx_pic.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/syslib/ppc8xx_pic.c   2008-01-28 20:25:52.000000000 +0100
-@@ -16,7 +16,7 @@
+Index: linux-2.6.24.7/arch/ppc/syslib/ppc8xx_pic.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/ppc/syslib/ppc8xx_pic.c
++++ linux-2.6.24.7/arch/ppc/syslib/ppc8xx_pic.c
+@@ -16,7 +16,7 @@ extern int cpm_get_irq(void);

   * the only interrupt controller.  Some boards, like the MBX and
   * Sandpoint have the 8259 as a secondary controller.  Depending
   * upon the processor type, the internal controller can have as
   * the only interrupt controller.  Some boards, like the MBX and
   * Sandpoint have the 8259 as a secondary controller.  Depending
   * upon the processor type, the internal controller can have as


@@ -62426,10 +62807,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/ppc8xx_pic.c powerp
   * "clear_bit()" and "set_bit()" functions like other platforms,
   * but they are overkill for us.
   */
   * "clear_bit()" and "set_bit()" functions like other platforms,
   * but they are overkill for us.
   */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/ppc_sys.c powerpc.git/arch/ppc/syslib/ppc_sys.c
---- linux-2.6.24/arch/ppc/syslib/ppc_sys.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/syslib/ppc_sys.c      2008-01-28 20:25:52.000000000 +0100
-@@ -185,7 +185,7 @@
+Index: linux-2.6.24.7/arch/ppc/syslib/ppc_sys.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/ppc/syslib/ppc_sys.c
++++ linux-2.6.24.7/arch/ppc/syslib/ppc_sys.c
+@@ -185,7 +185,7 @@ void platform_notify_map(const struct pl

   */
  
  /*
   */
  
  /*


@@ -62438,9 +62820,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/ppc_sys.c powerpc.g
     Hereby, this should be called *before* any func stuff triggeded.
   */
  void ppc_sys_device_initfunc(void)
     Hereby, this should be called *before* any func stuff triggeded.
   */
  void ppc_sys_device_initfunc(void)

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/xmon/start.c powerpc.git/arch/ppc/xmon/start.c
---- linux-2.6.24/arch/ppc/xmon/start.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/xmon/start.c  2008-01-28 20:25:52.000000000 +0100
+Index: linux-2.6.24.7/arch/ppc/xmon/start.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/ppc/xmon/start.c
++++ linux-2.6.24.7/arch/ppc/xmon/start.c

 @@ -10,7 +10,6 @@
  #include <linux/sysrq.h>
  #include <linux/bitops.h>
 @@ -10,7 +10,6 @@
  #include <linux/sysrq.h>
  #include <linux/bitops.h>


@@ -62449,10 +62832,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/xmon/start.c powerpc.git/a
  #include <asm/errno.h>
  #include <asm/processor.h>
  #include <asm/delay.h>
  #include <asm/errno.h>
  #include <asm/processor.h>
  #include <asm/delay.h>

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ata/Kconfig powerpc.git/drivers/ata/Kconfig
---- linux-2.6.24/drivers/ata/Kconfig   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/ata/Kconfig    2008-01-28 20:25:59.000000000 +0100
-@@ -607,13 +607,23 @@
+Index: linux-2.6.24.7/drivers/ata/Kconfig
+===================================================================
+--- linux-2.6.24.7.orig/drivers/ata/Kconfig
++++ linux-2.6.24.7/drivers/ata/Kconfig
+@@ -607,13 +607,23 @@ config PATA_WINBOND_VLB

  
  config PATA_PLATFORM
        tristate "Generic platform device PATA support"
  
  config PATA_PLATFORM
        tristate "Generic platform device PATA support"


@@ -62477,10 +62861,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ata/Kconfig powerpc.git/dri
  config PATA_ICSIDE
        tristate "Acorn ICS PATA support"
        depends on ARM && ARCH_ACORN
  config PATA_ICSIDE
        tristate "Acorn ICS PATA support"
        depends on ARM && ARCH_ACORN

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ata/Makefile powerpc.git/drivers/ata/Makefile
---- linux-2.6.24/drivers/ata/Makefile  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/ata/Makefile   2008-01-28 20:25:59.000000000 +0100
-@@ -67,6 +67,7 @@
+Index: linux-2.6.24.7/drivers/ata/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/drivers/ata/Makefile
++++ linux-2.6.24.7/drivers/ata/Makefile
+@@ -67,6 +67,7 @@ obj-$(CONFIG_PATA_IXP4XX_CF) += pata_ixp

  obj-$(CONFIG_PATA_SCC)                += pata_scc.o
  obj-$(CONFIG_PATA_BF54X)      += pata_bf54x.o
  obj-$(CONFIG_PATA_PLATFORM)   += pata_platform.o
  obj-$(CONFIG_PATA_SCC)                += pata_scc.o
  obj-$(CONFIG_PATA_BF54X)      += pata_bf54x.o
  obj-$(CONFIG_PATA_PLATFORM)   += pata_platform.o


@@ -62488,9 +62873,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ata/Makefile powerpc.git/dr
  obj-$(CONFIG_PATA_ICSIDE)     += pata_icside.o
  # Should be last but two libata driver
  obj-$(CONFIG_PATA_ACPI)               += pata_acpi.o
  obj-$(CONFIG_PATA_ICSIDE)     += pata_icside.o
  # Should be last but two libata driver
  obj-$(CONFIG_PATA_ACPI)               += pata_acpi.o

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ata/pata_of_platform.c powerpc.git/drivers/ata/pata_of_platform.c
---- linux-2.6.24/drivers/ata/pata_of_platform.c        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/drivers/ata/pata_of_platform.c 2008-01-28 20:25:59.000000000 +0100
+Index: linux-2.6.24.7/drivers/ata/pata_of_platform.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/drivers/ata/pata_of_platform.c

 @@ -0,0 +1,114 @@
 +/*
 + * OF-platform PATA driver
 @@ -0,0 +1,114 @@
 +/*
 + * OF-platform PATA driver


@@ -62606,10 +62992,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ata/pata_of_platform.c powe
 +MODULE_DESCRIPTION("OF-platform PATA driver");
 +MODULE_AUTHOR("Anton Vorontsov <avorontsov@ru.mvista.com>");
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("OF-platform PATA driver");
 +MODULE_AUTHOR("Anton Vorontsov <avorontsov@ru.mvista.com>");
 +MODULE_LICENSE("GPL");

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ata/pata_platform.c powerpc.git/drivers/ata/pata_platform.c
---- linux-2.6.24/drivers/ata/pata_platform.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/ata/pata_platform.c    2008-01-28 20:25:59.000000000 +0100
-@@ -93,14 +93,9 @@
+Index: linux-2.6.24.7/drivers/ata/pata_platform.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/ata/pata_platform.c
++++ linux-2.6.24.7/drivers/ata/pata_platform.c
+@@ -93,14 +93,9 @@ static struct ata_port_operations pata_p

  };
  
  static void pata_platform_setup_port(struct ata_ioports *ioaddr,
  };
  
  static void pata_platform_setup_port(struct ata_ioports *ioaddr,


@@ -62625,7 +63012,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ata/pata_platform.c powerpc
        ioaddr->data_addr       = ioaddr->cmd_addr + (ATA_REG_DATA    << shift);
        ioaddr->error_addr      = ioaddr->cmd_addr + (ATA_REG_ERR     << shift);
        ioaddr->feature_addr    = ioaddr->cmd_addr + (ATA_REG_FEATURE << shift);
        ioaddr->data_addr       = ioaddr->cmd_addr + (ATA_REG_DATA    << shift);
        ioaddr->error_addr      = ioaddr->cmd_addr + (ATA_REG_ERR     << shift);
        ioaddr->feature_addr    = ioaddr->cmd_addr + (ATA_REG_FEATURE << shift);

-@@ -114,8 +109,13 @@
+@@ -114,8 +109,13 @@ static void pata_platform_setup_port(str

  }
  
  /**
  }
  
  /**


@@ -62641,7 +63028,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ata/pata_platform.c powerpc
   *
   *    Register a platform bus IDE interface. Such interfaces are PIO and we
   *    assume do not support IRQ sharing.
   *
   *    Register a platform bus IDE interface. Such interfaces are PIO and we
   *    assume do not support IRQ sharing.

-@@ -135,42 +135,18 @@
+@@ -135,42 +135,18 @@ static void pata_platform_setup_port(str

   *
   *    If no IRQ resource is present, PIO polling mode is used instead.
   */
   *
   *    If no IRQ resource is present, PIO polling mode is used instead.
   */


@@ -62692,7 +63079,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ata/pata_platform.c powerpc
  
        /*
         * Check for MMIO
  
        /*
         * Check for MMIO

-@@ -181,20 +157,21 @@
+@@ -181,20 +157,21 @@ static int __devinit pata_platform_probe

        /*
         * And the IRQ
         */
        /*
         * And the IRQ
         */


@@ -62719,7 +63106,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ata/pata_platform.c powerpc
        ap->flags |= ATA_FLAG_SLAVE_POSS;
  
        /*
        ap->flags |= ATA_FLAG_SLAVE_POSS;
  
        /*

-@@ -209,25 +186,24 @@
+@@ -209,25 +186,24 @@ static int __devinit pata_platform_probe

         * Handle the MMIO case
         */
        if (mmio) {
         * Handle the MMIO case
         */
        if (mmio) {


@@ -62751,7 +63138,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ata/pata_platform.c powerpc
  
        ata_port_desc(ap, "%s cmd 0x%llx ctl 0x%llx", mmio ? "mmio" : "ioport",
                      (unsigned long long)io_res->start,
  
        ata_port_desc(ap, "%s cmd 0x%llx ctl 0x%llx", mmio ? "mmio" : "ioport",
                      (unsigned long long)io_res->start,

-@@ -235,26 +211,78 @@
+@@ -235,26 +211,78 @@ static int __devinit pata_platform_probe

  
        /* activate */
        return ata_host_activate(host, irq, irq ? ata_interrupt : NULL,
  
        /* activate */
        return ata_host_activate(host, irq, irq ? ata_interrupt : NULL,


@@ -62836,10 +63223,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ata/pata_platform.c powerpc
  
  static struct platform_driver pata_platform_driver = {
        .probe          = pata_platform_probe,
  
  static struct platform_driver pata_platform_driver = {
        .probe          = pata_platform_probe,

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/char/hw_random/Kconfig powerpc.git/drivers/char/hw_random/Kconfig
---- linux-2.6.24/drivers/char/hw_random/Kconfig        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/char/hw_random/Kconfig 2008-01-28 20:25:59.000000000 +0100
-@@ -98,7 +98,7 @@
+Index: linux-2.6.24.7/drivers/char/hw_random/Kconfig
+===================================================================
+--- linux-2.6.24.7.orig/drivers/char/hw_random/Kconfig
++++ linux-2.6.24.7/drivers/char/hw_random/Kconfig
+@@ -98,7 +98,7 @@ config HW_RANDOM_PASEMI

        default HW_RANDOM
        ---help---
          This driver provides kernel-side support for the Random Number
        default HW_RANDOM
        ---help---
          This driver provides kernel-side support for the Random Number


@@ -62848,10 +63236,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/char/hw_random/Kconfig powe
  
          To compile this driver as a module, choose M here: the
          module will be called pasemi-rng.
  
          To compile this driver as a module, choose M here: the
          module will be called pasemi-rng.

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/char/hw_random/pasemi-rng.c powerpc.git/drivers/char/hw_random/pasemi-rng.c
---- linux-2.6.24/drivers/char/hw_random/pasemi-rng.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/char/hw_random/pasemi-rng.c    2008-01-28 20:25:59.000000000 +0100
-@@ -126,10 +126,9 @@
+Index: linux-2.6.24.7/drivers/char/hw_random/pasemi-rng.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/char/hw_random/pasemi-rng.c
++++ linux-2.6.24.7/drivers/char/hw_random/pasemi-rng.c
+@@ -126,10 +126,9 @@ static int __devexit rng_remove(struct o

  }
  
  static struct of_device_id rng_match[] = {
  }
  
  static struct of_device_id rng_match[] = {


@@ -62865,10 +63254,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/char/hw_random/pasemi-rng.c
  };
  
  static struct of_platform_driver rng_driver = {
  };
  
  static struct of_platform_driver rng_driver = {

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/edac/pasemi_edac.c powerpc.git/drivers/edac/pasemi_edac.c
---- linux-2.6.24/drivers/edac/pasemi_edac.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/edac/pasemi_edac.c     2008-01-28 20:26:00.000000000 +0100
-@@ -225,7 +225,7 @@
+Index: linux-2.6.24.7/drivers/edac/pasemi_edac.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/edac/pasemi_edac.c
++++ linux-2.6.24.7/drivers/edac/pasemi_edac.c
+@@ -225,7 +225,7 @@ static int __devinit pasemi_edac_probe(s

                EDAC_FLAG_NONE;
        mci->mod_name = MODULE_NAME;
        mci->dev_name = pci_name(pdev);
                EDAC_FLAG_NONE;
        mci->mod_name = MODULE_NAME;
        mci->dev_name = pci_name(pdev);


@@ -62877,15 +63267,16 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/edac/pasemi_edac.c powerpc.
        mci->edac_check = pasemi_edac_check;
        mci->ctl_page_to_phys = NULL;
        pci_read_config_dword(pdev, MCCFG_SCRUB, &scrub);
        mci->edac_check = pasemi_edac_check;
        mci->ctl_page_to_phys = NULL;
        pci_read_config_dword(pdev, MCCFG_SCRUB, &scrub);

-@@ -297,4 +297,4 @@
+@@ -297,4 +297,4 @@ module_exit(pasemi_edac_exit);

  
  MODULE_LICENSE("GPL");
  MODULE_AUTHOR("Egor Martovetsky <egor@pasemi.com>");
 -MODULE_DESCRIPTION("MC support for PA Semi PA6T-1682M memory controller");
 +MODULE_DESCRIPTION("MC support for PA Semi PWRficient memory controller");
  
  MODULE_LICENSE("GPL");
  MODULE_AUTHOR("Egor Martovetsky <egor@pasemi.com>");
 -MODULE_DESCRIPTION("MC support for PA Semi PA6T-1682M memory controller");
 +MODULE_DESCRIPTION("MC support for PA Semi PWRficient memory controller");

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/adb.c powerpc.git/drivers/macintosh/adb.c
---- linux-2.6.24/drivers/macintosh/adb.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/macintosh/adb.c        2008-01-28 20:26:08.000000000 +0100
+Index: linux-2.6.24.7/drivers/macintosh/adb.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/macintosh/adb.c
++++ linux-2.6.24.7/drivers/macintosh/adb.c

 @@ -35,6 +35,7 @@
  #include <linux/spinlock.h>
  #include <linux/completion.h>
 @@ -35,6 +35,7 @@
  #include <linux/spinlock.h>
  #include <linux/completion.h>


@@ -62894,7 +63285,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/adb.c powerpc.git
  
  #include <asm/uaccess.h>
  #include <asm/semaphore.h>
  
  #include <asm/uaccess.h>
  #include <asm/semaphore.h>

-@@ -82,21 +83,11 @@
+@@ -82,21 +83,11 @@ struct adb_driver *adb_controller;

  BLOCKING_NOTIFIER_HEAD(adb_client_list);
  static int adb_got_sleep;
  static int adb_inited;
  BLOCKING_NOTIFIER_HEAD(adb_client_list);
  static int adb_got_sleep;
  static int adb_inited;


@@ -62916,7 +63307,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/adb.c powerpc.git
  static int adb_scan_bus(void);
  static int do_adb_reset_bus(void);
  static void adbdev_init(void);
  static int adb_scan_bus(void);
  static int do_adb_reset_bus(void);
  static void adbdev_init(void);

-@@ -134,16 +125,6 @@
+@@ -134,16 +125,6 @@ static void printADBreply(struct adb_req

  }
  #endif
  
  }
  #endif
  


@@ -62933,7 +63324,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/adb.c powerpc.git
  static int adb_scan_bus(void)
  {
        int i, highFree=0, noMovement;
  static int adb_scan_bus(void)
  {
        int i, highFree=0, noMovement;

-@@ -248,13 +229,10 @@
+@@ -248,13 +229,10 @@ static int adb_scan_bus(void)

  static int
  adb_probe_task(void *x)
  {
  static int
  adb_probe_task(void *x)
  {


@@ -62947,7 +63338,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/adb.c powerpc.git
        up(&adb_probe_mutex);
  
        return 0;
        up(&adb_probe_mutex);
  
        return 0;

-@@ -263,7 +241,7 @@
+@@ -263,7 +241,7 @@ adb_probe_task(void *x)

  static void
  __adb_probe_task(struct work_struct *bullshit)
  {
  static void
  __adb_probe_task(struct work_struct *bullshit)
  {


@@ -62956,7 +63347,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/adb.c powerpc.git
  }
  
  static DECLARE_WORK(adb_reset_work, __adb_probe_task);
  }
  
  static DECLARE_WORK(adb_reset_work, __adb_probe_task);

-@@ -281,6 +259,36 @@
+@@ -281,6 +259,36 @@ adb_reset_bus(void)

        return 0;
  }
  
        return 0;
  }
  


@@ -62993,7 +63384,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/adb.c powerpc.git
  int __init adb_init(void)
  {
        struct adb_driver *driver;
  int __init adb_init(void)
  {
        struct adb_driver *driver;

-@@ -313,15 +321,12 @@
+@@ -313,15 +321,12 @@ int __init adb_init(void)

                printk(KERN_WARNING "Warning: no ADB interface detected\n");
                adb_controller = NULL;
        } else {
                printk(KERN_WARNING "Warning: no ADB interface detected\n");
                adb_controller = NULL;
        } else {


@@ -63010,7 +63401,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/adb.c powerpc.git
                adbdev_init();
                adb_reset_bus();
        }
                adbdev_init();
                adb_reset_bus();
        }

-@@ -330,33 +335,6 @@
+@@ -330,33 +335,6 @@ int __init adb_init(void)

  
  __initcall(adb_init);
  
  
  __initcall(adb_init);
  


@@ -63044,7 +63435,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/adb.c powerpc.git
  static int
  do_adb_reset_bus(void)
  {
  static int
  do_adb_reset_bus(void)
  {

-@@ -373,7 +351,7 @@
+@@ -373,7 +351,7 @@ do_adb_reset_bus(void)

  
        if (sleepy_trackpad) {
                /* Let the trackpad settle down */
  
        if (sleepy_trackpad) {
                /* Let the trackpad settle down */


@@ -63053,7 +63444,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/adb.c powerpc.git
        }
  
        down(&adb_handler_sem);
        }
  
        down(&adb_handler_sem);

-@@ -389,7 +367,7 @@
+@@ -389,7 +367,7 @@ do_adb_reset_bus(void)

  
        if (sleepy_trackpad) {
                /* Let the trackpad settle down */
  
        if (sleepy_trackpad) {
                /* Let the trackpad settle down */


@@ -63062,7 +63453,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/adb.c powerpc.git
        }
  
        if (!ret) {
        }
  
        if (!ret) {

-@@ -413,41 +391,27 @@
+@@ -413,41 +391,27 @@ adb_poll(void)

        adb_controller->poll();
  }
  
        adb_controller->poll();
  }
  


@@ -63111,7 +63502,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/adb.c powerpc.git
        req->nbytes = nbytes+1;
        req->done = done;
        req->reply_expected = flags & ADBREQ_REPLY;
        req->nbytes = nbytes+1;
        req->done = done;
        req->reply_expected = flags & ADBREQ_REPLY;

-@@ -460,25 +424,18 @@
+@@ -460,25 +424,18 @@ adb_request(struct adb_request *req, voi

        if (flags & ADBREQ_NOSEND)
                return 0;
  
        if (flags & ADBREQ_NOSEND)
                return 0;
  


@@ -63149,7 +63540,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/adb.c powerpc.git
  
        return rc;
  }
  
        return rc;
  }

-@@ -864,7 +821,29 @@
+@@ -864,7 +821,29 @@ static const struct file_operations adb_

        .release        = adb_release,
  };
  
        .release        = adb_release,
  };
  


@@ -63180,7 +63571,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/adb.c powerpc.git
  adbdev_init(void)
  {
        if (register_chrdev(ADB_MAJOR, "adb", &adb_fops)) {
  adbdev_init(void)
  {
        if (register_chrdev(ADB_MAJOR, "adb", &adb_fops)) {

-@@ -876,4 +855,7 @@
+@@ -876,4 +855,7 @@ adbdev_init(void)

        if (IS_ERR(adb_dev_class))
                return;
        class_device_create(adb_dev_class, NULL, MKDEV(ADB_MAJOR, 0), NULL, "adb");
        if (IS_ERR(adb_dev_class))
                return;
        class_device_create(adb_dev_class, NULL, MKDEV(ADB_MAJOR, 0), NULL, "adb");


@@ -63188,9 +63579,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/adb.c powerpc.git
 +      platform_device_register(&adb_pfdev);
 +      platform_driver_probe(&adb_pfdrv, adb_dummy_probe);
  }
 +      platform_device_register(&adb_pfdev);
 +      platform_driver_probe(&adb_pfdrv, adb_dummy_probe);
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/mediabay.c powerpc.git/drivers/macintosh/mediabay.c
---- linux-2.6.24/drivers/macintosh/mediabay.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/macintosh/mediabay.c   2008-01-28 20:26:08.000000000 +0100
+Index: linux-2.6.24.7/drivers/macintosh/mediabay.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/macintosh/mediabay.c
++++ linux-2.6.24.7/drivers/macintosh/mediabay.c

 @@ -20,6 +20,7 @@
  #include <linux/stddef.h>
  #include <linux/init.h>
 @@ -20,6 +20,7 @@
  #include <linux/stddef.h>
  #include <linux/init.h>


@@ -63207,7 +63599,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/mediabay.c powerp
  
  #ifdef MB_DEBUG
  #define MBDBG(fmt, arg...)    printk(KERN_INFO fmt , ## arg)
  
  #ifdef MB_DEBUG
  #define MBDBG(fmt, arg...)    printk(KERN_INFO fmt , ## arg)

-@@ -622,12 +622,7 @@
+@@ -622,12 +622,7 @@ static int media_bay_task(void *x)

  {
        int     i;
  
  {
        int     i;
  


@@ -63221,7 +63613,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/mediabay.c powerp
                for (i = 0; i < media_bay_count; ++i) {
                        down(&media_bays[i].lock);
                        if (!media_bays[i].sleeping)
                for (i = 0; i < media_bay_count; ++i) {
                        down(&media_bays[i].lock);
                        if (!media_bays[i].sleeping)

-@@ -636,9 +631,8 @@
+@@ -636,9 +631,8 @@ static int media_bay_task(void *x)

                }
  
                msleep_interruptible(MB_POLL_DELAY);
                }
  
                msleep_interruptible(MB_POLL_DELAY);


@@ -63232,7 +63624,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/mediabay.c powerp
  }
  
  static int __devinit media_bay_attach(struct macio_dev *mdev, const struct of_device_id *match)
  }
  
  static int __devinit media_bay_attach(struct macio_dev *mdev, const struct of_device_id *match)

-@@ -699,7 +693,7 @@
+@@ -699,7 +693,7 @@ static int __devinit media_bay_attach(st

  
        /* Startup kernel thread */
        if (i == 0)
  
        /* Startup kernel thread */
        if (i == 0)


@@ -63241,10 +63633,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/mediabay.c powerp
  
        return 0;
  
  
        return 0;
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_adt746x.c powerpc.git/drivers/macintosh/therm_adt746x.c
---- linux-2.6.24/drivers/macintosh/therm_adt746x.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/macintosh/therm_adt746x.c      2008-01-28 20:26:08.000000000 +0100
-@@ -553,6 +553,7 @@
+Index: linux-2.6.24.7/drivers/macintosh/therm_adt746x.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/macintosh/therm_adt746x.c
++++ linux-2.6.24.7/drivers/macintosh/therm_adt746x.c
+@@ -553,6 +553,7 @@ thermostat_init(void)

        struct device_node* np;
        const u32 *prop;
        int i = 0, offset = 0;
        struct device_node* np;
        const u32 *prop;
        int i = 0, offset = 0;


@@ -63252,7 +63645,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_adt746x.c p
        
        np = of_find_node_by_name(NULL, "fan");
        if (!np)
        
        np = of_find_node_by_name(NULL, "fan");
        if (!np)

-@@ -612,17 +613,20 @@
+@@ -612,17 +613,20 @@ thermostat_init(void)

                return -ENODEV;
        }
        
                return -ENODEV;
        }
        


@@ -63283,9 +63676,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_adt746x.c p
  
  #ifndef CONFIG_I2C_POWERMAC
        request_module("i2c-powermac");
  
  #ifndef CONFIG_I2C_POWERMAC
        request_module("i2c-powermac");

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_pm72.c powerpc.git/drivers/macintosh/therm_pm72.c
---- linux-2.6.24/drivers/macintosh/therm_pm72.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/macintosh/therm_pm72.c 2008-01-28 20:26:08.000000000 +0100
+Index: linux-2.6.24.7/drivers/macintosh/therm_pm72.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/macintosh/therm_pm72.c
++++ linux-2.6.24.7/drivers/macintosh/therm_pm72.c

 @@ -121,6 +121,7 @@
  #include <linux/reboot.h>
  #include <linux/kmod.h>
 @@ -121,6 +121,7 @@
  #include <linux/reboot.h>
  #include <linux/kmod.h>


@@ -63294,7 +63688,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_pm72.c powe
  #include <asm/prom.h>
  #include <asm/machdep.h>
  #include <asm/io.h>
  #include <asm/prom.h>
  #include <asm/machdep.h>
  #include <asm/io.h>

-@@ -161,7 +162,7 @@
+@@ -161,7 +162,7 @@ static struct slots_pid_state              slots_sta

  static int                            state;
  static int                            cpu_count;
  static int                            cpu_pid_type;
  static int                            state;
  static int                            cpu_count;
  static int                            cpu_pid_type;


@@ -63303,7 +63697,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_pm72.c powe
  static struct completion              ctrl_complete;
  static int                            critical_state;
  static int                            rackmac;
  static struct completion              ctrl_complete;
  static int                            critical_state;
  static int                            rackmac;

-@@ -1156,6 +1157,8 @@
+@@ -1156,6 +1157,8 @@ static void do_monitor_cpu_rack(struct c

   */
  static int init_cpu_state(struct cpu_pid_state *state, int index)
  {
   */
  static int init_cpu_state(struct cpu_pid_state *state, int index)
  {


@@ -63312,7 +63706,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_pm72.c powe
        state->index = index;
        state->first = 1;
        state->rpm = (cpu_pid_type == CPU_PID_TYPE_RACKMAC) ? 4000 : 1000;
        state->index = index;
        state->first = 1;
        state->rpm = (cpu_pid_type == CPU_PID_TYPE_RACKMAC) ? 4000 : 1000;

-@@ -1181,18 +1184,21 @@
+@@ -1181,18 +1184,21 @@ static int init_cpu_state(struct cpu_pid

        DBG("CPU %d Using %d power history entries\n", index, state->count_power);
  
        if (index == 0) {
        DBG("CPU %d Using %d power history entries\n", index, state->count_power);
  
        if (index == 0) {


@@ -63345,7 +63739,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_pm72.c powe
  
        return 0;
   fail:
  
        return 0;
   fail:

-@@ -1328,6 +1334,7 @@
+@@ -1328,6 +1334,7 @@ static int init_backside_state(struct ba

  {
        struct device_node *u3;
        int u3h = 1; /* conservative by default */
  {
        struct device_node *u3;
        int u3h = 1; /* conservative by default */


@@ -63353,7 +63747,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_pm72.c powe
  
        /*
         * There are different PID params for machines with U3 and machines
  
        /*
         * There are different PID params for machines with U3 and machines

-@@ -1379,8 +1386,11 @@
+@@ -1379,8 +1386,11 @@ static int init_backside_state(struct ba

        if (state->monitor == NULL)
                return -ENODEV;
  
        if (state->monitor == NULL)
                return -ENODEV;
  


@@ -63367,7 +63761,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_pm72.c powe
  
        return 0;
  }
  
        return 0;
  }

-@@ -1491,6 +1501,8 @@
+@@ -1491,6 +1501,8 @@ static void do_monitor_drives(struct dri

   */
  static int init_drives_state(struct drives_pid_state *state)
  {
   */
  static int init_drives_state(struct drives_pid_state *state)
  {


@@ -63376,7 +63770,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_pm72.c powe
        state->ticks = 1;
        state->first = 1;
        state->rpm = 1000;
        state->ticks = 1;
        state->first = 1;
        state->rpm = 1000;

-@@ -1499,8 +1511,11 @@
+@@ -1499,8 +1511,11 @@ static int init_drives_state(struct driv

        if (state->monitor == NULL)
                return -ENODEV;
  
        if (state->monitor == NULL)
                return -ENODEV;
  


@@ -63390,7 +63784,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_pm72.c powe
  
        return 0;
  }
  
        return 0;
  }

-@@ -1621,7 +1636,9 @@
+@@ -1621,7 +1636,9 @@ static int init_dimms_state(struct dimm_

        if (state->monitor == NULL)
                return -ENODEV;
  
        if (state->monitor == NULL)
                return -ENODEV;
  


@@ -63401,7 +63795,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_pm72.c powe
  
        return 0;
  }
  
        return 0;
  }

-@@ -1731,6 +1748,8 @@
+@@ -1731,6 +1748,8 @@ static void do_monitor_slots(struct slot

   */
  static int init_slots_state(struct slots_pid_state *state)
  {
   */
  static int init_slots_state(struct slots_pid_state *state)
  {


@@ -63410,7 +63804,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_pm72.c powe
        state->ticks = 1;
        state->first = 1;
        state->pwm = 50;
        state->ticks = 1;
        state->first = 1;
        state->pwm = 50;

-@@ -1739,8 +1758,11 @@
+@@ -1739,8 +1758,11 @@ static int init_slots_state(struct slots

        if (state->monitor == NULL)
                return -ENODEV;
  
        if (state->monitor == NULL)
                return -ENODEV;
  


@@ -63424,7 +63818,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_pm72.c powe
  
        return 0;
  }
  
        return 0;
  }

-@@ -1779,8 +1801,6 @@
+@@ -1779,8 +1801,6 @@ static int call_critical_overtemp(void)

   */
  static int main_control_loop(void *x)
  {
   */
  static int main_control_loop(void *x)
  {


@@ -63433,7 +63827,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_pm72.c powe
        DBG("main_control_loop started\n");
  
        down(&driver_lock);
        DBG("main_control_loop started\n");
  
        down(&driver_lock);

-@@ -1956,7 +1976,7 @@
+@@ -1956,7 +1976,7 @@ static void start_control_loops(void)

  {
        init_completion(&ctrl_complete);
  
  {
        init_completion(&ctrl_complete);
  


@@ -63442,7 +63836,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_pm72.c powe
  }
  
  /*
  }
  
  /*

-@@ -1964,7 +1984,7 @@
+@@ -1964,7 +1984,7 @@ static void start_control_loops(void)

   */
  static void stop_control_loops(void)
  {
   */
  static void stop_control_loops(void)
  {


@@ -63451,9 +63845,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_pm72.c powe
                wait_for_completion(&ctrl_complete);
  }
  
                wait_for_completion(&ctrl_complete);
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_windtunnel.c powerpc.git/drivers/macintosh/therm_windtunnel.c
---- linux-2.6.24/drivers/macintosh/therm_windtunnel.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/macintosh/therm_windtunnel.c   2008-01-28 20:26:08.000000000 +0100
+Index: linux-2.6.24.7/drivers/macintosh/therm_windtunnel.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/macintosh/therm_windtunnel.c
++++ linux-2.6.24.7/drivers/macintosh/therm_windtunnel.c

 @@ -36,6 +36,7 @@
  #include <linux/i2c.h>
  #include <linux/slab.h>
 @@ -36,6 +36,7 @@
  #include <linux/i2c.h>
  #include <linux/slab.h>


@@ -63462,7 +63857,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_windtunnel.
  
  #include <asm/prom.h>
  #include <asm/machdep.h>
  
  #include <asm/prom.h>
  #include <asm/machdep.h>

-@@ -61,8 +62,7 @@
+@@ -61,8 +62,7 @@ I2C_CLIENT_INSMOD;

  
  static struct {
        volatile int            running;
  
  static struct {
        volatile int            running;


@@ -63472,7 +63867,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_windtunnel.
        
        struct semaphore        lock;
        struct of_device        *of_dev;
        
        struct semaphore        lock;
        struct of_device        *of_dev;

-@@ -223,6 +223,7 @@
+@@ -223,6 +223,7 @@ static void

  setup_hardware( void )
  {
        int val;
  setup_hardware( void )
  {
        int val;


@@ -63480,7 +63875,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_windtunnel.
  
        /* save registers (if we unload the module) */
        x.r0 = read_reg( x.fan, 0x00, 1 );
  
        /* save registers (if we unload the module) */
        x.r0 = read_reg( x.fan, 0x00, 1 );

-@@ -265,8 +266,11 @@
+@@ -265,8 +266,11 @@ setup_hardware( void )

        x.upind = -1;
        /* tune_fan( fan_up_table[x.upind].fan_setting ); */
  
        x.upind = -1;
        /* tune_fan( fan_up_table[x.upind].fan_setting ); */
  


@@ -63494,7 +63889,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_windtunnel.
  }
  
  static void
  }
  
  static void

-@@ -282,27 +286,27 @@
+@@ -282,27 +286,27 @@ restore_regs( void )

        write_reg( x.fan, 0x00, x.r0, 1 );
  }
  
        write_reg( x.fan, 0x00, x.r0, 1 );
  }
  


@@ -63534,7 +63929,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_windtunnel.
  }
  
  
  }
  
  

-@@ -322,8 +326,7 @@
+@@ -322,8 +326,7 @@ do_attach( struct i2c_adapter *adapter )

                ret = i2c_probe( adapter, &addr_data, &do_probe );
                if( x.thermostat && x.fan ) {
                        x.running = 1;
                ret = i2c_probe( adapter, &addr_data, &do_probe );
                if( x.thermostat && x.fan ) {
                        x.running = 1;


@@ -63544,7 +63939,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_windtunnel.
                }
        }
        return ret;
                }
        }
        return ret;

-@@ -339,7 +342,8 @@
+@@ -339,7 +342,8 @@ do_detach( struct i2c_client *client )

        else {
                if( x.running ) {
                        x.running = 0;
        else {
                if( x.running ) {
                        x.running = 0;


@@ -63554,10 +63949,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_windtunnel.
                }
                if( client == x.thermostat )
                        x.thermostat = NULL;
                }
                if( client == x.thermostat )
                        x.thermostat = NULL;

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu-backlight.c powerpc.git/drivers/macintosh/via-pmu-backlight.c
---- linux-2.6.24/drivers/macintosh/via-pmu-backlight.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/macintosh/via-pmu-backlight.c  2008-01-28 20:26:08.000000000 +0100
-@@ -22,7 +22,7 @@
+Index: linux-2.6.24.7/drivers/macintosh/via-pmu-backlight.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/macintosh/via-pmu-backlight.c
++++ linux-2.6.24.7/drivers/macintosh/via-pmu-backlight.c
+@@ -22,7 +22,7 @@ static u8 bl_curve[FB_BACKLIGHT_LEVELS];

  
  static void pmu_backlight_init_curve(u8 off, u8 min, u8 max)
  {
  
  static void pmu_backlight_init_curve(u8 off, u8 min, u8 max)
  {


@@ -63566,7 +63962,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu-backlight
  
        bl_curve[0] = off;
  
  
        bl_curve[0] = off;
  

-@@ -68,17 +68,11 @@
+@@ -68,17 +68,11 @@ static int pmu_backlight_get_level_brigh

        return pmulevel;
  }
  
        return pmulevel;
  }
  


@@ -63585,7 +63981,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu-backlight
  
        if (bd->props.power != FB_BLANK_UNBLANK ||
            bd->props.fb_blank != FB_BLANK_UNBLANK)
  
        if (bd->props.power != FB_BLANK_UNBLANK ||
            bd->props.fb_blank != FB_BLANK_UNBLANK)

-@@ -99,12 +93,23 @@
+@@ -99,12 +93,23 @@ static int pmu_backlight_update_status(s

                pmu_wait_complete(&req);
        }
  
                pmu_wait_complete(&req);
        }
  


@@ -63612,7 +64008,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu-backlight
  static int pmu_backlight_get_brightness(struct backlight_device *bd)
  {
        return bd->props.brightness;
  static int pmu_backlight_get_brightness(struct backlight_device *bd)
  {
        return bd->props.brightness;

-@@ -123,6 +128,16 @@
+@@ -123,6 +128,16 @@ void pmu_backlight_set_sleep(int sleep)

  
        spin_lock_irqsave(&pmu_backlight_lock, flags);
        sleeping = sleep;
  
        spin_lock_irqsave(&pmu_backlight_lock, flags);
        sleeping = sleep;


@@ -63629,7 +64025,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu-backlight
        spin_unlock_irqrestore(&pmu_backlight_lock, flags);
  }
  #endif /* CONFIG_PM */
        spin_unlock_irqrestore(&pmu_backlight_lock, flags);
  }
  #endif /* CONFIG_PM */

-@@ -148,8 +163,8 @@
+@@ -148,8 +163,8 @@ void __init pmu_backlight_init()

  
        bd = backlight_device_register(name, NULL, NULL, &pmu_backlight_data);
        if (IS_ERR(bd)) {
  
        bd = backlight_device_register(name, NULL, NULL, &pmu_backlight_data);
        if (IS_ERR(bd)) {


@@ -63640,7 +64036,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu-backlight
        }
        bd->props.max_brightness = FB_BACKLIGHT_LEVELS - 1;
        pmu_backlight_init_curve(0x7F, 0x46, 0x0E);
        }
        bd->props.max_brightness = FB_BACKLIGHT_LEVELS - 1;
        pmu_backlight_init_curve(0x7F, 0x46, 0x0E);

-@@ -171,10 +186,5 @@
+@@ -171,10 +186,5 @@ void __init pmu_backlight_init()

        bd->props.power = FB_BLANK_UNBLANK;
        backlight_update_status(bd);
  
        bd->props.power = FB_BLANK_UNBLANK;
        backlight_update_status(bd);
  


@@ -63652,9 +64048,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu-backlight
 -      return;
 +      printk(KERN_INFO "PMU Backlight initialized (%s)\n", name);
  }
 -      return;
 +      printk(KERN_INFO "PMU Backlight initialized (%s)\n", name);
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc.git/drivers/macintosh/via-pmu.c
---- linux-2.6.24/drivers/macintosh/via-pmu.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/macintosh/via-pmu.c    2008-01-28 20:26:08.000000000 +0100
+Index: linux-2.6.24.7/drivers/macintosh/via-pmu.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/macintosh/via-pmu.c
++++ linux-2.6.24.7/drivers/macintosh/via-pmu.c

 @@ -10,13 +10,11 @@
   *
   * Copyright (C) 1998 Paul Mackerras and Fabio Riccardi.
 @@ -10,13 +10,11 @@
   *
   * Copyright (C) 1998 Paul Mackerras and Fabio Riccardi.


@@ -63689,7 +64086,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc
  
  /* Misc minor number allocated for /dev/pmu */
  #define PMU_MINOR             154
  
  /* Misc minor number allocated for /dev/pmu */
  #define PMU_MINOR             154

-@@ -152,12 +147,9 @@
+@@ -152,12 +147,9 @@ static spinlock_t pmu_lock;

  static u8 pmu_intr_mask;
  static int pmu_version;
  static int drop_interrupts;
  static u8 pmu_intr_mask;
  static int pmu_version;
  static int drop_interrupts;


@@ -63704,7 +64101,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc
  static unsigned long async_req_locks;
  static unsigned int pmu_irq_stats[11];
  
  static unsigned long async_req_locks;
  static unsigned int pmu_irq_stats[11];
  

-@@ -177,7 +169,6 @@
+@@ -177,7 +169,6 @@ static struct proc_dir_entry *proc_pmu_b

  
  int __fake_sleep;
  int asleep;
  
  int __fake_sleep;
  int asleep;


@@ -63712,7 +64109,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc
  
  #ifdef CONFIG_ADB
  static int adb_dev_map;
  
  #ifdef CONFIG_ADB
  static int adb_dev_map;

-@@ -224,7 +215,7 @@
+@@ -224,7 +215,7 @@ extern void enable_kernel_fp(void);

  
  #ifdef DEBUG_SLEEP
  int pmu_polled_request(struct adb_request *req);
  
  #ifdef DEBUG_SLEEP
  int pmu_polled_request(struct adb_request *req);


@@ -63721,7 +64118,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc
  #endif
  
  /*
  #endif
  
  /*

-@@ -875,7 +866,7 @@
+@@ -875,7 +866,7 @@ proc_read_options(char *page, char **sta

  {
        char *p = page;
  
  {
        char *p = page;
  


@@ -63730,7 +64127,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc
        if (pmu_kind == PMU_KEYLARGO_BASED &&
            pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,-1) >= 0)
                p += sprintf(p, "lid_wakeup=%d\n", option_lid_wakeup);
        if (pmu_kind == PMU_KEYLARGO_BASED &&
            pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,-1) >= 0)
                p += sprintf(p, "lid_wakeup=%d\n", option_lid_wakeup);

-@@ -916,7 +907,7 @@
+@@ -916,7 +907,7 @@ proc_write_options(struct file *file, co

        *(val++) = 0;
        while(*val == ' ')
                val++;
        *(val++) = 0;
        while(*val == ' ')
                val++;


@@ -63739,7 +64136,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc
        if (pmu_kind == PMU_KEYLARGO_BASED &&
            pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,-1) >= 0)
                if (!strcmp(label, "lid_wakeup"))
        if (pmu_kind == PMU_KEYLARGO_BASED &&
            pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,-1) >= 0)
                if (!strcmp(label, "lid_wakeup"))

-@@ -1256,9 +1247,7 @@
+@@ -1256,9 +1247,7 @@ void

  pmu_suspend(void)
  {
        unsigned long flags;
  pmu_suspend(void)
  {
        unsigned long flags;


@@ -63750,7 +64147,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc
        if (!via)
                return;
        
        if (!via)
                return;
        

-@@ -1276,17 +1265,10 @@
+@@ -1276,17 +1265,10 @@ pmu_suspend(void)

                via_pmu_interrupt(0, NULL);
                spin_lock_irqsave(&pmu_lock, flags);
                if (!adb_int_pending && pmu_state == idle && !req_awaiting_reply) {
                via_pmu_interrupt(0, NULL);
                spin_lock_irqsave(&pmu_lock, flags);
                if (!adb_int_pending && pmu_state == idle && !req_awaiting_reply) {


@@ -63768,7 +64165,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc
                        break;
                }
        } while (1);
                        break;
                }
        } while (1);

-@@ -1307,18 +1289,11 @@
+@@ -1307,18 +1289,11 @@ pmu_resume(void)

                return;
        }
        adb_int_pending = 1;
                return;
        }
        adb_int_pending = 1;


@@ -63787,7 +64184,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc
  }
  
  /* Interrupt data could be the result data from an ADB cmd */
  }
  
  /* Interrupt data could be the result data from an ADB cmd */

-@@ -1738,228 +1713,7 @@
+@@ -1738,228 +1713,7 @@ pmu_present(void)

        return via != 0;
  }
  
        return via != 0;
  }
  


@@ -64017,7 +64414,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc
  /*
   * Put the powerbook to sleep.
   */
  /*
   * Put the powerbook to sleep.
   */

-@@ -1994,134 +1748,6 @@
+@@ -1994,134 +1748,6 @@ restore_via_state(void)

        out_8(&via[IER], IER_SET | SR_INT | CB1_INT);
  }
  
        out_8(&via[IER], IER_SET | SR_INT | CB1_INT);
  }
  


@@ -64152,7 +64549,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc
  #define       GRACKLE_PM      (1<<7)
  #define GRACKLE_DOZE  (1<<5)
  #define       GRACKLE_NAP     (1<<4)
  #define       GRACKLE_PM      (1<<7)
  #define GRACKLE_DOZE  (1<<5)
  #define       GRACKLE_NAP     (1<<4)

-@@ -2132,19 +1758,12 @@
+@@ -2132,19 +1758,12 @@ static int powerbook_sleep_grackle(void)

        unsigned long save_l2cr;
        unsigned short pmcr1;
        struct adb_request req;
        unsigned long save_l2cr;
        unsigned short pmcr1;
        struct adb_request req;


@@ -64172,7 +64569,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc
        /* Turn off various things. Darwin does some retry tests here... */
        pmu_request(&req, NULL, 2, PMU_POWER_CTRL0, PMU_POW0_OFF|PMU_POW0_HARD_DRIVE);
        pmu_wait_complete(&req);
        /* Turn off various things. Darwin does some retry tests here... */
        pmu_request(&req, NULL, 2, PMU_POWER_CTRL0, PMU_POW0_OFF|PMU_POW0_HARD_DRIVE);
        pmu_wait_complete(&req);

-@@ -2207,8 +1826,6 @@
+@@ -2207,8 +1826,6 @@ static int powerbook_sleep_grackle(void)

                        PMU_POW_ON|PMU_POW_BACKLIGHT|PMU_POW_CHARGER|PMU_POW_IRLED|PMU_POW_MEDIABAY);
        pmu_wait_complete(&req);
  
                        PMU_POW_ON|PMU_POW_BACKLIGHT|PMU_POW_CHARGER|PMU_POW_IRLED|PMU_POW_MEDIABAY);
        pmu_wait_complete(&req);
  


@@ -64181,7 +64578,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc
        return 0;
  }
  
        return 0;
  }
  

-@@ -2218,7 +1835,6 @@
+@@ -2218,7 +1835,6 @@ powerbook_sleep_Core99(void)

        unsigned long save_l2cr;
        unsigned long save_l3cr;
        struct adb_request req;
        unsigned long save_l2cr;
        unsigned long save_l3cr;
        struct adb_request req;


@@ -64189,7 +64586,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc
        
        if (pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,-1) < 0) {
                printk(KERN_ERR "Sleep mode not supported on this machine\n");
        
        if (pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,-1) < 0) {
                printk(KERN_ERR "Sleep mode not supported on this machine\n");

-@@ -2228,12 +1844,6 @@
+@@ -2228,12 +1844,6 @@ powerbook_sleep_Core99(void)

        if (num_online_cpus() > 1 || cpu_is_offline(0))
                return -EAGAIN;
  
        if (num_online_cpus() > 1 || cpu_is_offline(0))
                return -EAGAIN;
  


@@ -64202,7 +64599,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc
        /* Stop environment and ADB interrupts */
        pmu_request(&req, NULL, 2, PMU_SET_INTR_MASK, 0);
        pmu_wait_complete(&req);
        /* Stop environment and ADB interrupts */
        pmu_request(&req, NULL, 2, PMU_SET_INTR_MASK, 0);
        pmu_wait_complete(&req);

-@@ -2304,45 +1914,33 @@
+@@ -2304,45 +1914,33 @@ powerbook_sleep_Core99(void)

        /* Restore LPJ, cpufreq will adjust the cpu frequency */
        loops_per_jiffy /= 2;
  
        /* Restore LPJ, cpufreq will adjust the cpu frequency */
        loops_per_jiffy /= 2;
  


@@ -64263,7 +64660,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc
  
        /* Set the memory controller to keep the memory refreshed
           while we're asleep */
  
        /* Set the memory controller to keep the memory refreshed
           while we're asleep */

-@@ -2357,41 +1955,34 @@
+@@ -2357,41 +1955,34 @@ powerbook_sleep_3400(void)

  
        /* Ask the PMU to put us to sleep */
        pmu_request(&sleep_req, NULL, 5, PMU_SLEEP, 'M', 'A', 'T', 'T');
  
        /* Ask the PMU to put us to sleep */
        pmu_request(&sleep_req, NULL, 5, PMU_SLEEP, 'M', 'A', 'T', 'T');


@@ -64318,7 +64715,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc
  
  /*
   * Support for /dev/pmu device
  
  /*
   * Support for /dev/pmu device

-@@ -2548,7 +2139,6 @@
+@@ -2548,7 +2139,6 @@ pmu_release(struct inode *inode, struct 

        struct pmu_private *pp = file->private_data;
        unsigned long flags;
  
        struct pmu_private *pp = file->private_data;
        unsigned long flags;
  


@@ -64326,7 +64723,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc
        if (pp != 0) {
                file->private_data = NULL;
                spin_lock_irqsave(&all_pvt_lock, flags);
        if (pp != 0) {
                file->private_data = NULL;
                spin_lock_irqsave(&all_pvt_lock, flags);

-@@ -2562,10 +2152,96 @@
+@@ -2562,10 +2152,96 @@ pmu_release(struct inode *inode, struct 

  
                kfree(pp);
        }
  
                kfree(pp);
        }


@@ -64424,7 +64821,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc
  static int
  pmu_ioctl(struct inode * inode, struct file *filp,
                     u_int cmd, u_long arg)
  static int
  pmu_ioctl(struct inode * inode, struct file *filp,
                     u_int cmd, u_long arg)

-@@ -2574,35 +2250,15 @@
+@@ -2574,35 +2250,15 @@ pmu_ioctl(struct inode * inode, struct f

        int error = -EINVAL;
  
        switch (cmd) {
        int error = -EINVAL;
  
        switch (cmd) {


@@ -64462,7 +64859,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc
  
  #ifdef CONFIG_PMAC_BACKLIGHT_LEGACY
        /* Compatibility ioctl's for backlight */
  
  #ifdef CONFIG_PMAC_BACKLIGHT_LEGACY
        /* Compatibility ioctl's for backlight */

-@@ -2610,9 +2266,6 @@
+@@ -2610,9 +2266,6 @@ pmu_ioctl(struct inode * inode, struct f

        {
                int brightness;
  
        {
                int brightness;
  


@@ -64472,7 +64869,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc
                brightness = pmac_backlight_get_legacy_brightness();
                if (brightness < 0)
                        return brightness;
                brightness = pmac_backlight_get_legacy_brightness();
                if (brightness < 0)
                        return brightness;

-@@ -2624,9 +2277,6 @@
+@@ -2624,9 +2277,6 @@ pmu_ioctl(struct inode * inode, struct f

        {
                int brightness;
  
        {
                int brightness;
  


@@ -64482,7 +64879,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc
                error = get_user(brightness, argp);
                if (error)
                        return error;
                error = get_user(brightness, argp);
                if (error)
                        return error;

-@@ -2751,15 +2401,43 @@
+@@ -2751,15 +2401,43 @@ pmu_polled_request(struct adb_request *r

        local_irq_restore(flags);
        return 0;
  }
        local_irq_restore(flags);
        return 0;
  }


@@ -64531,7 +64928,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc
  int pmu_sys_suspended;
  
  static int pmu_sys_suspend(struct sys_device *sysdev, pm_message_t state)
  int pmu_sys_suspended;
  
  static int pmu_sys_suspend(struct sys_device *sysdev, pm_message_t state)

-@@ -2767,10 +2445,15 @@
+@@ -2767,10 +2445,15 @@ static int pmu_sys_suspend(struct sys_de

        if (state.event != PM_EVENT_SUSPEND || pmu_sys_suspended)
                return 0;
  
        if (state.event != PM_EVENT_SUSPEND || pmu_sys_suspended)
                return 0;
  


@@ -64549,7 +64946,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc
        return 0;
  }
  
        return 0;
  }
  

-@@ -2785,15 +2468,18 @@
+@@ -2785,15 +2468,18 @@ static int pmu_sys_resume(struct sys_dev

        pmu_request(&req, NULL, 2, PMU_SYSTEM_READY, 2);
        pmu_wait_complete(&req);
  
        pmu_request(&req, NULL, 2, PMU_SYSTEM_READY, 2);
        pmu_wait_complete(&req);
  


@@ -64570,7 +64967,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc
  
  static struct sysdev_class pmu_sysclass = {
        set_kset_name("pmu"),
  
  static struct sysdev_class pmu_sysclass = {
        set_kset_name("pmu"),

-@@ -2804,10 +2490,10 @@
+@@ -2804,10 +2490,10 @@ static struct sys_device device_pmu = {

  };
  
  static struct sysdev_driver driver_pmu = {
  };
  
  static struct sysdev_driver driver_pmu = {


@@ -64583,7 +64980,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc
  };
  
  static int __init init_pmu_sysfs(void)
  };
  
  static int __init init_pmu_sysfs(void)

-@@ -2842,10 +2528,10 @@
+@@ -2842,10 +2528,10 @@ EXPORT_SYMBOL(pmu_wait_complete);

  EXPORT_SYMBOL(pmu_suspend);
  EXPORT_SYMBOL(pmu_resume);
  EXPORT_SYMBOL(pmu_unlock);
  EXPORT_SYMBOL(pmu_suspend);
  EXPORT_SYMBOL(pmu_resume);
  EXPORT_SYMBOL(pmu_unlock);


@@ -64596,10 +64993,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc
 -#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
 +#endif /* CONFIG_SUSPEND && CONFIG_PPC32 */
  
 -#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
 +#endif /* CONFIG_SUSPEND && CONFIG_PPC32 */
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/fs_enet/fs_enet-main.c powerpc.git/drivers/net/fs_enet/fs_enet-main.c
---- linux-2.6.24/drivers/net/fs_enet/fs_enet-main.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/net/fs_enet/fs_enet-main.c     2008-01-28 20:26:12.000000000 +0100
-@@ -1178,8 +1178,15 @@
+Index: linux-2.6.24.7/drivers/net/fs_enet/fs_enet-main.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/net/fs_enet/fs_enet-main.c
++++ linux-2.6.24.7/drivers/net/fs_enet/fs_enet-main.c
+@@ -1178,8 +1178,15 @@ static int __devinit find_phy(struct dev

        struct device_node *phynode, *mdionode;
        struct resource res;
        int ret = 0, len;
        struct device_node *phynode, *mdionode;
        struct resource res;
        int ret = 0, len;


@@ -64616,9 +65014,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/fs_enet/fs_enet-main.c
        if (!data || len != 4)
                return -EINVAL;
  
        if (!data || len != 4)
                return -EINVAL;
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/fs_enet/mac-fcc.c powerpc.git/drivers/net/fs_enet/mac-fcc.c
---- linux-2.6.24/drivers/net/fs_enet/mac-fcc.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/net/fs_enet/mac-fcc.c  2008-01-28 20:26:12.000000000 +0100
+Index: linux-2.6.24.7/drivers/net/fs_enet/mac-fcc.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/net/fs_enet/mac-fcc.c
++++ linux-2.6.24.7/drivers/net/fs_enet/mac-fcc.c

 @@ -81,16 +81,8 @@
  static inline int fcc_cr_cmd(struct fs_enet_private *fep, u32 op)
  {
 @@ -81,16 +81,8 @@
  static inline int fcc_cr_cmd(struct fs_enet_private *fep, u32 op)
  {


@@ -64637,9 +65036,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/fs_enet/mac-fcc.c power
  }
  
  static int do_pd_setup(struct fs_enet_private *fep)
  }
  
  static int do_pd_setup(struct fs_enet_private *fep)

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/fs_enet/mac-scc.c powerpc.git/drivers/net/fs_enet/mac-scc.c
---- linux-2.6.24/drivers/net/fs_enet/mac-scc.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/net/fs_enet/mac-scc.c  2008-01-28 20:26:12.000000000 +0100
+Index: linux-2.6.24.7/drivers/net/fs_enet/mac-scc.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/net/fs_enet/mac-scc.c
++++ linux-2.6.24.7/drivers/net/fs_enet/mac-scc.c

 @@ -89,21 +89,12 @@
   * Delay to wait for SCC reset command to complete (in us)
   */
 @@ -89,21 +89,12 @@
   * Delay to wait for SCC reset command to complete (in us)
   */


@@ -64663,9 +65063,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/fs_enet/mac-scc.c power
  }
  
  static int do_pd_setup(struct fs_enet_private *fep)
  }
  
  static int do_pd_setup(struct fs_enet_private *fep)

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/ibm_newemac/core.c powerpc.git/drivers/net/ibm_newemac/core.c
---- linux-2.6.24/drivers/net/ibm_newemac/core.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/net/ibm_newemac/core.c 2008-01-28 20:26:12.000000000 +0100
+Index: linux-2.6.24.7/drivers/net/ibm_newemac/core.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/net/ibm_newemac/core.c
++++ linux-2.6.24.7/drivers/net/ibm_newemac/core.c

 @@ -37,6 +37,7 @@
  #include <linux/mii.h>
  #include <linux/bitops.h>
 @@ -37,6 +37,7 @@
  #include <linux/mii.h>
  #include <linux/bitops.h>


@@ -64674,10 +65075,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/ibm_newemac/core.c powe
  
  #include <asm/processor.h>
  #include <asm/io.h>
  
  #include <asm/processor.h>
  #include <asm/io.h>

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/phy/Kconfig powerpc.git/drivers/net/phy/Kconfig
---- linux-2.6.24/drivers/net/phy/Kconfig       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/net/phy/Kconfig        2008-01-28 20:26:14.000000000 +0100
-@@ -61,34 +61,12 @@
+Index: linux-2.6.24.7/drivers/net/phy/Kconfig
+===================================================================
+--- linux-2.6.24.7.orig/drivers/net/phy/Kconfig
++++ linux-2.6.24.7/drivers/net/phy/Kconfig
+@@ -61,34 +61,12 @@ config ICPLUS_PHY

          Currently supports the IP175C PHY.
  
  config FIXED_PHY
          Currently supports the IP175C PHY.
  
  config FIXED_PHY


@@ -64716,9 +65118,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/phy/Kconfig powerpc.git
  
  config MDIO_BITBANG
        tristate "Support for bitbanged MDIO buses"
  
  config MDIO_BITBANG
        tristate "Support for bitbanged MDIO buses"

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/phy/fixed.c powerpc.git/drivers/net/phy/fixed.c
---- linux-2.6.24/drivers/net/phy/fixed.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/net/phy/fixed.c        2008-01-28 20:26:14.000000000 +0100
+Index: linux-2.6.24.7/drivers/net/phy/fixed.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/net/phy/fixed.c
++++ linux-2.6.24.7/drivers/net/phy/fixed.c

 @@ -1,362 +1,253 @@
  /*
 - * drivers/net/phy/fixed.c
 @@ -1,362 +1,253 @@
  /*
 - * drivers/net/phy/fixed.c


@@ -65251,10 +65654,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/phy/fixed.c powerpc.git
 +MODULE_DESCRIPTION("Fixed MDIO bus (MDIO bus emulation with fixed PHYs)");
 +MODULE_AUTHOR("Vitaly Bordug");
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("Fixed MDIO bus (MDIO bus emulation with fixed PHYs)");
 +MODULE_AUTHOR("Vitaly Bordug");
 +MODULE_LICENSE("GPL");

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/ps3_gelic_net.c powerpc.git/drivers/net/ps3_gelic_net.c
---- linux-2.6.24/drivers/net/ps3_gelic_net.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/net/ps3_gelic_net.c    2008-01-28 20:26:14.000000000 +0100
-@@ -58,11 +58,11 @@
+Index: linux-2.6.24.7/drivers/net/ps3_gelic_net.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/net/ps3_gelic_net.c
++++ linux-2.6.24.7/drivers/net/ps3_gelic_net.c
+@@ -58,11 +58,11 @@ static inline struct device *ctodev(stru

  {
        return &card->dev->core;
  }
  {
        return &card->dev->core;
  }


@@ -65268,10 +65672,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/ps3_gelic_net.c powerpc
  {
        return card->dev->dev_id;
  }
  {
        return card->dev->dev_id;
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/ucc_geth.c powerpc.git/drivers/net/ucc_geth.c
---- linux-2.6.24/drivers/net/ucc_geth.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/net/ucc_geth.c 2008-01-28 20:26:14.000000000 +0100
-@@ -3822,6 +3822,7 @@
+Index: linux-2.6.24.7/drivers/net/ucc_geth.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/net/ucc_geth.c
++++ linux-2.6.24.7/drivers/net/ucc_geth.c
+@@ -3822,6 +3822,7 @@ static int ucc_geth_probe(struct of_devi

        int err, ucc_num, max_speed = 0;
        const phandle *ph;
        const unsigned int *prop;
        int err, ucc_num, max_speed = 0;
        const phandle *ph;
        const unsigned int *prop;


@@ -65279,7 +65684,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/ucc_geth.c powerpc.git/
        const void *mac_addr;
        phy_interface_t phy_interface;
        static const int enet_to_speed[] = {
        const void *mac_addr;
        phy_interface_t phy_interface;
        static const int enet_to_speed[] = {

-@@ -3854,10 +3855,56 @@
+@@ -3854,10 +3855,56 @@ static int ucc_geth_probe(struct of_devi

  
        ug_info->uf_info.ucc_num = ucc_num;
  
  
        ug_info->uf_info.ucc_num = ucc_num;
  


@@ -65340,10 +65745,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/ucc_geth.c powerpc.git/
        err = of_address_to_resource(np, 0, &res);
        if (err)
                return -EINVAL;
        err = of_address_to_resource(np, 0, &res);
        if (err)
                return -EINVAL;

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/of/base.c powerpc.git/drivers/of/base.c
---- linux-2.6.24/drivers/of/base.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/of/base.c      2008-01-28 20:26:17.000000000 +0100
-@@ -273,3 +273,61 @@
+Index: linux-2.6.24.7/drivers/of/base.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/of/base.c
++++ linux-2.6.24.7/drivers/of/base.c
+@@ -273,3 +273,61 @@ struct device_node *of_find_compatible_n

        return np;
  }
  EXPORT_SYMBOL(of_find_compatible_node);
        return np;
  }
  EXPORT_SYMBOL(of_find_compatible_node);


@@ -65405,9 +65811,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/of/base.c powerpc.git/drive
 +      return np;
 +}
 +EXPORT_SYMBOL(of_find_matching_node);
 +      return np;
 +}
 +EXPORT_SYMBOL(of_find_matching_node);

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/of/device.c powerpc.git/drivers/of/device.c
---- linux-2.6.24/drivers/of/device.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/of/device.c    2008-01-28 20:26:17.000000000 +0100
+Index: linux-2.6.24.7/drivers/of/device.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/of/device.c
++++ linux-2.6.24.7/drivers/of/device.c

 @@ -10,35 +10,6 @@
  #include <asm/errno.h>
  
 @@ -10,35 +10,6 @@
  #include <asm/errno.h>
  


@@ -65444,17 +65851,19 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/of/device.c powerpc.git/dri
   * of_match_device - Tell if an of_device structure has a matching
   * of_match structure
   * @ids: array of of device match structures to search in
   * of_match_device - Tell if an of_device structure has a matching
   * of_match structure
   * @ids: array of of device match structures to search in

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/Makefile powerpc.git/drivers/ps3/Makefile
---- linux-2.6.24/drivers/ps3/Makefile  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/ps3/Makefile   2008-01-28 20:26:18.000000000 +0100
-@@ -4,3 +4,4 @@
+Index: linux-2.6.24.7/drivers/ps3/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/drivers/ps3/Makefile
++++ linux-2.6.24.7/drivers/ps3/Makefile
+@@ -4,3 +4,4 @@ ps3av_mod-objs         += ps3av.o ps3av_cmd.o

  obj-$(CONFIG_PPC_PS3) += sys-manager-core.o
  obj-$(CONFIG_PS3_SYS_MANAGER) += ps3-sys-manager.o
  obj-$(CONFIG_PS3_STORAGE) += ps3stor_lib.o
 +obj-$(CONFIG_PS3_LPM) += ps3-lpm.o
  obj-$(CONFIG_PPC_PS3) += sys-manager-core.o
  obj-$(CONFIG_PS3_SYS_MANAGER) += ps3-sys-manager.o
  obj-$(CONFIG_PS3_STORAGE) += ps3stor_lib.o
 +obj-$(CONFIG_PS3_LPM) += ps3-lpm.o

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/ps3-lpm.c powerpc.git/drivers/ps3/ps3-lpm.c
---- linux-2.6.24/drivers/ps3/ps3-lpm.c 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/drivers/ps3/ps3-lpm.c  2008-01-28 20:26:18.000000000 +0100
+Index: linux-2.6.24.7/drivers/ps3/ps3-lpm.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/drivers/ps3/ps3-lpm.c

 @@ -0,0 +1,1248 @@
 +/*
 + * PS3 Logical Performance Monitor.
 @@ -0,0 +1,1248 @@
 +/*
 + * PS3 Logical Performance Monitor.


@@ -66704,10 +67113,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/ps3-lpm.c powerpc.git/d
 +MODULE_DESCRIPTION("PS3 Logical Performance Monitor Driver");
 +MODULE_AUTHOR("Sony Corporation");
 +MODULE_ALIAS(PS3_MODULE_ALIAS_LPM);
 +MODULE_DESCRIPTION("PS3 Logical Performance Monitor Driver");
 +MODULE_AUTHOR("Sony Corporation");
 +MODULE_ALIAS(PS3_MODULE_ALIAS_LPM);

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/ps3-sys-manager.c powerpc.git/drivers/ps3/ps3-sys-manager.c
---- linux-2.6.24/drivers/ps3/ps3-sys-manager.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/ps3/ps3-sys-manager.c  2008-01-28 20:26:18.000000000 +0100
-@@ -452,7 +452,7 @@
+Index: linux-2.6.24.7/drivers/ps3/ps3-sys-manager.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/ps3/ps3-sys-manager.c
++++ linux-2.6.24.7/drivers/ps3/ps3-sys-manager.c
+@@ -452,7 +452,7 @@ static int ps3_sys_manager_handle_event(

        case PS3_SM_EVENT_THERMAL_ALERT:
                dev_dbg(&dev->core, "%s:%d: THERMAL_ALERT (zone %u)\n",
                        __func__, __LINE__, event.value);
        case PS3_SM_EVENT_THERMAL_ALERT:
                dev_dbg(&dev->core, "%s:%d: THERMAL_ALERT (zone %u)\n",
                        __func__, __LINE__, event.value);


@@ -66716,7 +67126,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/ps3-sys-manager.c power
                break;
        case PS3_SM_EVENT_THERMAL_CLEARED:
                dev_dbg(&dev->core, "%s:%d: THERMAL_CLEARED (zone %u)\n",
                break;
        case PS3_SM_EVENT_THERMAL_CLEARED:
                dev_dbg(&dev->core, "%s:%d: THERMAL_CLEARED (zone %u)\n",

-@@ -488,7 +488,7 @@
+@@ -488,7 +488,7 @@ static int ps3_sys_manager_handle_cmd(st

        result = ps3_vuart_read(dev, &cmd, sizeof(cmd));
        BUG_ON(result && "need to retry here");
  
        result = ps3_vuart_read(dev, &cmd, sizeof(cmd));
        BUG_ON(result && "need to retry here");
  


@@ -66725,7 +67135,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/ps3-sys-manager.c power
                return result;
  
        if (cmd.version != 1) {
                return result;
  
        if (cmd.version != 1) {

-@@ -521,7 +521,7 @@
+@@ -521,7 +521,7 @@ static int ps3_sys_manager_handle_msg(st

        result = ps3_vuart_read(dev, &header,
                sizeof(struct ps3_sys_manager_header));
  
        result = ps3_vuart_read(dev, &header,
                sizeof(struct ps3_sys_manager_header));
  


@@ -66734,7 +67144,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/ps3-sys-manager.c power
                return result;
  
        if (header.version != 1) {
                return result;
  
        if (header.version != 1) {

-@@ -589,9 +589,9 @@
+@@ -589,9 +589,9 @@ static void ps3_sys_manager_final_power_

                PS3_SM_WAKE_DEFAULT);
        ps3_sys_manager_send_request_shutdown(dev);
  
                PS3_SM_WAKE_DEFAULT);
        ps3_sys_manager_send_request_shutdown(dev);
  


@@ -66746,7 +67156,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/ps3-sys-manager.c power
                ps3_sys_manager_handle_msg(dev);
  }
  
                ps3_sys_manager_handle_msg(dev);
  }
  

-@@ -626,9 +626,9 @@
+@@ -626,9 +626,9 @@ static void ps3_sys_manager_final_restar

                PS3_SM_WAKE_DEFAULT);
        ps3_sys_manager_send_request_shutdown(dev);
  
                PS3_SM_WAKE_DEFAULT);
        ps3_sys_manager_send_request_shutdown(dev);
  


@@ -66758,10 +67168,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/ps3-sys-manager.c power
                ps3_sys_manager_handle_msg(dev);
  }
  
                ps3_sys_manager_handle_msg(dev);
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/ps3-vuart.c powerpc.git/drivers/ps3/ps3-vuart.c
---- linux-2.6.24/drivers/ps3/ps3-vuart.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/ps3/ps3-vuart.c        2008-01-28 20:26:18.000000000 +0100
-@@ -108,18 +108,18 @@
+Index: linux-2.6.24.7/drivers/ps3/ps3-vuart.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/ps3/ps3-vuart.c
++++ linux-2.6.24.7/drivers/ps3/ps3-vuart.c
+@@ -108,18 +108,18 @@ static struct ps3_vuart_port_priv *to_po

  struct ports_bmp {
        u64 status;
        u64 unused[3];
  struct ports_bmp {
        u64 status;
        u64 unused[3];


@@ -66783,7 +67194,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/ps3-vuart.c powerpc.git
  {
  #if defined(DEBUG)
        static const char *strings[] = {
  {
  #if defined(DEBUG)
        static const char *strings[] = {

-@@ -363,7 +363,7 @@
+@@ -363,7 +363,7 @@ int ps3_vuart_disable_interrupt_disconne

   */
  
  static int ps3_vuart_raw_write(struct ps3_system_bus_device *dev,
   */
  
  static int ps3_vuart_raw_write(struct ps3_system_bus_device *dev,


@@ -66792,7 +67203,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/ps3-vuart.c powerpc.git
  {
        int result;
        struct ps3_vuart_port_priv *priv = to_port_priv(dev);
  {
        int result;
        struct ps3_vuart_port_priv *priv = to_port_priv(dev);

-@@ -431,7 +431,7 @@
+@@ -431,7 +431,7 @@ void ps3_vuart_clear_rx_bytes(struct ps3

        int result;
        struct ps3_vuart_port_priv *priv = to_port_priv(dev);
        u64 bytes_waiting;
        int result;
        struct ps3_vuart_port_priv *priv = to_port_priv(dev);
        u64 bytes_waiting;


@@ -66801,7 +67212,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/ps3-vuart.c powerpc.git
  
        result = ps3_vuart_get_rx_bytes_waiting(dev, &bytes_waiting);
  
  
        result = ps3_vuart_get_rx_bytes_waiting(dev, &bytes_waiting);
  

-@@ -526,9 +526,8 @@
+@@ -526,9 +526,8 @@ int ps3_vuart_write(struct ps3_system_bu

  
        lb = kmalloc(sizeof(struct list_buffer) + bytes, GFP_KERNEL);
  
  
        lb = kmalloc(sizeof(struct list_buffer) + bytes, GFP_KERNEL);
  


@@ -66812,7 +67223,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/ps3-vuart.c powerpc.git
  
        memcpy(lb->data, buf, bytes);
        lb->head = lb->data;
  
        memcpy(lb->data, buf, bytes);
        lb->head = lb->data;

-@@ -878,7 +877,7 @@
+@@ -878,7 +877,7 @@ static int ps3_vuart_handle_port_interru

  struct vuart_bus_priv {
        struct ports_bmp *bmp;
        unsigned int virq;
  struct vuart_bus_priv {
        struct ports_bmp *bmp;
        unsigned int virq;


@@ -66821,7 +67232,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/ps3-vuart.c powerpc.git
        int use_count;
        struct ps3_system_bus_device *devices[PORT_COUNT];
  } static vuart_bus_priv;
        int use_count;
        struct ps3_system_bus_device *devices[PORT_COUNT];
  } static vuart_bus_priv;

-@@ -926,9 +925,8 @@
+@@ -926,9 +925,8 @@ static int ps3_vuart_bus_interrupt_get(v

  
        BUG_ON(vuart_bus_priv.use_count > 2);
  
  
        BUG_ON(vuart_bus_priv.use_count > 2);
  


@@ -66832,7 +67243,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/ps3-vuart.c powerpc.git
  
        BUG_ON(vuart_bus_priv.bmp);
  
  
        BUG_ON(vuart_bus_priv.bmp);
  

-@@ -1017,7 +1015,7 @@
+@@ -1017,7 +1015,7 @@ static int ps3_vuart_probe(struct ps3_sy

                return -EINVAL;
        }
  
                return -EINVAL;
        }
  


@@ -66841,7 +67252,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/ps3-vuart.c powerpc.git
  
        result = ps3_vuart_bus_interrupt_get();
  
  
        result = ps3_vuart_bus_interrupt_get();
  

-@@ -1077,7 +1075,7 @@
+@@ -1077,7 +1075,7 @@ static int ps3_vuart_probe(struct ps3_sy

                goto fail_probe;
        }
  
                goto fail_probe;
        }
  


@@ -66850,7 +67261,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/ps3-vuart.c powerpc.git
  
        return result;
  
  
        return result;
  

-@@ -1090,7 +1088,7 @@
+@@ -1090,7 +1088,7 @@ fail_dev_malloc:

  fail_busy:
        ps3_vuart_bus_interrupt_put();
  fail_setup_interrupt:
  fail_busy:
        ps3_vuart_bus_interrupt_put();
  fail_setup_interrupt:


@@ -66859,7 +67270,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/ps3-vuart.c powerpc.git
        dev_dbg(&dev->core, "%s:%d: failed\n", __func__, __LINE__);
        return result;
  }
        dev_dbg(&dev->core, "%s:%d: failed\n", __func__, __LINE__);
        return result;
  }

-@@ -1129,7 +1127,7 @@
+@@ -1129,7 +1127,7 @@ static int ps3_vuart_remove(struct ps3_s

  
        BUG_ON(!dev);
  
  
        BUG_ON(!dev);
  


@@ -66868,7 +67279,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/ps3-vuart.c powerpc.git
  
        dev_dbg(&dev->core, " -> %s:%d: match_id %d\n", __func__, __LINE__,
                dev->match_id);
  
        dev_dbg(&dev->core, " -> %s:%d: match_id %d\n", __func__, __LINE__,
                dev->match_id);

-@@ -1137,7 +1135,7 @@
+@@ -1137,7 +1135,7 @@ static int ps3_vuart_remove(struct ps3_s

        if (!dev->core.driver) {
                dev_dbg(&dev->core, "%s:%d: no driver bound\n", __func__,
                        __LINE__);
        if (!dev->core.driver) {
                dev_dbg(&dev->core, "%s:%d: no driver bound\n", __func__,
                        __LINE__);


@@ -66877,7 +67288,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/ps3-vuart.c powerpc.git
                return 0;
        }
  
                return 0;
        }
  

-@@ -1160,7 +1158,7 @@
+@@ -1160,7 +1158,7 @@ static int ps3_vuart_remove(struct ps3_s

        priv = NULL;
  
        dev_dbg(&dev->core, " <- %s:%d\n", __func__, __LINE__);
        priv = NULL;
  
        dev_dbg(&dev->core, " <- %s:%d\n", __func__, __LINE__);


@@ -66886,7 +67297,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/ps3-vuart.c powerpc.git
        return 0;
  }
  
        return 0;
  }
  

-@@ -1180,7 +1178,7 @@
+@@ -1180,7 +1178,7 @@ static int ps3_vuart_shutdown(struct ps3

  
        BUG_ON(!dev);
  
  
        BUG_ON(!dev);
  


@@ -66895,7 +67306,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/ps3-vuart.c powerpc.git
  
        dev_dbg(&dev->core, " -> %s:%d: match_id %d\n", __func__, __LINE__,
                dev->match_id);
  
        dev_dbg(&dev->core, " -> %s:%d: match_id %d\n", __func__, __LINE__,
                dev->match_id);

-@@ -1188,7 +1186,7 @@
+@@ -1188,7 +1186,7 @@ static int ps3_vuart_shutdown(struct ps3

        if (!dev->core.driver) {
                dev_dbg(&dev->core, "%s:%d: no driver bound\n", __func__,
                        __LINE__);
        if (!dev->core.driver) {
                dev_dbg(&dev->core, "%s:%d: no driver bound\n", __func__,
                        __LINE__);


@@ -66904,7 +67315,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/ps3-vuart.c powerpc.git
                return 0;
        }
  
                return 0;
        }
  

-@@ -1212,7 +1210,7 @@
+@@ -1212,7 +1210,7 @@ static int ps3_vuart_shutdown(struct ps3

  
        dev_dbg(&dev->core, " <- %s:%d\n", __func__, __LINE__);
  
  
        dev_dbg(&dev->core, " <- %s:%d\n", __func__, __LINE__);
  


@@ -66913,7 +67324,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/ps3-vuart.c powerpc.git
        return 0;
  }
  
        return 0;
  }
  

-@@ -1223,7 +1221,7 @@
+@@ -1223,7 +1221,7 @@ static int __init ps3_vuart_bus_init(voi

        if (!firmware_has_feature(FW_FEATURE_PS3_LV1))
                return -ENODEV;
  
        if (!firmware_has_feature(FW_FEATURE_PS3_LV1))
                return -ENODEV;
  


@@ -66922,10 +67333,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/ps3-vuart.c powerpc.git
  
        return 0;
  }
  
        return 0;
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/Kconfig powerpc.git/drivers/serial/Kconfig
---- linux-2.6.24/drivers/serial/Kconfig        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/serial/Kconfig 2008-01-28 20:26:19.000000000 +0100
-@@ -1284,4 +1284,14 @@
+Index: linux-2.6.24.7/drivers/serial/Kconfig
+===================================================================
+--- linux-2.6.24.7.orig/drivers/serial/Kconfig
++++ linux-2.6.24.7/drivers/serial/Kconfig
+@@ -1284,4 +1284,14 @@ config SERIAL_OF_PLATFORM

          Currently, only 8250 compatible ports are supported, but
          others can easily be added.
  
          Currently, only 8250 compatible ports are supported, but
          others can easily be added.
  


@@ -66940,17 +67352,19 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/Kconfig powerpc.git/
 +        PowerPC that contain a QUICC Engine.
 +
  endmenu
 +        PowerPC that contain a QUICC Engine.
 +
  endmenu

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/Makefile powerpc.git/drivers/serial/Makefile
---- linux-2.6.24/drivers/serial/Makefile       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/serial/Makefile        2008-01-28 20:26:19.000000000 +0100
-@@ -64,3 +64,4 @@
+Index: linux-2.6.24.7/drivers/serial/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/drivers/serial/Makefile
++++ linux-2.6.24.7/drivers/serial/Makefile
+@@ -64,3 +64,4 @@ obj-$(CONFIG_SERIAL_UARTLITE) += uartlit

  obj-$(CONFIG_SERIAL_NETX) += netx-serial.o
  obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o
  obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
 +obj-$(CONFIG_SERIAL_QE) += ucc_uart.o
  obj-$(CONFIG_SERIAL_NETX) += netx-serial.o
  obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o
  obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
 +obj-$(CONFIG_SERIAL_QE) += ucc_uart.o

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/cpm_uart/cpm_uart_cpm1.c powerpc.git/drivers/serial/cpm_uart/cpm_uart_cpm1.c
---- linux-2.6.24/drivers/serial/cpm_uart/cpm_uart_cpm1.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/serial/cpm_uart/cpm_uart_cpm1.c        2008-01-28 20:26:19.000000000 +0100
+Index: linux-2.6.24.7/drivers/serial/cpm_uart/cpm_uart_cpm1.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/serial/cpm_uart/cpm_uart_cpm1.c
++++ linux-2.6.24.7/drivers/serial/cpm_uart/cpm_uart_cpm1.c

 @@ -52,11 +52,7 @@
  #ifdef CONFIG_PPC_CPM_NEW_BINDING
  void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd)
 @@ -52,11 +52,7 @@
  #ifdef CONFIG_PPC_CPM_NEW_BINDING
  void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd)


@@ -66964,9 +67378,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/cpm_uart/cpm_uart_cp
  }
  #else
  void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd)
  }
  #else
  void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd)

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/cpm_uart/cpm_uart_cpm2.c powerpc.git/drivers/serial/cpm_uart/cpm_uart_cpm2.c
---- linux-2.6.24/drivers/serial/cpm_uart/cpm_uart_cpm2.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/serial/cpm_uart/cpm_uart_cpm2.c        2008-01-28 20:26:19.000000000 +0100
+Index: linux-2.6.24.7/drivers/serial/cpm_uart/cpm_uart_cpm2.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/serial/cpm_uart/cpm_uart_cpm2.c
++++ linux-2.6.24.7/drivers/serial/cpm_uart/cpm_uart_cpm2.c

 @@ -52,13 +52,7 @@
  #ifdef CONFIG_PPC_CPM_NEW_BINDING
  void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd)
 @@ -52,13 +52,7 @@
  #ifdef CONFIG_PPC_CPM_NEW_BINDING
  void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd)


@@ -66982,7 +67397,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/cpm_uart/cpm_uart_cp
  }
  #else
  void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd)
  }
  #else
  void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd)

-@@ -171,9 +165,9 @@
+@@ -171,9 +165,9 @@ void scc2_lineif(struct uart_cpm_port *p

         * really has to get out of the driver so boards can
         * be supported in a sane fashion.
         */
         * really has to get out of the driver so boards can
         * be supported in a sane fashion.
         */


@@ -66993,9 +67408,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/cpm_uart/cpm_uart_cp
  
        io->iop_pparb |= 0x008b0000;
        io->iop_pdirb |= 0x00880000;
  
        io->iop_pparb |= 0x008b0000;
        io->iop_pdirb |= 0x00880000;

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c powerpc.git/drivers/serial/mpc52xx_uart.c
---- linux-2.6.24/drivers/serial/mpc52xx_uart.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/serial/mpc52xx_uart.c  2008-01-28 20:26:19.000000000 +0100
+Index: linux-2.6.24.7/drivers/serial/mpc52xx_uart.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/serial/mpc52xx_uart.c
++++ linux-2.6.24.7/drivers/serial/mpc52xx_uart.c

 @@ -36,7 +36,7 @@
   * DCD. However, the pin multiplexing aren't changed and should be set either
   * by the bootloader or in the platform init code.
 @@ -36,7 +36,7 @@
   * DCD. However, the pin multiplexing aren't changed and should be set either
   * by the bootloader or in the platform init code.


@@ -67021,7 +67437,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
  #else
  #include <linux/platform_device.h>
  #endif
  #else
  #include <linux/platform_device.h>
  #endif

-@@ -111,16 +112,18 @@
+@@ -111,16 +112,18 @@ static void mpc52xx_uart_of_enumerate(vo

  #endif
  
  #define PSC(port) ((struct mpc52xx_psc __iomem *)((port)->membase))
  #endif
  
  #define PSC(port) ((struct mpc52xx_psc __iomem *)((port)->membase))


@@ -67042,7 +67458,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
  #else
  #define uart_console(port)    (0)
  #endif
  #else
  #define uart_console(port)    (0)
  #endif

-@@ -162,7 +165,7 @@
+@@ -162,7 +165,7 @@ mpc52xx_uart_stop_tx(struct uart_port *p

  {
        /* port->lock taken by caller */
        port->read_status_mask &= ~MPC52xx_PSC_IMR_TXRDY;
  {
        /* port->lock taken by caller */
        port->read_status_mask &= ~MPC52xx_PSC_IMR_TXRDY;


@@ -67051,7 +67467,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
  }
  
  static void
  }
  
  static void

-@@ -170,7 +173,7 @@
+@@ -170,7 +173,7 @@ mpc52xx_uart_start_tx(struct uart_port *

  {
        /* port->lock taken by caller */
        port->read_status_mask |= MPC52xx_PSC_IMR_TXRDY;
  {
        /* port->lock taken by caller */
        port->read_status_mask |= MPC52xx_PSC_IMR_TXRDY;


@@ -67060,7 +67476,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
  }
  
  static void
  }
  
  static void

-@@ -184,7 +187,7 @@
+@@ -184,7 +187,7 @@ mpc52xx_uart_send_xchar(struct uart_port

                /* Make sure tx interrupts are on */
                /* Truly necessary ??? They should be anyway */
                port->read_status_mask |= MPC52xx_PSC_IMR_TXRDY;
                /* Make sure tx interrupts are on */
                /* Truly necessary ??? They should be anyway */
                port->read_status_mask |= MPC52xx_PSC_IMR_TXRDY;


@@ -67069,7 +67485,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
        }
  
        spin_unlock_irqrestore(&port->lock, flags);
        }
  
        spin_unlock_irqrestore(&port->lock, flags);

-@@ -195,7 +198,7 @@
+@@ -195,7 +198,7 @@ mpc52xx_uart_stop_rx(struct uart_port *p

  {
        /* port->lock taken by caller */
        port->read_status_mask &= ~MPC52xx_PSC_IMR_RXRDY;
  {
        /* port->lock taken by caller */
        port->read_status_mask &= ~MPC52xx_PSC_IMR_RXRDY;


@@ -67078,7 +67494,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
  }
  
  static void
  }
  
  static void

-@@ -210,10 +213,10 @@
+@@ -210,10 +213,10 @@ mpc52xx_uart_break_ctl(struct uart_port 

        unsigned long flags;
        spin_lock_irqsave(&port->lock, flags);
  
        unsigned long flags;
        spin_lock_irqsave(&port->lock, flags);
  


@@ -67092,7 +67508,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
  
        spin_unlock_irqrestore(&port->lock, flags);
  }
  
        spin_unlock_irqrestore(&port->lock, flags);
  }

-@@ -222,6 +225,7 @@
+@@ -222,6 +225,7 @@ static int

  mpc52xx_uart_startup(struct uart_port *port)
  {
        struct mpc52xx_psc __iomem *psc = PSC(port);
  mpc52xx_uart_startup(struct uart_port *port)
  {
        struct mpc52xx_psc __iomem *psc = PSC(port);


@@ -67100,7 +67516,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
        int ret;
  
        /* Request IRQ */
        int ret;
  
        /* Request IRQ */

-@@ -231,23 +235,23 @@
+@@ -231,23 +235,23 @@ mpc52xx_uart_startup(struct uart_port *p

                return ret;
  
        /* Reset/activate the port, clear and enable interrupts */
                return ret;
  
        /* Reset/activate the port, clear and enable interrupts */


@@ -67134,7 +67550,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
  
        return 0;
  }
  
        return 0;
  }

-@@ -258,12 +262,12 @@
+@@ -258,12 +262,12 @@ mpc52xx_uart_shutdown(struct uart_port *

        struct mpc52xx_psc __iomem *psc = PSC(port);
  
        /* Shut down the port.  Leave TX active if on a console port */
        struct mpc52xx_psc __iomem *psc = PSC(port);
  
        /* Shut down the port.  Leave TX active if on a console port */


@@ -67150,7 +67566,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
  
        /* Release interrupt */
        free_irq(port->irq, port);
  
        /* Release interrupt */
        free_irq(port->irq, port);

-@@ -271,7 +275,7 @@
+@@ -271,7 +275,7 @@ mpc52xx_uart_shutdown(struct uart_port *

  
  static void
  mpc52xx_uart_set_termios(struct uart_port *port, struct ktermios *new,
  
  static void
  mpc52xx_uart_set_termios(struct uart_port *port, struct ktermios *new,


@@ -67159,7 +67575,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
  {
        struct mpc52xx_psc __iomem *psc = PSC(port);
        unsigned long flags;
  {
        struct mpc52xx_psc __iomem *psc = PSC(port);
        unsigned long flags;

-@@ -283,14 +287,14 @@
+@@ -283,14 +287,14 @@ mpc52xx_uart_set_termios(struct uart_por

        mr1 = 0;
  
        switch (new->c_cflag & CSIZE) {
        mr1 = 0;
  
        switch (new->c_cflag & CSIZE) {


@@ -67182,7 +67598,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
        }
  
        if (new->c_cflag & PARENB) {
        }
  
        if (new->c_cflag & PARENB) {

-@@ -332,24 +336,24 @@
+@@ -332,24 +336,24 @@ mpc52xx_uart_set_termios(struct uart_por

                udelay(1);
  
        if (!j)
                udelay(1);
  
        if (!j)


@@ -67218,7 +67634,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
  
        /* We're all set, release the lock */
        spin_unlock_irqrestore(&port->lock, flags);
  
        /* We're all set, release the lock */
        spin_unlock_irqrestore(&port->lock, flags);

-@@ -364,7 +368,8 @@
+@@ -364,7 +368,8 @@ mpc52xx_uart_type(struct uart_port *port

  static void
  mpc52xx_uart_release_port(struct uart_port *port)
  {
  static void
  mpc52xx_uart_release_port(struct uart_port *port)
  {


@@ -67228,7 +67644,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
                iounmap(port->membase);
                port->membase = NULL;
        }
                iounmap(port->membase);
                port->membase = NULL;
        }

-@@ -379,7 +384,7 @@
+@@ -379,7 +384,7 @@ mpc52xx_uart_request_port(struct uart_po

  
        if (port->flags & UPF_IOREMAP) /* Need to remap ? */
                port->membase = ioremap(port->mapbase,
  
        if (port->flags & UPF_IOREMAP) /* Need to remap ? */
                port->membase = ioremap(port->mapbase,


@@ -67237,7 +67653,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
  
        if (!port->membase)
                return -EINVAL;
  
        if (!port->membase)
                return -EINVAL;

-@@ -398,22 +403,22 @@
+@@ -398,22 +403,22 @@ mpc52xx_uart_request_port(struct uart_po

  static void
  mpc52xx_uart_config_port(struct uart_port *port, int flags)
  {
  static void
  mpc52xx_uart_config_port(struct uart_port *port, int flags)
  {


@@ -67269,7 +67685,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
                return -EINVAL;
  
        return 0;
                return -EINVAL;
  
        return 0;

-@@ -455,8 +460,8 @@
+@@ -455,8 +460,8 @@ mpc52xx_uart_int_rx_chars(struct uart_po

        unsigned short status;
  
        /* While we can read, do so ! */
        unsigned short status;
  
        /* While we can read, do so ! */


@@ -67280,7 +67696,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
  
                /* Get the char */
                ch = in_8(&PSC(port)->mpc52xx_psc_buffer_8);
  
                /* Get the char */
                ch = in_8(&PSC(port)->mpc52xx_psc_buffer_8);

-@@ -474,9 +479,9 @@
+@@ -474,9 +479,9 @@ mpc52xx_uart_int_rx_chars(struct uart_po

                flag = TTY_NORMAL;
                port->icount.rx++;
  
                flag = TTY_NORMAL;
                port->icount.rx++;
  


@@ -67293,7 +67709,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
  
                        if (status & MPC52xx_PSC_SR_RB) {
                                flag = TTY_BREAK;
  
                        if (status & MPC52xx_PSC_SR_RB) {
                                flag = TTY_BREAK;

-@@ -487,7 +492,7 @@
+@@ -487,7 +492,7 @@ mpc52xx_uart_int_rx_chars(struct uart_po

                                flag = TTY_FRAME;
  
                        /* Clear error condition */
                                flag = TTY_FRAME;
  
                        /* Clear error condition */


@@ -67302,7 +67718,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
  
                }
                tty_insert_flip_char(tty, ch, flag);
  
                }
                tty_insert_flip_char(tty, ch, flag);

-@@ -568,16 +573,16 @@
+@@ -568,16 +573,16 @@ mpc52xx_uart_int(int irq, void *dev_id)

  
                /* Do we need to receive chars ? */
                /* For this RX interrupts must be on and some chars waiting */
  
                /* Do we need to receive chars ? */
                /* For this RX interrupts must be on and some chars waiting */


@@ -67322,7 +67738,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
                        keepgoing = 0;
  
        } while (keepgoing);
                        keepgoing = 0;
  
        } while (keepgoing);

-@@ -596,7 +601,7 @@
+@@ -596,7 +601,7 @@ mpc52xx_uart_int(int irq, void *dev_id)

  
  static void __init
  mpc52xx_console_get_options(struct uart_port *port,
  
  static void __init
  mpc52xx_console_get_options(struct uart_port *port,


@@ -67331,7 +67747,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
  {
        struct mpc52xx_psc __iomem *psc = PSC(port);
        unsigned char mr1;
  {
        struct mpc52xx_psc __iomem *psc = PSC(port);
        unsigned char mr1;

-@@ -604,7 +609,7 @@
+@@ -604,7 +609,7 @@ mpc52xx_console_get_options(struct uart_

        pr_debug("mpc52xx_console_get_options(port=%p)\n", port);
  
        /* Read the mode registers */
        pr_debug("mpc52xx_console_get_options(port=%p)\n", port);
  
        /* Read the mode registers */


@@ -67340,7 +67756,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
        mr1 = in_8(&psc->mode);
  
        /* CT{U,L}R are write-only ! */
        mr1 = in_8(&psc->mode);
  
        /* CT{U,L}R are write-only ! */

-@@ -616,11 +621,18 @@
+@@ -616,11 +621,18 @@ mpc52xx_console_get_options(struct uart_

  
        /* Parse them */
        switch (mr1 & MPC52xx_PSC_MODE_BITS_MASK) {
  
        /* Parse them */
        switch (mr1 & MPC52xx_PSC_MODE_BITS_MASK) {


@@ -67364,7 +67780,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
        }
  
        if (mr1 & MPC52xx_PSC_MODE_PARNONE)
        }
  
        if (mr1 & MPC52xx_PSC_MODE_PARNONE)

-@@ -657,7 +669,7 @@
+@@ -657,7 +669,7 @@ mpc52xx_console_write(struct console *co

                /* Wait the TX buffer to be empty */
                j = 20000;      /* Maximum wait */
                while (!(in_be16(&psc->mpc52xx_psc_status) &
                /* Wait the TX buffer to be empty */
                j = 20000;      /* Maximum wait */
                while (!(in_be16(&psc->mpc52xx_psc_status) &


@@ -67373,7 +67789,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
                        udelay(1);
        }
  
                        udelay(1);
        }
  

-@@ -730,16 +742,18 @@
+@@ -730,16 +742,18 @@ mpc52xx_console_setup(struct console *co

        }
  
        pr_debug("Console on ttyPSC%x is %s\n",
        }
  
        pr_debug("Console on ttyPSC%x is %s\n",


@@ -67395,7 +67811,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
                pr_debug("Could not find IPB bus frequency!\n");
                return -EINVAL;
        }
                pr_debug("Could not find IPB bus frequency!\n");
                return -EINVAL;
        }

-@@ -757,7 +771,8 @@
+@@ -757,7 +771,8 @@ mpc52xx_console_setup(struct console *co

                return -EINVAL;
  
        pr_debug("mpc52xx-psc uart at %p, mapped to %p, irq=%x, freq=%i\n",
                return -EINVAL;
  
        pr_debug("mpc52xx-psc uart at %p, mapped to %p, irq=%x, freq=%i\n",


@@ -67405,7 +67821,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
  
        /* Setup the port parameters accoding to options */
        if (options)
  
        /* Setup the port parameters accoding to options */
        if (options)

-@@ -766,7 +781,7 @@
+@@ -766,7 +781,7 @@ mpc52xx_console_setup(struct console *co

                mpc52xx_console_get_options(port, &baud, &parity, &bits, &flow);
  
        pr_debug("Setting console parameters: %i %i%c1 flow=%c\n",
                mpc52xx_console_get_options(port, &baud, &parity, &bits, &flow);
  
        pr_debug("Setting console parameters: %i %i%c1 flow=%c\n",


@@ -67414,7 +67830,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
  
        return uart_set_options(port, co, baud, parity, bits, flow);
  }
  
        return uart_set_options(port, co, baud, parity, bits, flow);
  }

-@@ -781,7 +796,7 @@
+@@ -781,7 +796,7 @@ static struct console mpc52xx_console = 

        .device = uart_console_device,
        .setup  = mpc52xx_console_setup,
        .flags  = CON_PRINTBUFFER,
        .device = uart_console_device,
        .setup  = mpc52xx_console_setup,
        .flags  = CON_PRINTBUFFER,


@@ -67423,7 +67839,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
        .data   = &mpc52xx_uart_driver,
  };
  
        .data   = &mpc52xx_uart_driver,
  };
  

-@@ -809,7 +824,6 @@
+@@ -809,7 +824,6 @@ console_initcall(mpc52xx_console_init);

  /* ======================================================================== */
  
  static struct uart_driver mpc52xx_uart_driver = {
  /* ======================================================================== */
  
  static struct uart_driver mpc52xx_uart_driver = {


@@ -67431,7 +67847,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
        .driver_name    = "mpc52xx_psc_uart",
        .dev_name       = "ttyPSC",
        .major          = SERIAL_PSC_MAJOR,
        .driver_name    = "mpc52xx_psc_uart",
        .dev_name       = "ttyPSC",
        .major          = SERIAL_PSC_MAJOR,

-@@ -837,7 +851,7 @@
+@@ -837,7 +851,7 @@ mpc52xx_uart_probe(struct platform_devic

        if (idx < 0 || idx >= MPC52xx_PSC_MAXNUM)
                return -EINVAL;
  
        if (idx < 0 || idx >= MPC52xx_PSC_MAXNUM)
                return -EINVAL;
  


@@ -67440,7 +67856,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
                return -ENODEV;
  
        /* Init the port structure */
                return -ENODEV;
  
        /* Init the port structure */

-@@ -848,13 +862,13 @@
+@@ -848,13 +862,13 @@ mpc52xx_uart_probe(struct platform_devic

        port->fifosize  = 512;
        port->iotype    = UPIO_MEM;
        port->flags     = UPF_BOOT_AUTOCONF |
        port->fifosize  = 512;
        port->iotype    = UPIO_MEM;
        port->flags     = UPF_BOOT_AUTOCONF |


@@ -67456,7 +67872,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
                if (res->flags & IORESOURCE_MEM)
                        port->mapbase = res->start;
                else if (res->flags & IORESOURCE_IRQ)
                if (res->flags & IORESOURCE_MEM)
                        port->mapbase = res->start;
                else if (res->flags & IORESOURCE_IRQ)

-@@ -866,7 +880,7 @@
+@@ -866,7 +880,7 @@ mpc52xx_uart_probe(struct platform_devic

        /* Add the port to the uart sub-system */
        ret = uart_add_one_port(&mpc52xx_uart_driver, port);
        if (!ret)
        /* Add the port to the uart sub-system */
        ret = uart_add_one_port(&mpc52xx_uart_driver, port);
        if (!ret)


@@ -67465,7 +67881,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
  
        return ret;
  }
  
        return ret;
  }

-@@ -917,6 +931,7 @@
+@@ -917,6 +931,7 @@ static struct platform_driver mpc52xx_ua

        .resume         = mpc52xx_uart_resume,
  #endif
        .driver         = {
        .resume         = mpc52xx_uart_resume,
  #endif
        .driver         = {


@@ -67473,7 +67889,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
                .name   = "mpc52xx-psc",
        },
  };
                .name   = "mpc52xx-psc",
        },
  };

-@@ -946,10 +961,11 @@
+@@ -946,10 +961,11 @@ mpc52xx_uart_of_probe(struct of_device *

        if (idx >= MPC52xx_PSC_MAXNUM)
                return -EINVAL;
        pr_debug("Found %s assigned to ttyPSC%x\n",
        if (idx >= MPC52xx_PSC_MAXNUM)
                return -EINVAL;
        pr_debug("Found %s assigned to ttyPSC%x\n",


@@ -67487,7 +67903,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
                dev_dbg(&op->dev, "Could not find IPB bus frequency!\n");
                return -EINVAL;
        }
                dev_dbg(&op->dev, "Could not find IPB bus frequency!\n");
                return -EINVAL;
        }

-@@ -962,22 +978,23 @@
+@@ -962,22 +978,23 @@ mpc52xx_uart_of_probe(struct of_device *

        port->fifosize  = 512;
        port->iotype    = UPIO_MEM;
        port->flags     = UPF_BOOT_AUTOCONF |
        port->fifosize  = 512;
        port->iotype    = UPIO_MEM;
        port->flags     = UPF_BOOT_AUTOCONF |


@@ -67515,7 +67931,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
                printk(KERN_ERR "Could not allocate resources for PSC\n");
                return -EINVAL;
        }
                printk(KERN_ERR "Could not allocate resources for PSC\n");
                return -EINVAL;
        }

-@@ -985,7 +1002,7 @@
+@@ -985,7 +1002,7 @@ mpc52xx_uart_of_probe(struct of_device *

        /* Add the port to the uart sub-system */
        ret = uart_add_one_port(&mpc52xx_uart_driver, port);
        if (!ret)
        /* Add the port to the uart sub-system */
        ret = uart_add_one_port(&mpc52xx_uart_driver, port);
        if (!ret)


@@ -67524,7 +67940,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
  
        return ret;
  }
  
        return ret;
  }

-@@ -1048,6 +1065,7 @@
+@@ -1048,6 +1065,7 @@ mpc52xx_uart_of_assign(struct device_nod

        if (idx < 0)
                return; /* No free slot; abort */
  
        if (idx < 0)
                return; /* No free slot; abort */
  


@@ -67532,7 +67948,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
        /* If the slot is already occupied, then swap slots */
        if (mpc52xx_uart_nodes[idx] && (free_idx != -1))
                mpc52xx_uart_nodes[free_idx] = mpc52xx_uart_nodes[idx];
        /* If the slot is already occupied, then swap slots */
        if (mpc52xx_uart_nodes[idx] && (free_idx != -1))
                mpc52xx_uart_nodes[free_idx] = mpc52xx_uart_nodes[idx];

-@@ -1057,7 +1075,7 @@
+@@ -1057,7 +1075,7 @@ mpc52xx_uart_of_assign(struct device_nod

  static void
  mpc52xx_uart_of_enumerate(void)
  {
  static void
  mpc52xx_uart_of_enumerate(void)
  {


@@ -67541,7 +67957,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
        struct device_node *np;
        const unsigned int *devno;
        int i;
        struct device_node *np;
        const unsigned int *devno;
        int i;

-@@ -1071,7 +1089,7 @@
+@@ -1071,7 +1089,7 @@ mpc52xx_uart_of_enumerate(void)

  
                /* Is a particular device number requested? */
                devno = of_get_property(np, "port-number", NULL);
  
                /* Is a particular device number requested? */
                devno = of_get_property(np, "port-number", NULL);


@@ -67550,7 +67966,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
        }
  
        enum_done = 1;
        }
  
        enum_done = 1;

-@@ -1079,15 +1097,13 @@
+@@ -1079,15 +1097,13 @@ mpc52xx_uart_of_enumerate(void)

        for (i = 0; i < MPC52xx_PSC_MAXNUM; i++) {
                if (mpc52xx_uart_nodes[i])
                        pr_debug("%s assigned to ttyPSC%x\n",
        for (i = 0; i < MPC52xx_PSC_MAXNUM; i++) {
                if (mpc52xx_uart_nodes[i])
                        pr_debug("%s assigned to ttyPSC%x\n",


@@ -67567,7 +67983,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
        .match_table    = mpc52xx_uart_of_match,
        .probe          = mpc52xx_uart_of_probe,
        .remove         = mpc52xx_uart_of_remove,
        .match_table    = mpc52xx_uart_of_match,
        .probe          = mpc52xx_uart_of_probe,
        .remove         = mpc52xx_uart_of_remove,

-@@ -1113,7 +1129,8 @@
+@@ -1113,7 +1129,8 @@ mpc52xx_uart_init(void)

  
        printk(KERN_INFO "Serial: MPC52xx PSC UART driver\n");
  
  
        printk(KERN_INFO "Serial: MPC52xx PSC UART driver\n");
  


@@ -67577,10 +67993,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
                printk(KERN_ERR "%s: uart_register_driver failed (%i)\n",
                       __FILE__, ret);
                return ret;
                printk(KERN_ERR "%s: uart_register_driver failed (%i)\n",
                       __FILE__, ret);
                return ret;

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/uartlite.c powerpc.git/drivers/serial/uartlite.c
---- linux-2.6.24/drivers/serial/uartlite.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/serial/uartlite.c      2008-01-28 20:26:19.000000000 +0100
-@@ -539,7 +539,7 @@
+Index: linux-2.6.24.7/drivers/serial/uartlite.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/serial/uartlite.c
++++ linux-2.6.24.7/drivers/serial/uartlite.c
+@@ -539,7 +539,7 @@ static int __devinit ulite_assign(struct

   *
   * @dev: pointer to device structure
   */
   *
   * @dev: pointer to device structure
   */


@@ -67589,7 +68006,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/uartlite.c powerpc.g
  {
        struct uart_port *port = dev_get_drvdata(dev);
        int rc = 0;
  {
        struct uart_port *port = dev_get_drvdata(dev);
        int rc = 0;

-@@ -572,14 +572,14 @@
+@@ -572,14 +572,14 @@ static int __devinit ulite_probe(struct 

        return ulite_assign(&pdev->dev, pdev->id, res->start, res2->start);
  }
  
        return ulite_assign(&pdev->dev, pdev->id, res->start, res2->start);
  }
  


@@ -67606,9 +68023,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/uartlite.c powerpc.g
        .driver = {
                   .owner = THIS_MODULE,
                   .name  = "uartlite",
        .driver = {
                   .owner = THIS_MODULE,
                   .name  = "uartlite",

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/ucc_uart.c powerpc.git/drivers/serial/ucc_uart.c
---- linux-2.6.24/drivers/serial/ucc_uart.c     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/drivers/serial/ucc_uart.c      2008-01-28 20:26:20.000000000 +0100
+Index: linux-2.6.24.7/drivers/serial/ucc_uart.c
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/drivers/serial/ucc_uart.c

 @@ -0,0 +1,1514 @@
 +/*
 + * Freescale QUICC Engine UART device driver
 @@ -0,0 +1,1514 @@
 +/*
 + * Freescale QUICC Engine UART device driver


@@ -69124,10 +69542,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/ucc_uart.c powerpc.g
 +MODULE_LICENSE("GPL v2");
 +MODULE_ALIAS_CHARDEV_MAJOR(SERIAL_QE_MAJOR);
 +
 +MODULE_LICENSE("GPL v2");
 +MODULE_ALIAS_CHARDEV_MAJOR(SERIAL_QE_MAJOR);
 +

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/spi/mpc52xx_psc_spi.c powerpc.git/drivers/spi/mpc52xx_psc_spi.c
---- linux-2.6.24/drivers/spi/mpc52xx_psc_spi.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/spi/mpc52xx_psc_spi.c  2008-01-28 20:26:20.000000000 +0100
-@@ -330,6 +330,7 @@
+Index: linux-2.6.24.7/drivers/spi/mpc52xx_psc_spi.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/spi/mpc52xx_psc_spi.c
++++ linux-2.6.24.7/drivers/spi/mpc52xx_psc_spi.c
+@@ -330,6 +330,7 @@ static void mpc52xx_psc_spi_cleanup(stru

  
  static int mpc52xx_psc_spi_port_config(int psc_id, struct mpc52xx_psc_spi *mps)
  {
  
  static int mpc52xx_psc_spi_port_config(int psc_id, struct mpc52xx_psc_spi *mps)
  {


@@ -69135,7 +69554,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/spi/mpc52xx_psc_spi.c power
        struct mpc52xx_cdm __iomem *cdm;
        struct mpc52xx_gpio __iomem *gpio;
        struct mpc52xx_psc __iomem *psc = mps->psc;
        struct mpc52xx_cdm __iomem *cdm;
        struct mpc52xx_gpio __iomem *gpio;
        struct mpc52xx_psc __iomem *psc = mps->psc;

-@@ -338,8 +339,12 @@
+@@ -338,8 +339,12 @@ static int mpc52xx_psc_spi_port_config(i

        int ret = 0;
  
  #if defined(CONFIG_PPC_MERGE)
        int ret = 0;
  
  #if defined(CONFIG_PPC_MERGE)


@@ -69150,10 +69569,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/spi/mpc52xx_psc_spi.c power
  #else
        cdm = ioremap(MPC52xx_PA(MPC52xx_CDM_OFFSET), MPC52xx_CDM_SIZE);
        gpio = ioremap(MPC52xx_PA(MPC52xx_GPIO_OFFSET), MPC52xx_GPIO_SIZE);
  #else
        cdm = ioremap(MPC52xx_PA(MPC52xx_CDM_OFFSET), MPC52xx_CDM_SIZE);
        gpio = ioremap(MPC52xx_PA(MPC52xx_GPIO_OFFSET), MPC52xx_GPIO_SIZE);

-diff -x .git -x .gitignore -Nur linux-2.6.24/fs/openpromfs/inode.c powerpc.git/fs/openpromfs/inode.c
---- linux-2.6.24/fs/openpromfs/inode.c 2008-01-28 20:50:11.000000000 +0100
-+++ powerpc.git/fs/openpromfs/inode.c  2008-01-28 20:26:31.000000000 +0100
-@@ -131,7 +131,7 @@
+Index: linux-2.6.24.7/fs/openpromfs/inode.c
+===================================================================
+--- linux-2.6.24.7.orig/fs/openpromfs/inode.c
++++ linux-2.6.24.7/fs/openpromfs/inode.c
+@@ -131,7 +131,7 @@ static void property_stop(struct seq_fil

        /* Nothing to do */
  }
  
        /* Nothing to do */
  }
  


@@ -69162,10 +69582,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/fs/openpromfs/inode.c powerpc.git/f
        .start          = property_start,
        .next           = property_next,
        .stop           = property_stop,
        .start          = property_start,
        .next           = property_next,
        .stop           = property_stop,

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/8xx_immap.h powerpc.git/include/asm-powerpc/8xx_immap.h
---- linux-2.6.24/include/asm-powerpc/8xx_immap.h       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/8xx_immap.h        2008-01-28 20:26:42.000000000 +0100
-@@ -123,7 +123,7 @@
+Index: linux-2.6.24.7/include/asm-powerpc/8xx_immap.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/8xx_immap.h
++++ linux-2.6.24.7/include/asm-powerpc/8xx_immap.h
+@@ -123,7 +123,7 @@ typedef struct     mem_ctlr {

  #define OR_G5LA               0x00000400      /* Output #GPL5 on #GPL_A5              */
  #define OR_G5LS               0x00000200      /* Drive #GPL high on falling edge of...*/
  #define OR_BI         0x00000100      /* Burst inhibit                        */
  #define OR_G5LA               0x00000400      /* Output #GPL5 on #GPL_A5              */
  #define OR_G5LS               0x00000200      /* Drive #GPL high on falling edge of...*/
  #define OR_BI         0x00000100      /* Burst inhibit                        */


@@ -69174,10 +69595,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/8xx_immap.h pow
  #define OR_SCY_0_CLK  0x00000000      /* 0 clock cycles wait states           */
  #define OR_SCY_1_CLK  0x00000010      /* 1 clock cycles wait states           */
  #define OR_SCY_2_CLK  0x00000020      /* 2 clock cycles wait states           */
  #define OR_SCY_0_CLK  0x00000000      /* 0 clock cycles wait states           */
  #define OR_SCY_1_CLK  0x00000010      /* 1 clock cycles wait states           */
  #define OR_SCY_2_CLK  0x00000020      /* 2 clock cycles wait states           */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/commproc.h powerpc.git/include/asm-powerpc/commproc.h
---- linux-2.6.24/include/asm-powerpc/commproc.h        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/commproc.h 2008-01-28 20:26:42.000000000 +0100
-@@ -693,7 +693,7 @@
+Index: linux-2.6.24.7/include/asm-powerpc/commproc.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/commproc.h
++++ linux-2.6.24.7/include/asm-powerpc/commproc.h
+@@ -693,7 +693,7 @@ typedef struct risc_timer_pram {

  #define       CICR_SCC_SCC3           ((uint)0x00200000)      /* SCC3 @ SCCc */
  #define       CICR_SCB_SCC2           ((uint)0x00040000)      /* SCC2 @ SCCb */
  #define       CICR_SCA_SCC1           ((uint)0x00000000)      /* SCC1 @ SCCa */
  #define       CICR_SCC_SCC3           ((uint)0x00200000)      /* SCC3 @ SCCc */
  #define       CICR_SCB_SCC2           ((uint)0x00040000)      /* SCC2 @ SCCb */
  #define       CICR_SCA_SCC1           ((uint)0x00000000)      /* SCC1 @ SCCa */


@@ -69186,20 +69608,22 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/commproc.h powe
  #define CICR_HP_MASK          ((uint)0x00001f00)      /* Hi-pri int. */
  #define CICR_IEN              ((uint)0x00000080)      /* Int. enable */
  #define CICR_SPS              ((uint)0x00000001)      /* SCC Spread */
  #define CICR_HP_MASK          ((uint)0x00001f00)      /* Hi-pri int. */
  #define CICR_IEN              ((uint)0x00000080)      /* Int. enable */
  #define CICR_SPS              ((uint)0x00000001)      /* SCC Spread */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/cpm.h powerpc.git/include/asm-powerpc/cpm.h
---- linux-2.6.24/include/asm-powerpc/cpm.h     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/cpm.h      2008-01-28 20:26:42.000000000 +0100
-@@ -10,5 +10,6 @@
+Index: linux-2.6.24.7/include/asm-powerpc/cpm.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/cpm.h
++++ linux-2.6.24.7/include/asm-powerpc/cpm.h
+@@ -10,5 +10,6 @@ int cpm_muram_free(unsigned long offset)

  unsigned long cpm_muram_alloc_fixed(unsigned long offset, unsigned long size);
  void __iomem *cpm_muram_addr(unsigned long offset);
  dma_addr_t cpm_muram_dma(void __iomem *addr);
 +int cpm_command(u32 command, u8 opcode);
  
  #endif
  unsigned long cpm_muram_alloc_fixed(unsigned long offset, unsigned long size);
  void __iomem *cpm_muram_addr(unsigned long offset);
  dma_addr_t cpm_muram_dma(void __iomem *addr);
 +int cpm_command(u32 command, u8 opcode);
  
  #endif

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/cputable.h powerpc.git/include/asm-powerpc/cputable.h
---- linux-2.6.24/include/asm-powerpc/cputable.h        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/cputable.h 2008-01-28 20:26:42.000000000 +0100
-@@ -57,6 +57,14 @@
+Index: linux-2.6.24.7/include/asm-powerpc/cputable.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/cputable.h
++++ linux-2.6.24.7/include/asm-powerpc/cputable.h
+@@ -57,6 +57,14 @@ enum powerpc_pmc_type {

        PPC_PMC_PA6T = 2,
  };
  
        PPC_PMC_PA6T = 2,
  };
  


@@ -69214,7 +69638,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/cputable.h powe
  /* NOTE WELL: Update identify_cpu() if fields are added or removed! */
  struct cpu_spec {
        /* CPU is matched via (PVR & pvr_mask) == pvr_value */
  /* NOTE WELL: Update identify_cpu() if fields are added or removed! */
  struct cpu_spec {
        /* CPU is matched via (PVR & pvr_mask) == pvr_value */

-@@ -97,6 +105,11 @@
+@@ -97,6 +105,11 @@ struct cpu_spec {

  
        /* Name of processor class, for the ELF AT_PLATFORM entry */
        char            *platform;
  
        /* Name of processor class, for the ELF AT_PLATFORM entry */
        char            *platform;


@@ -69226,9 +69650,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/cputable.h powe
  };
  
  extern struct cpu_spec                *cur_cpu_spec;
  };
  
  extern struct cpu_spec                *cur_cpu_spec;

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/cputhreads.h powerpc.git/include/asm-powerpc/cputhreads.h
---- linux-2.6.24/include/asm-powerpc/cputhreads.h      1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/cputhreads.h       2008-01-28 20:26:42.000000000 +0100
+Index: linux-2.6.24.7/include/asm-powerpc/cputhreads.h
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/include/asm-powerpc/cputhreads.h

 @@ -0,0 +1,71 @@
 +#ifndef _ASM_POWERPC_CPUTHREADS_H
 +#define _ASM_POWERPC_CPUTHREADS_H
 @@ -0,0 +1,71 @@
 +#ifndef _ASM_POWERPC_CPUTHREADS_H
 +#define _ASM_POWERPC_CPUTHREADS_H


@@ -69301,9 +69726,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/cputhreads.h po
 +
 +#endif /* _ASM_POWERPC_CPUTHREADS_H */
 +
 +
 +#endif /* _ASM_POWERPC_CPUTHREADS_H */
 +

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/dcr-native.h powerpc.git/include/asm-powerpc/dcr-native.h
---- linux-2.6.24/include/asm-powerpc/dcr-native.h      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/dcr-native.h       2008-01-28 20:26:42.000000000 +0100
+Index: linux-2.6.24.7/include/asm-powerpc/dcr-native.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/dcr-native.h
++++ linux-2.6.24.7/include/asm-powerpc/dcr-native.h

 @@ -22,6 +22,8 @@
  #ifdef __KERNEL__
  #ifndef __ASSEMBLY__
 @@ -22,6 +22,8 @@
  #ifdef __KERNEL__
  #ifndef __ASSEMBLY__


@@ -69313,7 +69739,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/dcr-native.h po
  typedef struct {
        unsigned int base;
  } dcr_host_t;
  typedef struct {
        unsigned int base;
  } dcr_host_t;

-@@ -55,20 +57,28 @@
+@@ -55,20 +57,28 @@ do {                                                               \

  } while (0)
  
  /* R/W of indirect DCRs make use of standard naming conventions for DCRs */
  } while (0)
  
  /* R/W of indirect DCRs make use of standard naming conventions for DCRs */


@@ -69352,9 +69778,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/dcr-native.h po
  #endif /* _ASM_POWERPC_DCR_NATIVE_H */
 -
 -
  #endif /* _ASM_POWERPC_DCR_NATIVE_H */
 -
 -

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/dcr-regs.h powerpc.git/include/asm-powerpc/dcr-regs.h
---- linux-2.6.24/include/asm-powerpc/dcr-regs.h        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/dcr-regs.h 2008-01-28 20:26:42.000000000 +0100
+Index: linux-2.6.24.7/include/asm-powerpc/dcr-regs.h
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/include/asm-powerpc/dcr-regs.h

 @@ -0,0 +1,71 @@
 +/*
 + * Common DCR / SDR / CPR register definitions used on various IBM/AMCC
 @@ -0,0 +1,71 @@
 +/*
 + * Common DCR / SDR / CPR register definitions used on various IBM/AMCC


@@ -69427,10 +69854,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/dcr-regs.h powe
 +#define SDR0_CUST0            0x4000
 +
 +#endif /* __DCR_REGS_H__ */
 +#define SDR0_CUST0            0x4000
 +
 +#endif /* __DCR_REGS_H__ */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/dma-mapping.h powerpc.git/include/asm-powerpc/dma-mapping.h
---- linux-2.6.24/include/asm-powerpc/dma-mapping.h     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/dma-mapping.h      2008-01-28 20:26:42.000000000 +0100
-@@ -87,6 +87,9 @@
+Index: linux-2.6.24.7/include/asm-powerpc/dma-mapping.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/dma-mapping.h
++++ linux-2.6.24.7/include/asm-powerpc/dma-mapping.h
+@@ -87,6 +87,9 @@ static inline int dma_supported(struct d

        return dma_ops->dma_supported(dev, mask);
  }
  
        return dma_ops->dma_supported(dev, mask);
  }
  


@@ -69440,7 +69868,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/dma-mapping.h p
  static inline int dma_set_mask(struct device *dev, u64 dma_mask)
  {
        struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
  static inline int dma_set_mask(struct device *dev, u64 dma_mask)
  {
        struct dma_mapping_ops *dma_ops = get_dma_ops(dev);

-@@ -186,8 +189,6 @@
+@@ -186,8 +189,6 @@ static inline void dma_unmap_sg(struct d

  extern struct dma_mapping_ops dma_iommu_ops;
  extern struct dma_mapping_ops dma_direct_ops;
  
  extern struct dma_mapping_ops dma_iommu_ops;
  extern struct dma_mapping_ops dma_direct_ops;
  


@@ -69449,10 +69877,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/dma-mapping.h p
  #else /* CONFIG_PPC64 */
  
  #define dma_supported(dev, mask)      (1)
  #else /* CONFIG_PPC64 */
  
  #define dma_supported(dev, mask)      (1)

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/firmware.h powerpc.git/include/asm-powerpc/firmware.h
---- linux-2.6.24/include/asm-powerpc/firmware.h        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/firmware.h 2008-01-28 20:26:42.000000000 +0100
-@@ -64,7 +64,7 @@
+Index: linux-2.6.24.7/include/asm-powerpc/firmware.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/firmware.h
++++ linux-2.6.24.7/include/asm-powerpc/firmware.h
+@@ -64,7 +64,7 @@ enum {

        FW_FEATURE_PS3_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1,
        FW_FEATURE_PS3_ALWAYS = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1,
        FW_FEATURE_CELLEB_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_BEAT,
        FW_FEATURE_PS3_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1,
        FW_FEATURE_PS3_ALWAYS = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1,
        FW_FEATURE_CELLEB_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_BEAT,


@@ -69461,10 +69890,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/firmware.h powe
        FW_FEATURE_NATIVE_POSSIBLE = 0,
        FW_FEATURE_NATIVE_ALWAYS = 0,
        FW_FEATURE_POSSIBLE =
        FW_FEATURE_NATIVE_POSSIBLE = 0,
        FW_FEATURE_NATIVE_ALWAYS = 0,
        FW_FEATURE_POSSIBLE =

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/immap_86xx.h powerpc.git/include/asm-powerpc/immap_86xx.h
---- linux-2.6.24/include/asm-powerpc/immap_86xx.h      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/immap_86xx.h       2008-01-28 20:26:42.000000000 +0100
-@@ -89,14 +89,14 @@
+Index: linux-2.6.24.7/include/asm-powerpc/immap_86xx.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/immap_86xx.h
++++ linux-2.6.24.7/include/asm-powerpc/immap_86xx.h
+@@ -89,14 +89,14 @@ struct ccsr_guts {

   * them.
   *
   * guts: Pointer to GUTS structure
   * them.
   *
   * guts: Pointer to GUTS structure


@@ -69481,7 +69911,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/immap_86xx.h po
  
        clrsetbits_be32(&guts->dmacr, 3 << shift, device << shift);
  }
  
        clrsetbits_be32(&guts->dmacr, 3 << shift, device << shift);
  }

-@@ -118,6 +118,27 @@
+@@ -118,6 +118,27 @@ static inline void guts_set_dmacr(struct

  #define CCSR_GUTS_PMUXCR_DMA1_0               0x00000002
  #define CCSR_GUTS_PMUXCR_DMA1_3               0x00000001
  
  #define CCSR_GUTS_PMUXCR_DMA1_0               0x00000002
  #define CCSR_GUTS_PMUXCR_DMA1_3               0x00000001
  


@@ -69509,10 +69939,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/immap_86xx.h po
  #define CCSR_GUTS_CLKDVDR_PXCKEN      0x80000000
  #define CCSR_GUTS_CLKDVDR_SSICKEN     0x20000000
  #define CCSR_GUTS_CLKDVDR_PXCKINV     0x10000000
  #define CCSR_GUTS_CLKDVDR_PXCKEN      0x80000000
  #define CCSR_GUTS_CLKDVDR_SSICKEN     0x20000000
  #define CCSR_GUTS_CLKDVDR_PXCKINV     0x10000000

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/immap_qe.h powerpc.git/include/asm-powerpc/immap_qe.h
---- linux-2.6.24/include/asm-powerpc/immap_qe.h        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/immap_qe.h 2008-01-28 20:26:42.000000000 +0100
-@@ -393,9 +393,39 @@
+Index: linux-2.6.24.7/include/asm-powerpc/immap_qe.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/immap_qe.h
++++ linux-2.6.24.7/include/asm-powerpc/immap_qe.h
+@@ -393,9 +393,39 @@ struct dbg {

        u8      res2[0x48];
  } __attribute__ ((packed));
  
        u8      res2[0x48];
  } __attribute__ ((packed));
  


@@ -69554,10 +69985,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/immap_qe.h powe
  } __attribute__ ((packed));
  
  struct qe_immap {
  } __attribute__ ((packed));
  
  struct qe_immap {

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/io.h powerpc.git/include/asm-powerpc/io.h
---- linux-2.6.24/include/asm-powerpc/io.h      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/io.h       2008-01-28 20:26:42.000000000 +0100
-@@ -50,15 +50,16 @@
+Index: linux-2.6.24.7/include/asm-powerpc/io.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/io.h
++++ linux-2.6.24.7/include/asm-powerpc/io.h
+@@ -50,15 +50,16 @@ extern int check_legacy_ioport(unsigned 

  #define PCI_DRAM_OFFSET       pci_dram_offset
  #else
  #define _IO_BASE      pci_io_base
  #define PCI_DRAM_OFFSET       pci_dram_offset
  #else
  #define _IO_BASE      pci_io_base


@@ -69576,10 +70008,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/io.h powerpc.gi
  #if defined(CONFIG_PPC32) && defined(CONFIG_PPC_INDIRECT_IO)
  #error CONFIG_PPC_INDIRECT_IO is not yet supported on 32 bits
  #endif
  #if defined(CONFIG_PPC32) && defined(CONFIG_PPC_INDIRECT_IO)
  #error CONFIG_PPC_INDIRECT_IO is not yet supported on 32 bits
  #endif

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/iommu.h powerpc.git/include/asm-powerpc/iommu.h
---- linux-2.6.24/include/asm-powerpc/iommu.h   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/iommu.h    2008-01-28 20:26:42.000000000 +0100
-@@ -69,10 +69,9 @@
+Index: linux-2.6.24.7/include/asm-powerpc/iommu.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/iommu.h
++++ linux-2.6.24.7/include/asm-powerpc/iommu.h
+@@ -69,10 +69,9 @@ struct iommu_table {

  };
  
  struct scatterlist;
  };
  
  struct scatterlist;


@@ -69591,9 +70024,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/iommu.h powerpc
  
  /* Initializes an iommu_table based in values set in the passed-in
   * structure
  
  /* Initializes an iommu_table based in values set in the passed-in
   * structure

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/ipic.h powerpc.git/include/asm-powerpc/ipic.h
---- linux-2.6.24/include/asm-powerpc/ipic.h    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/ipic.h     2008-01-28 20:26:42.000000000 +0100
+Index: linux-2.6.24.7/include/asm-powerpc/ipic.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/ipic.h
++++ linux-2.6.24.7/include/asm-powerpc/ipic.h

 @@ -20,11 +20,13 @@
  
  /* Flags when we init the IPIC */
 @@ -20,11 +20,13 @@
  
  /* Flags when we init the IPIC */


@@ -69613,10 +70047,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/ipic.h powerpc.
  
  /* IPIC registers offsets */
  #define IPIC_SICFR    0x00    /* System Global Interrupt Configuration Register */
  
  /* IPIC registers offsets */
  #define IPIC_SICFR    0x00    /* System Global Interrupt Configuration Register */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/iseries/hv_lp_event.h powerpc.git/include/asm-powerpc/iseries/hv_lp_event.h
---- linux-2.6.24/include/asm-powerpc/iseries/hv_lp_event.h     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/iseries/hv_lp_event.h      2008-01-28 20:26:42.000000000 +0100
-@@ -78,7 +78,7 @@
+Index: linux-2.6.24.7/include/asm-powerpc/iseries/hv_lp_event.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/iseries/hv_lp_event.h
++++ linux-2.6.24.7/include/asm-powerpc/iseries/hv_lp_event.h
+@@ -78,7 +78,7 @@ extern int HvLpEvent_openPath(HvLpEvent_

  
  /*
   * Close an Lp Event Path for a type and partition
  
  /*
   * Close an Lp Event Path for a type and partition


@@ -69625,10 +70060,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/iseries/hv_lp_e
   */
  extern int HvLpEvent_closePath(HvLpEvent_Type eventType, HvLpIndex lpIndex);
  
   */
  extern int HvLpEvent_closePath(HvLpEvent_Type eventType, HvLpIndex lpIndex);
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/kexec.h powerpc.git/include/asm-powerpc/kexec.h
---- linux-2.6.24/include/asm-powerpc/kexec.h   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/kexec.h    2008-01-28 20:26:42.000000000 +0100
-@@ -123,6 +123,9 @@
+Index: linux-2.6.24.7/include/asm-powerpc/kexec.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/kexec.h
++++ linux-2.6.24.7/include/asm-powerpc/kexec.h
+@@ -123,6 +123,9 @@ struct pt_regs;

  extern void default_machine_kexec(struct kimage *image);
  extern int default_machine_kexec_prepare(struct kimage *image);
  extern void default_machine_crash_shutdown(struct pt_regs *regs);
  extern void default_machine_kexec(struct kimage *image);
  extern int default_machine_kexec_prepare(struct kimage *image);
  extern void default_machine_crash_shutdown(struct pt_regs *regs);


@@ -69638,10 +70074,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/kexec.h powerpc
  
  extern void machine_kexec_simple(struct kimage *image);
  extern void crash_kexec_secondary(struct pt_regs *regs);
  
  extern void machine_kexec_simple(struct kimage *image);
  extern void crash_kexec_secondary(struct pt_regs *regs);

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/lmb.h powerpc.git/include/asm-powerpc/lmb.h
---- linux-2.6.24/include/asm-powerpc/lmb.h     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/lmb.h      2008-01-28 20:26:42.000000000 +0100
-@@ -51,6 +51,7 @@
+Index: linux-2.6.24.7/include/asm-powerpc/lmb.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/lmb.h
++++ linux-2.6.24.7/include/asm-powerpc/lmb.h
+@@ -51,6 +51,7 @@ extern unsigned long __init __lmb_alloc_

  extern unsigned long __init lmb_phys_mem_size(void);
  extern unsigned long __init lmb_end_of_DRAM(void);
  extern void __init lmb_enforce_memory_limit(unsigned long memory_limit);
  extern unsigned long __init lmb_phys_mem_size(void);
  extern unsigned long __init lmb_end_of_DRAM(void);
  extern void __init lmb_enforce_memory_limit(unsigned long memory_limit);


@@ -69649,10 +70086,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/lmb.h powerpc.g
  
  extern void lmb_dump_all(void);
  
  
  extern void lmb_dump_all(void);
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/machdep.h powerpc.git/include/asm-powerpc/machdep.h
---- linux-2.6.24/include/asm-powerpc/machdep.h 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/machdep.h  2008-01-28 20:26:42.000000000 +0100
-@@ -204,6 +204,13 @@
+Index: linux-2.6.24.7/include/asm-powerpc/machdep.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/machdep.h
++++ linux-2.6.24.7/include/asm-powerpc/machdep.h
+@@ -204,6 +204,13 @@ struct machdep_calls {

        /*
         * optional PCI "hooks"
         */
        /*
         * optional PCI "hooks"
         */


@@ -69666,7 +70104,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/machdep.h power
  
        /* Called after PPC generic resource fixup to perform
           machine specific fixups */
  
        /* Called after PPC generic resource fixup to perform
           machine specific fixups */

-@@ -212,18 +219,9 @@
+@@ -212,18 +219,9 @@ struct machdep_calls {

        /* Called for each PCI bus in the system when it's probed */
        void (*pcibios_fixup_bus)(struct pci_bus *);
  
        /* Called for each PCI bus in the system when it's probed */
        void (*pcibios_fixup_bus)(struct pci_bus *);
  


@@ -69688,7 +70126,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/machdep.h power
  
        /* Called to shutdown machine specific hardware not already controlled
         * by other drivers.
  
        /* Called to shutdown machine specific hardware not already controlled
         * by other drivers.

-@@ -253,6 +251,16 @@
+@@ -253,6 +251,16 @@ struct machdep_calls {

         */
        void (*machine_kexec)(struct kimage *image);
  #endif /* CONFIG_KEXEC */
         */
        void (*machine_kexec)(struct kimage *image);
  #endif /* CONFIG_KEXEC */


@@ -69705,7 +70143,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/machdep.h power
  };
  
  extern void power4_idle(void);
  };
  
  extern void power4_idle(void);

-@@ -326,5 +334,31 @@
+@@ -326,5 +334,31 @@ static inline void log_error(char *buf, 

                ppc_md.log_error(buf, err_type, fatal);
  }
  
                ppc_md.log_error(buf, err_type, fatal);
  }
  


@@ -69737,10 +70175,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/machdep.h power
 +
  #endif /* __KERNEL__ */
  #endif /* _ASM_POWERPC_MACHDEP_H */
 +
  #endif /* __KERNEL__ */
  #endif /* _ASM_POWERPC_MACHDEP_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/mmu-hash64.h powerpc.git/include/asm-powerpc/mmu-hash64.h
---- linux-2.6.24/include/asm-powerpc/mmu-hash64.h      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/mmu-hash64.h       2008-01-28 21:37:04.000000000 +0100
-@@ -80,7 +80,7 @@
+Index: linux-2.6.24.7/include/asm-powerpc/mmu-hash64.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/mmu-hash64.h
++++ linux-2.6.24.7/include/asm-powerpc/mmu-hash64.h
+@@ -80,7 +80,7 @@ extern char initial_stab[];

  #define HPTE_V_AVPN_SHIFT     7
  #define HPTE_V_AVPN           ASM_CONST(0x3fffffffffffff80)
  #define HPTE_V_AVPN_VAL(x)    (((x) & HPTE_V_AVPN) >> HPTE_V_AVPN_SHIFT)
  #define HPTE_V_AVPN_SHIFT     7
  #define HPTE_V_AVPN           ASM_CONST(0x3fffffffffffff80)
  #define HPTE_V_AVPN_VAL(x)    (((x) & HPTE_V_AVPN) >> HPTE_V_AVPN_SHIFT)


@@ -69749,7 +70188,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/mmu-hash64.h po
  #define HPTE_V_BOLTED         ASM_CONST(0x0000000000000010)
  #define HPTE_V_LOCK           ASM_CONST(0x0000000000000008)
  #define HPTE_V_LARGE          ASM_CONST(0x0000000000000004)
  #define HPTE_V_BOLTED         ASM_CONST(0x0000000000000010)
  #define HPTE_V_LOCK           ASM_CONST(0x0000000000000008)
  #define HPTE_V_LARGE          ASM_CONST(0x0000000000000004)

-@@ -180,6 +180,7 @@
+@@ -180,6 +180,7 @@ extern int mmu_vmalloc_psize;

  extern int mmu_io_psize;
  extern int mmu_kernel_ssize;
  extern int mmu_highuser_ssize;
  extern int mmu_io_psize;
  extern int mmu_kernel_ssize;
  extern int mmu_highuser_ssize;


@@ -69757,7 +70196,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/mmu-hash64.h po
  
  /*
   * If the processor supports 64k normal pages but not 64k cache
  
  /*
   * If the processor supports 64k normal pages but not 64k cache

-@@ -277,6 +278,7 @@
+@@ -277,6 +278,7 @@ extern int hash_huge_page(struct mm_stru

  extern int htab_bolt_mapping(unsigned long vstart, unsigned long vend,
                             unsigned long pstart, unsigned long mode,
                             int psize, int ssize);
  extern int htab_bolt_mapping(unsigned long vstart, unsigned long vend,
                             unsigned long pstart, unsigned long mode,
                             int psize, int ssize);


@@ -69765,10 +70204,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/mmu-hash64.h po
  
  extern void htab_initialize(void);
  extern void htab_initialize_secondary(void);
  
  extern void htab_initialize(void);
  extern void htab_initialize_secondary(void);

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/mpc52xx.h powerpc.git/include/asm-powerpc/mpc52xx.h
---- linux-2.6.24/include/asm-powerpc/mpc52xx.h 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/mpc52xx.h  2008-01-28 20:26:42.000000000 +0100
-@@ -248,8 +248,6 @@
+Index: linux-2.6.24.7/include/asm-powerpc/mpc52xx.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/mpc52xx.h
++++ linux-2.6.24.7/include/asm-powerpc/mpc52xx.h
+@@ -248,8 +248,6 @@ struct mpc52xx_cdm {

  
  #ifndef __ASSEMBLY__
  
  
  #ifndef __ASSEMBLY__
  


@@ -69777,7 +70217,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/mpc52xx.h power
  extern unsigned int mpc52xx_find_ipb_freq(struct device_node *node);
  extern void mpc5200_setup_xlb_arbiter(void);
  extern void mpc52xx_declare_of_platform_devices(void);
  extern unsigned int mpc52xx_find_ipb_freq(struct device_node *node);
  extern void mpc5200_setup_xlb_arbiter(void);
  extern void mpc52xx_declare_of_platform_devices(void);

-@@ -257,7 +255,12 @@
+@@ -257,7 +255,12 @@ extern void mpc52xx_declare_of_platform_

  extern void mpc52xx_init_irq(void);
  extern unsigned int mpc52xx_get_irq(void);
  
  extern void mpc52xx_init_irq(void);
  extern unsigned int mpc52xx_get_irq(void);
  


@@ -69790,10 +70230,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/mpc52xx.h power
  
  extern void __init mpc52xx_map_wdt(void);
  extern void mpc52xx_restart(char *cmd);
  
  extern void __init mpc52xx_map_wdt(void);
  extern void mpc52xx_restart(char *cmd);

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/mpc52xx_psc.h powerpc.git/include/asm-powerpc/mpc52xx_psc.h
---- linux-2.6.24/include/asm-powerpc/mpc52xx_psc.h     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/mpc52xx_psc.h      2008-01-28 20:26:42.000000000 +0100
-@@ -153,6 +153,9 @@
+Index: linux-2.6.24.7/include/asm-powerpc/mpc52xx_psc.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/mpc52xx_psc.h
++++ linux-2.6.24.7/include/asm-powerpc/mpc52xx_psc.h
+@@ -153,6 +153,9 @@ struct mpc52xx_psc {

        u8              reserved16[3];
        u8              irfdr;          /* PSC + 0x54 */
        u8              reserved17[3];
        u8              reserved16[3];
        u8              irfdr;          /* PSC + 0x54 */
        u8              reserved17[3];


@@ -69803,9 +70244,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/mpc52xx_psc.h p
        u16             rfnum;          /* PSC + 0x58 */
        u16             reserved18;
        u16             tfnum;          /* PSC + 0x5c */
        u16             rfnum;          /* PSC + 0x58 */
        u16             reserved18;
        u16             tfnum;          /* PSC + 0x5c */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/mpc8260.h powerpc.git/include/asm-powerpc/mpc8260.h
---- linux-2.6.24/include/asm-powerpc/mpc8260.h 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/mpc8260.h  2008-01-28 20:26:42.000000000 +0100
+Index: linux-2.6.24.7/include/asm-powerpc/mpc8260.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/mpc8260.h
++++ linux-2.6.24.7/include/asm-powerpc/mpc8260.h

 @@ -8,6 +8,7 @@
  #ifndef __ASM_POWERPC_MPC8260_H__
  #define __ASM_POWERPC_MPC8260_H__
 @@ -8,6 +8,7 @@
  #ifndef __ASM_POWERPC_MPC8260_H__
  #define __ASM_POWERPC_MPC8260_H__


@@ -69814,9 +70256,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/mpc8260.h power
  
  #ifdef CONFIG_8260
  
  
  #ifdef CONFIG_8260
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/mpic.h powerpc.git/include/asm-powerpc/mpic.h
---- linux-2.6.24/include/asm-powerpc/mpic.h    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/mpic.h     2008-01-28 20:26:42.000000000 +0100
+Index: linux-2.6.24.7/include/asm-powerpc/mpic.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/mpic.h
++++ linux-2.6.24.7/include/asm-powerpc/mpic.h

 @@ -22,7 +22,9 @@
  #define MPIC_GREG_GLOBAL_CONF_0               0x00020
  #define               MPIC_GREG_GCONF_RESET                   0x80000000
 @@ -22,7 +22,9 @@
  #define MPIC_GREG_GLOBAL_CONF_0               0x00020
  #define               MPIC_GREG_GCONF_RESET                   0x80000000


@@ -69843,7 +70286,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/mpic.h powerpc.
  
  /*
   * Per-source registers
  
  /*
   * Per-source registers

-@@ -183,6 +187,7 @@
+@@ -183,6 +187,7 @@ enum {

        MPIC_IDX_CPU_WHOAMI,
        MPIC_IDX_CPU_INTACK,
        MPIC_IDX_CPU_EOI,
        MPIC_IDX_CPU_WHOAMI,
        MPIC_IDX_CPU_INTACK,
        MPIC_IDX_CPU_EOI,


@@ -69851,7 +70294,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/mpic.h powerpc.
  
        MPIC_IDX_IRQ_BASE,
        MPIC_IDX_IRQ_STRIDE,
  
        MPIC_IDX_IRQ_BASE,
        MPIC_IDX_IRQ_STRIDE,

-@@ -344,6 +349,10 @@
+@@ -344,6 +349,10 @@ struct mpic

  #define MPIC_USES_DCR                 0x00000080
  /* MPIC has 11-bit vector fields (or larger) */
  #define MPIC_LARGE_VECTORS            0x00000100
  #define MPIC_USES_DCR                 0x00000080
  /* MPIC has 11-bit vector fields (or larger) */
  #define MPIC_LARGE_VECTORS            0x00000100


@@ -69862,7 +70305,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/mpic.h powerpc.
  
  /* MPIC HW modification ID */
  #define MPIC_REGSET_MASK              0xf0000000
  
  /* MPIC HW modification ID */
  #define MPIC_REGSET_MASK              0xf0000000

-@@ -447,10 +456,19 @@
+@@ -447,10 +456,19 @@ extern void mpic_send_ipi(unsigned int i

  /* Send a message (IPI) to a given target (cpu number or MSG_*) */
  void smp_mpic_message_pass(int target, int msg);
  
  /* Send a message (IPI) to a given target (cpu number or MSG_*) */
  void smp_mpic_message_pass(int target, int msg);
  


@@ -69883,9 +70326,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/mpic.h powerpc.
  
  /* Set the EPIC clock ratio */
  void mpic_set_clk_ratio(struct mpic *mpic, u32 clock_ratio);
  
  /* Set the EPIC clock ratio */
  void mpic_set_clk_ratio(struct mpic *mpic, u32 clock_ratio);

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/nvram.h powerpc.git/include/asm-powerpc/nvram.h
---- linux-2.6.24/include/asm-powerpc/nvram.h   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/nvram.h    2008-01-28 20:26:42.000000000 +0100
+Index: linux-2.6.24.7/include/asm-powerpc/nvram.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/nvram.h
++++ linux-2.6.24.7/include/asm-powerpc/nvram.h

 @@ -10,6 +10,8 @@
  #ifndef _ASM_POWERPC_NVRAM_H
  #define _ASM_POWERPC_NVRAM_H
 @@ -10,6 +10,8 @@
  #ifndef _ASM_POWERPC_NVRAM_H
  #define _ASM_POWERPC_NVRAM_H


@@ -69895,7 +70339,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/nvram.h powerpc
  #define NVRW_CNT 0x20
  #define NVRAM_HEADER_LEN 16 /* sizeof(struct nvram_header) */
  #define NVRAM_BLOCK_LEN 16
  #define NVRW_CNT 0x20
  #define NVRAM_HEADER_LEN 16 /* sizeof(struct nvram_header) */
  #define NVRAM_BLOCK_LEN 16

-@@ -71,7 +73,16 @@
+@@ -71,7 +73,16 @@ extern int nvram_clear_error_log(void);

  extern struct nvram_partition *nvram_find_partition(int sig, const char *name);
  
  extern int pSeries_nvram_init(void);
  extern struct nvram_partition *nvram_find_partition(int sig, const char *name);
  
  extern int pSeries_nvram_init(void);


@@ -69912,9 +70356,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/nvram.h powerpc
  #endif /* __KERNEL__ */
  
  /* PowerMac specific nvram stuffs */
  #endif /* __KERNEL__ */
  
  /* PowerMac specific nvram stuffs */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/of_platform.h powerpc.git/include/asm-powerpc/of_platform.h
---- linux-2.6.24/include/asm-powerpc/of_platform.h     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/of_platform.h      2008-01-28 20:26:42.000000000 +0100
+Index: linux-2.6.24.7/include/asm-powerpc/of_platform.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/of_platform.h
++++ linux-2.6.24.7/include/asm-powerpc/of_platform.h

 @@ -15,8 +15,14 @@
  #include <linux/of_platform.h>
  
 @@ -15,8 +15,14 @@
  #include <linux/of_platform.h>
  


@@ -69932,7 +70377,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/of_platform.h p
  
  /* Platform devices and busses creation */
  extern struct of_device *of_platform_device_create(struct device_node *np,
  
  /* Platform devices and busses creation */
  extern struct of_device *of_platform_device_create(struct device_node *np,

-@@ -26,9 +32,11 @@
+@@ -26,9 +32,11 @@ extern struct of_device *of_platform_dev

  #define OF_NO_DEEP_PROBE ((struct of_device_id *)-1)
  
  extern int of_platform_bus_probe(struct device_node *root,
  #define OF_NO_DEEP_PROBE ((struct of_device_id *)-1)
  
  extern int of_platform_bus_probe(struct device_node *root,


@@ -69945,9 +70390,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/of_platform.h p
 +extern void of_instantiate_rtc(void);
 +
  #endif        /* _ASM_POWERPC_OF_PLATFORM_H */
 +extern void of_instantiate_rtc(void);
 +
  #endif        /* _ASM_POWERPC_OF_PLATFORM_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/pci-bridge.h powerpc.git/include/asm-powerpc/pci-bridge.h
---- linux-2.6.24/include/asm-powerpc/pci-bridge.h      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/pci-bridge.h       2008-01-28 20:26:42.000000000 +0100
+Index: linux-2.6.24.7/include/asm-powerpc/pci-bridge.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/pci-bridge.h
++++ linux-2.6.24.7/include/asm-powerpc/pci-bridge.h

 @@ -1,15 +1,42 @@
  #ifndef _ASM_POWERPC_PCI_BRIDGE_H
  #define _ASM_POWERPC_PCI_BRIDGE_H
 @@ -1,15 +1,42 @@
  #ifndef _ASM_POWERPC_PCI_BRIDGE_H
  #define _ASM_POWERPC_PCI_BRIDGE_H


@@ -69995,7 +70441,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/pci-bridge.h po
  
  /*
   * Structure of a PCI controller (host bridge)
  
  /*
   * Structure of a PCI controller (host bridge)

-@@ -17,26 +44,41 @@
+@@ -17,26 +44,41 @@ struct pci_controller;

  struct pci_controller {
        struct pci_bus *bus;
        char is_dynamic;
  struct pci_controller {
        struct pci_bus *bus;
        char is_dynamic;


@@ -70040,7 +70486,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/pci-bridge.h po
        /*
         * Used for variants of PCI indirect handling and possible quirks:
         *  SET_CFG_TYPE - used on 4xx or any PHB that does explicit type0/1
        /*
         * Used for variants of PCI indirect handling and possible quirks:
         *  SET_CFG_TYPE - used on 4xx or any PHB that does explicit type0/1

-@@ -51,21 +93,30 @@
+@@ -51,21 +93,30 @@ struct pci_controller {

         *   set.
         *  BIG_ENDIAN - cfg_addr is a big endian register
         */
         *   set.
         *  BIG_ENDIAN - cfg_addr is a big endian register
         */


@@ -70077,7 +70523,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/pci-bridge.h po
  static inline struct pci_controller *pci_bus_to_host(struct pci_bus *bus)
  {
        return bus->sysdata;
  static inline struct pci_controller *pci_bus_to_host(struct pci_bus *bus)
  {
        return bus->sysdata;

-@@ -81,18 +132,18 @@
+@@ -81,18 +132,18 @@ static inline int isa_vaddr_is_ioport(vo

  
  /* These are used for config access before all the PCI probing
     has been done. */
  
  /* These are used for config access before all the PCI probing
     has been done. */


@@ -70108,7 +70554,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/pci-bridge.h po
  
  extern int early_find_capability(struct pci_controller *hose, int bus,
                                 int dev_fn, int cap);
  
  extern int early_find_capability(struct pci_controller *hose, int bus,
                                 int dev_fn, int cap);

-@@ -101,87 +152,33 @@
+@@ -101,87 +152,33 @@ extern void setup_indirect_pci(struct pc

                               resource_size_t cfg_addr,
                               resource_size_t cfg_data, u32 flags);
  extern void setup_grackle(struct pci_controller *hose);
                               resource_size_t cfg_addr,
                               resource_size_t cfg_data, u32 flags);
  extern void setup_grackle(struct pci_controller *hose);


@@ -70202,7 +70648,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/pci-bridge.h po
        u32     config_space[16];       /* saved PCI config space */
  #endif
  };
        u32     config_space[16];       /* saved PCI config space */
  #endif
  };

-@@ -189,7 +186,7 @@
+@@ -189,7 +186,7 @@ struct pci_dn {

  /* Get the pointer to a device_node's pci_dn */
  #define PCI_DN(dn)    ((struct pci_dn *) (dn)->data)
  
  /* Get the pointer to a device_node's pci_dn */
  #define PCI_DN(dn)    ((struct pci_dn *) (dn)->data)
  


@@ -70211,7 +70657,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/pci-bridge.h po
  
  /* Get a device_node from a pci_dev.  This code must be fast except
   * in the case where the sysdata is incorrect and needs to be fixed
  
  /* Get a device_node from a pci_dev.  This code must be fast except
   * in the case where the sysdata is incorrect and needs to be fixed

-@@ -227,14 +224,14 @@
+@@ -227,14 +224,14 @@ static inline struct device_node *pci_bu

  }
  
  /** Find the bus corresponding to the indicated device node */
  }
  
  /** Find the bus corresponding to the indicated device node */


@@ -70230,7 +70676,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/pci-bridge.h po
  
  extern int pcibios_remove_root_bus(struct pci_controller *phb);
  
  
  extern int pcibios_remove_root_bus(struct pci_controller *phb);
  

-@@ -270,20 +267,18 @@
+@@ -270,20 +267,18 @@ extern int pcibios_map_io_space(struct p

  #define PHB_SET_NODE(PHB, NODE)               ((PHB)->node = -1)
  #endif
  
  #define PHB_SET_NODE(PHB, NODE)               ((PHB)->node = -1)
  #endif
  


@@ -70257,7 +70703,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/pci-bridge.h po
  extern void pcibios_free_controller(struct pci_controller *phb);
  
  #ifdef CONFIG_PCI
  extern void pcibios_free_controller(struct pci_controller *phb);
  
  #ifdef CONFIG_PCI

-@@ -298,9 +293,7 @@
+@@ -298,9 +293,7 @@ static inline int pcibios_vaddr_is_iopor

  {
        return 0;
  }
  {
        return 0;
  }


@@ -70270,10 +70716,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/pci-bridge.h po
 -#endif
 +#endif        /* __KERNEL__ */
 +#endif        /* _ASM_POWERPC_PCI_BRIDGE_H */
 -#endif
 +#endif        /* __KERNEL__ */
 +#endif        /* _ASM_POWERPC_PCI_BRIDGE_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/pci.h powerpc.git/include/asm-powerpc/pci.h
---- linux-2.6.24/include/asm-powerpc/pci.h     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/pci.h      2008-01-28 20:26:42.000000000 +0100
-@@ -36,11 +36,10 @@
+Index: linux-2.6.24.7/include/asm-powerpc/pci.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/pci.h
++++ linux-2.6.24.7/include/asm-powerpc/pci.h
+@@ -36,11 +36,10 @@ struct pci_dev;

  
  /*
   * Set this to 1 if you want the kernel to re-assign all PCI
  
  /*
   * Set this to 1 if you want the kernel to re-assign all PCI


@@ -70288,7 +70735,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/pci.h powerpc.g
  #define pcibios_scan_all_fns(a, b)    0
  
  static inline void pcibios_set_master(struct pci_dev *dev)
  #define pcibios_scan_all_fns(a, b)    0
  
  static inline void pcibios_set_master(struct pci_dev *dev)

-@@ -95,9 +94,6 @@
+@@ -95,9 +94,6 @@ static inline void pci_dma_burst_advice(

  #define get_pci_dma_ops()     NULL
  #endif
  
  #define get_pci_dma_ops()     NULL
  #endif
  


@@ -70298,7 +70745,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/pci.h powerpc.g
  #else /* 32-bit */
  
  #ifdef CONFIG_PCI
  #else /* 32-bit */
  
  #ifdef CONFIG_PCI

-@@ -109,17 +105,14 @@
+@@ -109,17 +105,14 @@ static inline void pci_dma_burst_advice(

        *strategy_parameter = ~0UL;
  }
  #endif
        *strategy_parameter = ~0UL;
  }
  #endif


@@ -70320,7 +70767,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/pci.h powerpc.g
  struct vm_area_struct;
  /* Map a range of PCI memory or I/O space for a device into user space */
  int pci_mmap_page_range(struct pci_dev *pdev, struct vm_area_struct *vma,
  struct vm_area_struct;
  /* Map a range of PCI memory or I/O space for a device into user space */
  int pci_mmap_page_range(struct pci_dev *pdev, struct vm_area_struct *vma,

-@@ -199,13 +192,12 @@
+@@ -199,13 +192,12 @@ static inline struct resource *pcibios_s

        return root;
  }
  
        return root;
  }
  


@@ -70336,7 +70783,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/pci.h powerpc.g
  extern struct pci_controller *init_phb_dynamic(struct device_node *dn);
  
  extern struct pci_dev *of_create_pci_dev(struct device_node *node,
  extern struct pci_controller *init_phb_dynamic(struct device_node *dn);
  
  extern struct pci_dev *of_create_pci_dev(struct device_node *node,

-@@ -229,5 +221,8 @@
+@@ -229,5 +221,8 @@ extern void pci_resource_to_user(const s

                                 const struct resource *rsrc,
                                 resource_size_t *start, resource_size_t *end);
  
                                 const struct resource *rsrc,
                                 resource_size_t *start, resource_size_t *end);
  


@@ -70345,10 +70792,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/pci.h powerpc.g
 +
  #endif        /* __KERNEL__ */
  #endif /* __ASM_POWERPC_PCI_H */
 +
  #endif        /* __KERNEL__ */
  #endif /* __ASM_POWERPC_PCI_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/ppc-pci.h powerpc.git/include/asm-powerpc/ppc-pci.h
---- linux-2.6.24/include/asm-powerpc/ppc-pci.h 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/ppc-pci.h  2008-01-28 20:26:42.000000000 +0100
-@@ -22,7 +22,6 @@
+Index: linux-2.6.24.7/include/asm-powerpc/ppc-pci.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/ppc-pci.h
++++ linux-2.6.24.7/include/asm-powerpc/ppc-pci.h
+@@ -22,7 +22,6 @@ extern void pci_setup_phb_io_dynamic(str

  
  
  extern struct list_head hose_list;
  
  
  extern struct list_head hose_list;


@@ -70356,7 +70804,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/ppc-pci.h power
  
  extern void find_and_init_phbs(void);
  
  
  extern void find_and_init_phbs(void);
  

-@@ -47,9 +46,6 @@
+@@ -47,9 +46,6 @@ extern void init_pci_config_tokens (void

  extern unsigned long get_phb_buid (struct device_node *);
  extern int rtas_setup_phb(struct pci_controller *phb);
  
  extern unsigned long get_phb_buid (struct device_node *);
  extern int rtas_setup_phb(struct pci_controller *phb);
  


@@ -70366,10 +70814,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/ppc-pci.h power
  extern unsigned long pci_probe_only;
  
  /* ---- EEH internal-use-only related routines ---- */
  extern unsigned long pci_probe_only;
  
  /* ---- EEH internal-use-only related routines ---- */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/prom.h powerpc.git/include/asm-powerpc/prom.h
---- linux-2.6.24/include/asm-powerpc/prom.h    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/prom.h     2008-01-28 20:26:42.000000000 +0100
-@@ -202,6 +202,10 @@
+Index: linux-2.6.24.7/include/asm-powerpc/prom.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/prom.h
++++ linux-2.6.24.7/include/asm-powerpc/prom.h
+@@ -202,6 +202,10 @@ static inline unsigned long of_read_ulon

   */
  extern u64 of_translate_address(struct device_node *np, const u32 *addr);
  
   */
  extern u64 of_translate_address(struct device_node *np, const u32 *addr);
  


@@ -70380,9 +70829,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/prom.h powerpc.
  /* Extract an address from a device, returns the region size and
   * the address space flags too. The PCI version uses a BAR number
   * instead of an absolute index
  /* Extract an address from a device, returns the region size and
   * the address space flags too. The PCI version uses a BAR number
   * instead of an absolute index

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/ps3.h powerpc.git/include/asm-powerpc/ps3.h
---- linux-2.6.24/include/asm-powerpc/ps3.h     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/ps3.h      2008-01-28 20:26:42.000000000 +0100
+Index: linux-2.6.24.7/include/asm-powerpc/ps3.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/ps3.h
++++ linux-2.6.24.7/include/asm-powerpc/ps3.h

 @@ -24,6 +24,7 @@
  #include <linux/init.h>
  #include <linux/types.h>
 @@ -24,6 +24,7 @@
  #include <linux/init.h>
  #include <linux/types.h>


@@ -70391,7 +70841,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/ps3.h powerpc.g
  
  union ps3_firmware_version {
        u64 raw;
  
  union ps3_firmware_version {
        u64 raw;

-@@ -317,6 +318,7 @@
+@@ -317,6 +318,7 @@ enum ps3_match_id {

        PS3_MATCH_ID_STOR_FLASH     = 8,
        PS3_MATCH_ID_SOUND          = 9,
        PS3_MATCH_ID_GRAPHICS       = 10,
        PS3_MATCH_ID_STOR_FLASH     = 8,
        PS3_MATCH_ID_SOUND          = 9,
        PS3_MATCH_ID_GRAPHICS       = 10,


@@ -70399,7 +70849,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/ps3.h powerpc.g
  };
  
  #define PS3_MODULE_ALIAS_EHCI           "ps3:1"
  };
  
  #define PS3_MODULE_ALIAS_EHCI           "ps3:1"

-@@ -329,11 +331,13 @@
+@@ -329,11 +331,13 @@ enum ps3_match_id {

  #define PS3_MODULE_ALIAS_STOR_FLASH     "ps3:8"
  #define PS3_MODULE_ALIAS_SOUND          "ps3:9"
  #define PS3_MODULE_ALIAS_GRAPHICS       "ps3:10"
  #define PS3_MODULE_ALIAS_STOR_FLASH     "ps3:8"
  #define PS3_MODULE_ALIAS_SOUND          "ps3:9"
  #define PS3_MODULE_ALIAS_GRAPHICS       "ps3:10"


@@ -70413,7 +70863,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/ps3.h powerpc.g
  };
  
  /**
  };
  
  /**

-@@ -344,12 +348,17 @@
+@@ -344,12 +348,17 @@ struct ps3_system_bus_device {

        enum ps3_match_id match_id;
        enum ps3_system_bus_device_type dev_type;
  
        enum ps3_match_id match_id;
        enum ps3_system_bus_device_type dev_type;
  


@@ -70433,7 +70883,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/ps3.h powerpc.g
  
  /*    struct iommu_table *iommu_table; -- waiting for BenH's cleanups */
        struct device core;
  
  /*    struct iommu_table *iommu_table; -- waiting for BenH's cleanups */
        struct device core;

-@@ -438,5 +447,66 @@
+@@ -438,5 +447,66 @@ struct ps3_prealloc {

  extern struct ps3_prealloc ps3fb_videomemory;
  extern struct ps3_prealloc ps3flash_bounce_buffer;
  
  extern struct ps3_prealloc ps3fb_videomemory;
  extern struct ps3_prealloc ps3flash_bounce_buffer;
  


@@ -70500,10 +70950,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/ps3.h powerpc.g
 +u64 ps3_get_spe_id(void *arg);
  
  #endif
 +u64 ps3_get_spe_id(void *arg);
  
  #endif

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/ptrace.h powerpc.git/include/asm-powerpc/ptrace.h
---- linux-2.6.24/include/asm-powerpc/ptrace.h  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/ptrace.h   2008-01-28 20:26:42.000000000 +0100
-@@ -106,7 +106,8 @@
+Index: linux-2.6.24.7/include/asm-powerpc/ptrace.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/ptrace.h
++++ linux-2.6.24.7/include/asm-powerpc/ptrace.h
+@@ -106,7 +106,8 @@ extern int ptrace_put_reg(struct task_st

   */
  #define FULL_REGS(regs)               (((regs)->trap & 1) == 0)
  #ifndef __powerpc64__
   */
  #define FULL_REGS(regs)               (((regs)->trap & 1) == 0)
  #ifndef __powerpc64__


@@ -70513,9 +70964,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/ptrace.h powerp
  #endif /* ! __powerpc64__ */
  #define TRAP(regs)            ((regs)->trap & ~0xF)
  #ifdef __powerpc64__
  #endif /* ! __powerpc64__ */
  #define TRAP(regs)            ((regs)->trap & ~0xF)
  #ifdef __powerpc64__

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/qe.h powerpc.git/include/asm-powerpc/qe.h
---- linux-2.6.24/include/asm-powerpc/qe.h      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/qe.h       2008-01-28 20:26:42.000000000 +0100
+Index: linux-2.6.24.7/include/asm-powerpc/qe.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/qe.h
++++ linux-2.6.24.7/include/asm-powerpc/qe.h

 @@ -28,6 +28,52 @@
  #define MEM_PART_SECONDARY    1
  #define MEM_PART_MURAM                2
 @@ -28,6 +28,52 @@
  #define MEM_PART_SECONDARY    1
  #define MEM_PART_MURAM                2


@@ -70569,7 +71021,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/qe.h powerpc.gi
  /* Export QE common operations */
  extern void qe_reset(void);
  extern int par_io_init(struct device_node *np);
  /* Export QE common operations */
  extern void qe_reset(void);
  extern int par_io_init(struct device_node *np);

-@@ -38,7 +84,8 @@
+@@ -38,7 +84,8 @@ extern int par_io_data_set(u8 port, u8 p

  
  /* QE internal API */
  int qe_issue_cmd(u32 cmd, u32 device, u8 mcn_protocol, u32 cmd_input);
  
  /* QE internal API */
  int qe_issue_cmd(u32 cmd, u32 device, u8 mcn_protocol, u32 cmd_input);


@@ -70579,7 +71031,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/qe.h powerpc.gi
  int qe_get_snum(void);
  void qe_put_snum(u8 snum);
  unsigned long qe_muram_alloc(int size, int align);
  int qe_get_snum(void);
  void qe_put_snum(u8 snum);
  unsigned long qe_muram_alloc(int size, int align);

-@@ -47,6 +94,58 @@
+@@ -47,6 +94,58 @@ unsigned long qe_muram_alloc_fixed(unsig

  void qe_muram_dump(void);
  void *qe_muram_addr(unsigned long offset);
  
  void qe_muram_dump(void);
  void *qe_muram_addr(unsigned long offset);
  


@@ -70638,7 +71090,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/qe.h powerpc.gi
  /* Buffer descriptors */
  struct qe_bd {
        __be16 status;
  /* Buffer descriptors */
  struct qe_bd {
        __be16 status;

-@@ -129,52 +228,6 @@
+@@ -129,52 +228,6 @@ enum comm_dir {

        COMM_DIR_RX_AND_TX = 3
  };
  
        COMM_DIR_RX_AND_TX = 3
  };
  


@@ -70691,7 +71143,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/qe.h powerpc.gi
  /* QE CMXUCR Registers.
   * There are two UCCs represented in each of the four CMXUCR registers.
   * These values are for the UCC in the LSBs
  /* QE CMXUCR Registers.
   * There are two UCCs represented in each of the four CMXUCR registers.
   * These values are for the UCC in the LSBs

-@@ -328,6 +381,15 @@
+@@ -328,6 +381,15 @@ enum qe_clock {

  
  #define QE_SDEBCR_BA_MASK     0x01FFFFFF
  
  
  #define QE_SDEBCR_BA_MASK     0x01FFFFFF
  


@@ -70707,9 +71159,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/qe.h powerpc.gi
  /* UPC */
  #define UPGCR_PROTOCOL        0x80000000      /* protocol ul2 or pl2 */
  #define UPGCR_TMS     0x40000000      /* Transmit master/slave mode */
  /* UPC */
  #define UPGCR_PROTOCOL        0x80000000      /* protocol ul2 or pl2 */
  #define UPGCR_TMS     0x40000000      /* Transmit master/slave mode */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/reg.h powerpc.git/include/asm-powerpc/reg.h
---- linux-2.6.24/include/asm-powerpc/reg.h     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/reg.h      2008-01-28 20:26:42.000000000 +0100
+Index: linux-2.6.24.7/include/asm-powerpc/reg.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/reg.h
++++ linux-2.6.24.7/include/asm-powerpc/reg.h

 @@ -553,6 +553,7 @@
  #define SPRN_PA6T_BTCR        978     /* Breakpoint and Tagging Control Register */
  #define SPRN_PA6T_IMAAT       979     /* Instruction Match Array Action Table */
 @@ -553,6 +553,7 @@
  #define SPRN_PA6T_BTCR        978     /* Breakpoint and Tagging Control Register */
  #define SPRN_PA6T_IMAAT       979     /* Instruction Match Array Action Table */


@@ -70731,9 +71184,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/reg.h powerpc.g
  /* Macros for setting and retrieving special purpose registers */
  #ifndef __ASSEMBLY__
  #define mfmsr()               ({unsigned long rval; \
  /* Macros for setting and retrieving special purpose registers */
  #ifndef __ASSEMBLY__
  #define mfmsr()               ({unsigned long rval; \

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/reg_booke.h powerpc.git/include/asm-powerpc/reg_booke.h
---- linux-2.6.24/include/asm-powerpc/reg_booke.h       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/reg_booke.h        2008-01-28 20:26:42.000000000 +0100
+Index: linux-2.6.24.7/include/asm-powerpc/reg_booke.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/reg_booke.h
++++ linux-2.6.24.7/include/asm-powerpc/reg_booke.h

 @@ -123,16 +123,23 @@
  #define SPRN_SPEFSCR  0x200   /* SPE & Embedded FP Status & Control */
  #define SPRN_BBEAR    0x201   /* Branch Buffer Entry Address Register */
 @@ -123,16 +123,23 @@
  #define SPRN_SPEFSCR  0x200   /* SPE & Embedded FP Status & Control */
  #define SPRN_BBEAR    0x201   /* Branch Buffer Entry Address Register */


@@ -70812,9 +71266,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/reg_booke.h pow
  #define ESR_PTR               0x02000000      /* Program Exception - Trap */
  #define ESR_FP                0x01000000      /* Floating Point Operation */
  #define ESR_DST               0x00800000      /* Storage Exception - Data miss */
  #define ESR_PTR               0x02000000      /* Program Exception - Trap */
  #define ESR_FP                0x01000000      /* Floating Point Operation */
  #define ESR_DST               0x00800000      /* Storage Exception - Data miss */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/setjmp.h powerpc.git/include/asm-powerpc/setjmp.h
---- linux-2.6.24/include/asm-powerpc/setjmp.h  1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/setjmp.h   2008-01-28 20:26:42.000000000 +0100
+Index: linux-2.6.24.7/include/asm-powerpc/setjmp.h
+===================================================================
+--- /dev/null
++++ linux-2.6.24.7/include/asm-powerpc/setjmp.h

 @@ -0,0 +1,18 @@
 +/*
 + * Copyright © 2008 Michael Neuling IBM Corporation
 @@ -0,0 +1,18 @@
 +/*
 + * Copyright © 2008 Michael Neuling IBM Corporation


@@ -70834,9 +71289,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/setjmp.h powerp
 +extern void longjmp(long *, long);
 +
 +#endif /* _ASM_POWERPC_SETJMP_H */
 +extern void longjmp(long *, long);
 +
 +#endif /* _ASM_POWERPC_SETJMP_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/smu.h powerpc.git/include/asm-powerpc/smu.h
---- linux-2.6.24/include/asm-powerpc/smu.h     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/smu.h      2008-01-28 20:26:42.000000000 +0100
+Index: linux-2.6.24.7/include/asm-powerpc/smu.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/smu.h
++++ linux-2.6.24.7/include/asm-powerpc/smu.h

 @@ -22,7 +22,7 @@
   * Partition info commands
   *
 @@ -22,7 +22,7 @@
   * Partition info commands
   *


@@ -71021,7 +71477,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/smu.h powerpc.g
  
  /*
   * - Kernel side interface -
  
  /*
   * - Kernel side interface -

-@@ -564,13 +688,13 @@
+@@ -564,13 +688,13 @@ struct smu_user_cmd_hdr

  
        __u8            cmd;                    /* SMU command byte */
        __u8            pad[3];                 /* padding */
  
        __u8            cmd;                    /* SMU command byte */
        __u8            pad[3];                 /* padding */


@@ -71037,9 +71493,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/smu.h powerpc.g
  };
  
  #endif /*  _SMU_H */
  };
  
  #endif /*  _SMU_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/sparsemem.h powerpc.git/include/asm-powerpc/sparsemem.h
---- linux-2.6.24/include/asm-powerpc/sparsemem.h       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/sparsemem.h        2008-01-28 20:26:42.000000000 +0100
+Index: linux-2.6.24.7/include/asm-powerpc/sparsemem.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/sparsemem.h
++++ linux-2.6.24.7/include/asm-powerpc/sparsemem.h

 @@ -10,13 +10,8 @@
   */
  #define SECTION_SIZE_BITS       24
 @@ -10,13 +10,8 @@
   */
  #define SECTION_SIZE_BITS       24


@@ -71054,9 +71511,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/sparsemem.h pow
  
  #ifdef CONFIG_MEMORY_HOTPLUG
  extern void create_section_mapping(unsigned long start, unsigned long end);
  
  #ifdef CONFIG_MEMORY_HOTPLUG
  extern void create_section_mapping(unsigned long start, unsigned long end);

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/spu.h powerpc.git/include/asm-powerpc/spu.h
---- linux-2.6.24/include/asm-powerpc/spu.h     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/spu.h      2008-01-28 20:26:42.000000000 +0100
+Index: linux-2.6.24.7/include/asm-powerpc/spu.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/spu.h
++++ linux-2.6.24.7/include/asm-powerpc/spu.h

 @@ -104,6 +104,7 @@
  
  struct spu_context;
 @@ -104,6 +104,7 @@
  
  struct spu_context;


@@ -71065,7 +71523,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/spu.h powerpc.g
  struct device_node;
  
  enum spu_utilization_state {
  struct device_node;
  
  enum spu_utilization_state {

-@@ -145,7 +146,6 @@
+@@ -145,7 +146,6 @@ struct spu {

        void (* ibox_callback)(struct spu *spu);
        void (* stop_callback)(struct spu *spu);
        void (* mfc_callback)(struct spu *spu);
        void (* ibox_callback)(struct spu *spu);
        void (* stop_callback)(struct spu *spu);
        void (* mfc_callback)(struct spu *spu);


@@ -71073,7 +71531,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/spu.h powerpc.g
  
        char irq_c0[8];
        char irq_c1[8];
  
        char irq_c0[8];
        char irq_c1[8];

-@@ -196,10 +196,11 @@
+@@ -196,10 +196,11 @@ struct cbe_spu_info {

  extern struct cbe_spu_info cbe_spu_info[];
  
  void spu_init_channels(struct spu *spu);
  extern struct cbe_spu_info cbe_spu_info[];
  
  void spu_init_channels(struct spu *spu);


@@ -71087,7 +71545,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/spu.h powerpc.g
  #ifdef CONFIG_KEXEC
  void crash_register_spus(struct list_head *list);
  #else
  #ifdef CONFIG_KEXEC
  void crash_register_spus(struct list_head *list);
  #else

-@@ -210,6 +211,7 @@
+@@ -210,6 +211,7 @@ static inline void crash_register_spus(s

  
  extern void spu_invalidate_slbs(struct spu *spu);
  extern void spu_associate_mm(struct spu *spu, struct mm_struct *mm);
  
  extern void spu_invalidate_slbs(struct spu *spu);
  extern void spu_associate_mm(struct spu *spu, struct mm_struct *mm);


@@ -71095,7 +71553,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/spu.h powerpc.g
  
  /* Calls from the memory management to the SPU */
  struct mm_struct;
  
  /* Calls from the memory management to the SPU */
  struct mm_struct;

-@@ -279,6 +281,8 @@
+@@ -279,6 +281,8 @@ void spu_remove_sysdev_attr(struct sysde

  int spu_add_sysdev_attr_group(struct attribute_group *attrs);
  void spu_remove_sysdev_attr_group(struct attribute_group *attrs);
  
  int spu_add_sysdev_attr_group(struct attribute_group *attrs);
  void spu_remove_sysdev_attr_group(struct attribute_group *attrs);
  


@@ -71104,7 +71562,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/spu.h powerpc.g
  
  /*
   * Notifier blocks:
  
  /*
   * Notifier blocks:

-@@ -303,7 +307,7 @@
+@@ -303,7 +307,7 @@ extern void notify_spus_active(void);

  extern void do_notify_spus_active(void);
  
  /*
  extern void do_notify_spus_active(void);
  
  /*


@@ -71113,7 +71571,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/spu.h powerpc.g
   */
  
  union mfc_tag_size_class_cmd {
   */
  
  union mfc_tag_size_class_cmd {

-@@ -524,8 +528,24 @@
+@@ -524,8 +528,24 @@ struct spu_priv1 {

  #define CLASS2_ENABLE_SPU_STOP_INTR                   0x2L
  #define CLASS2_ENABLE_SPU_HALT_INTR                   0x4L
  #define CLASS2_ENABLE_SPU_DMA_TAG_GROUP_COMPLETE_INTR 0x8L
  #define CLASS2_ENABLE_SPU_STOP_INTR                   0x2L
  #define CLASS2_ENABLE_SPU_HALT_INTR                   0x4L
  #define CLASS2_ENABLE_SPU_DMA_TAG_GROUP_COMPLETE_INTR 0x8L


@@ -71138,10 +71596,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/spu.h powerpc.g
        u8  pad_0x158_0x180[0x28];                              /* 0x158 */
        u64 int_route_RW;                                       /* 0x180 */
  
        u8  pad_0x158_0x180[0x28];                              /* 0x158 */
        u64 int_route_RW;                                       /* 0x180 */
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/spu_csa.h powerpc.git/include/asm-powerpc/spu_csa.h
---- linux-2.6.24/include/asm-powerpc/spu_csa.h 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/spu_csa.h  2008-01-28 20:26:42.000000000 +0100
-@@ -194,7 +194,7 @@
+Index: linux-2.6.24.7/include/asm-powerpc/spu_csa.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/spu_csa.h
++++ linux-2.6.24.7/include/asm-powerpc/spu_csa.h
+@@ -194,7 +194,7 @@ struct spu_priv1_collapsed {

  };
  
  /*
  };
  
  /*


@@ -71150,7 +71609,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/spu_csa.h power
   */
  struct spu_priv2_collapsed {
        u64 slb_index_W;
   */
  struct spu_priv2_collapsed {
        u64 slb_index_W;

-@@ -254,20 +254,11 @@
+@@ -254,20 +254,11 @@ struct spu_state {

        u64 spu_chnldata_RW[32];
        u32 spu_mailbox_data[4];
        u32 pu_mailbox_data[1];
        u64 spu_chnldata_RW[32];
        u32 spu_mailbox_data[4];
        u32 pu_mailbox_data[1];


@@ -71172,9 +71631,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/spu_csa.h power
  #endif /* !__SPU__ */
  #endif /* __KERNEL__ */
  #endif /* !__ASSEMBLY__ */
  #endif /* !__SPU__ */
  #endif /* __KERNEL__ */
  #endif /* !__ASSEMBLY__ */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/spu_priv1.h powerpc.git/include/asm-powerpc/spu_priv1.h
---- linux-2.6.24/include/asm-powerpc/spu_priv1.h       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/spu_priv1.h        2008-01-28 20:26:42.000000000 +0100
+Index: linux-2.6.24.7/include/asm-powerpc/spu_priv1.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/spu_priv1.h
++++ linux-2.6.24.7/include/asm-powerpc/spu_priv1.h

 @@ -24,6 +24,7 @@
  #include <linux/types.h>
  
 @@ -24,6 +24,7 @@
  #include <linux/types.h>
  


@@ -71183,7 +71643,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/spu_priv1.h pow
  
  /* access to priv1 registers */
  
  
  /* access to priv1 registers */
  

-@@ -178,6 +179,8 @@
+@@ -178,6 +179,8 @@ struct spu_management_ops {

        int (*enumerate_spus)(int (*fn)(void *data));
        int (*create_spu)(struct spu *spu, void *data);
        int (*destroy_spu)(struct spu *spu);
        int (*enumerate_spus)(int (*fn)(void *data));
        int (*create_spu)(struct spu *spu, void *data);
        int (*destroy_spu)(struct spu *spu);


@@ -71192,7 +71652,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/spu_priv1.h pow
        int (*init_affinity)(void);
  };
  
        int (*init_affinity)(void);
  };
  

-@@ -207,6 +210,18 @@
+@@ -207,6 +210,18 @@ spu_init_affinity (void)

        return spu_management_ops->init_affinity();
  }
  
        return spu_management_ops->init_affinity();
  }
  


@@ -71211,10 +71671,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/spu_priv1.h pow
  /*
   * The declarations folowing are put here for convenience
   * and only intended to be used by the platform setup code.
  /*
   * The declarations folowing are put here for convenience
   * and only intended to be used by the platform setup code.

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/system.h powerpc.git/include/asm-powerpc/system.h
---- linux-2.6.24/include/asm-powerpc/system.h  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/system.h   2008-01-28 20:26:42.000000000 +0100
-@@ -169,6 +169,8 @@
+Index: linux-2.6.24.7/include/asm-powerpc/system.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/system.h
++++ linux-2.6.24.7/include/asm-powerpc/system.h
+@@ -169,6 +169,8 @@ extern int do_page_fault(struct pt_regs 

  extern void bad_page_fault(struct pt_regs *, unsigned long, int);
  extern int die(const char *, struct pt_regs *, long);
  extern void _exception(int, struct pt_regs *, int, unsigned long);
  extern void bad_page_fault(struct pt_regs *, unsigned long, int);
  extern int die(const char *, struct pt_regs *, long);
  extern void _exception(int, struct pt_regs *, int, unsigned long);


@@ -71223,10 +71684,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/system.h powerp
  #ifdef CONFIG_BOOKE_WDT
  extern u32 booke_wdt_enabled;
  extern u32 booke_wdt_period;
  #ifdef CONFIG_BOOKE_WDT
  extern u32 booke_wdt_enabled;
  extern u32 booke_wdt_period;

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/udbg.h powerpc.git/include/asm-powerpc/udbg.h
---- linux-2.6.24/include/asm-powerpc/udbg.h    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/udbg.h     2008-01-28 20:26:42.000000000 +0100
-@@ -48,6 +48,7 @@
+Index: linux-2.6.24.7/include/asm-powerpc/udbg.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-powerpc/udbg.h
++++ linux-2.6.24.7/include/asm-powerpc/udbg.h
+@@ -48,6 +48,7 @@ extern void __init udbg_init_rtas_consol

  extern void __init udbg_init_debug_beat(void);
  extern void __init udbg_init_btext(void);
  extern void __init udbg_init_44x_as1(void);
  extern void __init udbg_init_debug_beat(void);
  extern void __init udbg_init_btext(void);
  extern void __init udbg_init_44x_as1(void);


@@ -71234,10 +71696,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/udbg.h powerpc.
  extern void __init udbg_init_cpm(void);
  
  #endif /* __KERNEL__ */
  extern void __init udbg_init_cpm(void);
  
  #endif /* __KERNEL__ */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-ppc/8xx_immap.h powerpc.git/include/asm-ppc/8xx_immap.h
---- linux-2.6.24/include/asm-ppc/8xx_immap.h   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-ppc/8xx_immap.h    2008-01-28 20:26:42.000000000 +0100
-@@ -123,7 +123,7 @@
+Index: linux-2.6.24.7/include/asm-ppc/8xx_immap.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-ppc/8xx_immap.h
++++ linux-2.6.24.7/include/asm-ppc/8xx_immap.h
+@@ -123,7 +123,7 @@ typedef struct     mem_ctlr {

  #define OR_G5LA               0x00000400      /* Output #GPL5 on #GPL_A5              */
  #define OR_G5LS               0x00000200      /* Drive #GPL high on falling edge of...*/
  #define OR_BI         0x00000100      /* Burst inhibit                        */
  #define OR_G5LA               0x00000400      /* Output #GPL5 on #GPL_A5              */
  #define OR_G5LS               0x00000200      /* Drive #GPL high on falling edge of...*/
  #define OR_BI         0x00000100      /* Burst inhibit                        */


@@ -71246,10 +71709,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-ppc/8xx_immap.h powerpc
  #define OR_SCY_0_CLK  0x00000000      /* 0 clock cycles wait states           */
  #define OR_SCY_1_CLK  0x00000010      /* 1 clock cycles wait states           */
  #define OR_SCY_2_CLK  0x00000020      /* 2 clock cycles wait states           */
  #define OR_SCY_0_CLK  0x00000000      /* 0 clock cycles wait states           */
  #define OR_SCY_1_CLK  0x00000010      /* 1 clock cycles wait states           */
  #define OR_SCY_2_CLK  0x00000020      /* 2 clock cycles wait states           */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-ppc/commproc.h powerpc.git/include/asm-ppc/commproc.h
---- linux-2.6.24/include/asm-ppc/commproc.h    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-ppc/commproc.h     2008-01-28 20:26:42.000000000 +0100
-@@ -681,7 +681,7 @@
+Index: linux-2.6.24.7/include/asm-ppc/commproc.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-ppc/commproc.h
++++ linux-2.6.24.7/include/asm-ppc/commproc.h
+@@ -681,7 +681,7 @@ typedef struct risc_timer_pram {

  #define       CICR_SCC_SCC3           ((uint)0x00200000)      /* SCC3 @ SCCc */
  #define       CICR_SCB_SCC2           ((uint)0x00040000)      /* SCC2 @ SCCb */
  #define       CICR_SCA_SCC1           ((uint)0x00000000)      /* SCC1 @ SCCa */
  #define       CICR_SCC_SCC3           ((uint)0x00200000)      /* SCC3 @ SCCc */
  #define       CICR_SCB_SCC2           ((uint)0x00040000)      /* SCC2 @ SCCb */
  #define       CICR_SCA_SCC1           ((uint)0x00000000)      /* SCC1 @ SCCa */


@@ -71258,10 +71722,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-ppc/commproc.h powerpc.
  #define CICR_HP_MASK          ((uint)0x00001f00)      /* Hi-pri int. */
  #define CICR_IEN              ((uint)0x00000080)      /* Int. enable */
  #define CICR_SPS              ((uint)0x00000001)      /* SCC Spread */
  #define CICR_HP_MASK          ((uint)0x00001f00)      /* Hi-pri int. */
  #define CICR_IEN              ((uint)0x00000080)      /* Int. enable */
  #define CICR_SPS              ((uint)0x00000001)      /* SCC Spread */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-ppc/mmu.h powerpc.git/include/asm-ppc/mmu.h
---- linux-2.6.24/include/asm-ppc/mmu.h 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-ppc/mmu.h  2008-01-28 20:26:43.000000000 +0100
-@@ -383,6 +383,12 @@
+Index: linux-2.6.24.7/include/asm-ppc/mmu.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-ppc/mmu.h
++++ linux-2.6.24.7/include/asm-ppc/mmu.h
+@@ -383,6 +383,12 @@ typedef struct _P601_BAT {

  #define BOOKE_PAGESZ_256GB    14
  #define BOOKE_PAGESZ_1TB      15
  
  #define BOOKE_PAGESZ_256GB    14
  #define BOOKE_PAGESZ_1TB      15
  


@@ -71274,10 +71739,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-ppc/mmu.h powerpc.git/i
  /*
   * Freescale Book-E MMU support
   */
  /*
   * Freescale Book-E MMU support
   */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-ppc/mpc52xx_psc.h powerpc.git/include/asm-ppc/mpc52xx_psc.h
---- linux-2.6.24/include/asm-ppc/mpc52xx_psc.h 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-ppc/mpc52xx_psc.h  2008-01-28 20:26:43.000000000 +0100
-@@ -159,6 +159,9 @@
+Index: linux-2.6.24.7/include/asm-ppc/mpc52xx_psc.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-ppc/mpc52xx_psc.h
++++ linux-2.6.24.7/include/asm-ppc/mpc52xx_psc.h
+@@ -159,6 +159,9 @@ struct mpc52xx_psc {

        u8              reserved16[3];
        u8              irfdr;          /* PSC + 0x54 */
        u8              reserved17[3];
        u8              reserved16[3];
        u8              irfdr;          /* PSC + 0x54 */
        u8              reserved17[3];


@@ -71287,9 +71753,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-ppc/mpc52xx_psc.h power
        u16             rfnum;          /* PSC + 0x58 */
        u16             reserved18;
        u16             tfnum;          /* PSC + 0x5c */
        u16             rfnum;          /* PSC + 0x58 */
        u16             reserved18;
        u16             tfnum;          /* PSC + 0x5c */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-ppc/reg_booke.h powerpc.git/include/asm-ppc/reg_booke.h
---- linux-2.6.24/include/asm-ppc/reg_booke.h   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-ppc/reg_booke.h    2008-01-28 20:26:43.000000000 +0100
+Index: linux-2.6.24.7/include/asm-ppc/reg_booke.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-ppc/reg_booke.h
++++ linux-2.6.24.7/include/asm-ppc/reg_booke.h

 @@ -207,7 +207,7 @@
  #define       CCR1_TCS        0x00000080 /* Timer Clock Select */
  
 @@ -207,7 +207,7 @@
  #define       CCR1_TCS        0x00000080 /* Timer Clock Select */
  


@@ -71308,9 +71775,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-ppc/reg_booke.h powerpc
  #define ESR_PTR               0x02000000      /* Program Exception - Trap */
  #define ESR_FP                0x01000000      /* Floating Point Operation */
  #define ESR_DST               0x00800000      /* Storage Exception - Data miss */
  #define ESR_PTR               0x02000000      /* Program Exception - Trap */
  #define ESR_FP                0x01000000      /* Floating Point Operation */
  #define ESR_DST               0x00800000      /* Storage Exception - Data miss */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/linux/of.h powerpc.git/include/linux/of.h
---- linux-2.6.24/include/linux/of.h    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/linux/of.h     2008-01-28 20:26:44.000000000 +0100
+Index: linux-2.6.24.7/include/linux/of.h
+===================================================================
+--- linux-2.6.24.7.orig/include/linux/of.h
++++ linux-2.6.24.7/include/linux/of.h

 @@ -17,6 +17,7 @@
   */
  #include <linux/types.h>
 @@ -17,6 +17,7 @@
   */
  #include <linux/types.h>


@@ -71319,7 +71787,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/linux/of.h powerpc.git/incl
  
  #include <asm/prom.h>
  
  
  #include <asm/prom.h>
  

-@@ -41,11 +42,20 @@
+@@ -41,11 +42,20 @@ extern struct device_node *of_find_compa

  #define for_each_compatible_node(dn, type, compatible) \
        for (dn = of_find_compatible_node(NULL, type, compatible); dn; \
             dn = of_find_compatible_node(dn, type, compatible))
  #define for_each_compatible_node(dn, type, compatible) \
        for (dn = of_find_compatible_node(NULL, type, compatible); dn; \
             dn = of_find_compatible_node(dn, type, compatible))


@@ -71340,7 +71808,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/linux/of.h powerpc.git/incl
  extern struct property *of_find_property(const struct device_node *np,
                                         const char *name,
                                         int *lenp);
  extern struct property *of_find_property(const struct device_node *np,
                                         const char *name,
                                         int *lenp);

-@@ -56,5 +66,7 @@
+@@ -56,5 +66,7 @@ extern const void *of_get_property(const

                                int *lenp);
  extern int of_n_addr_cells(struct device_node *np);
  extern int of_n_size_cells(struct device_node *np);
                                int *lenp);
  extern int of_n_addr_cells(struct device_node *np);
  extern int of_n_size_cells(struct device_node *np);


@@ -71348,9 +71816,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/linux/of.h powerpc.git/incl
 +      const struct of_device_id *matches, const struct device_node *node);
  
  #endif /* _LINUX_OF_H */
 +      const struct of_device_id *matches, const struct device_node *node);
  
  #endif /* _LINUX_OF_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/linux/of_device.h powerpc.git/include/linux/of_device.h
---- linux-2.6.24/include/linux/of_device.h     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/linux/of_device.h      2008-01-28 20:26:44.000000000 +0100
+Index: linux-2.6.24.7/include/linux/of_device.h
+===================================================================
+--- linux-2.6.24.7.orig/include/linux/of_device.h
++++ linux-2.6.24.7/include/linux/of_device.h

 @@ -10,8 +10,6 @@
  
  #define       to_of_device(d) container_of(d, struct of_device, dev)
 @@ -10,8 +10,6 @@
  
  #define       to_of_device(d) container_of(d, struct of_device, dev)


@@ -71360,10 +71829,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/linux/of_device.h powerpc.g
  extern const struct of_device_id *of_match_device(
        const struct of_device_id *matches, const struct of_device *dev);
  
  extern const struct of_device_id *of_match_device(
        const struct of_device_id *matches, const struct of_device *dev);
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/linux/pata_platform.h powerpc.git/include/linux/pata_platform.h
---- linux-2.6.24/include/linux/pata_platform.h 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/linux/pata_platform.h  2008-01-28 20:26:44.000000000 +0100
-@@ -15,4 +15,13 @@
+Index: linux-2.6.24.7/include/linux/pata_platform.h
+===================================================================
+--- linux-2.6.24.7.orig/include/linux/pata_platform.h
++++ linux-2.6.24.7/include/linux/pata_platform.h
+@@ -15,4 +15,13 @@ struct pata_platform_info {

        unsigned int irq_flags;
  };
  
        unsigned int irq_flags;
  };
  


@@ -71377,9 +71847,10 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/linux/pata_platform.h power
 +extern int __devexit __pata_platform_remove(struct device *dev);
 +
  #endif /* __LINUX_PATA_PLATFORM_H */
 +extern int __devexit __pata_platform_remove(struct device *dev);
 +
  #endif /* __LINUX_PATA_PLATFORM_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/linux/phy_fixed.h powerpc.git/include/linux/phy_fixed.h
---- linux-2.6.24/include/linux/phy_fixed.h     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/linux/phy_fixed.h      2008-01-28 20:26:44.000000000 +0100
+Index: linux-2.6.24.7/include/linux/phy_fixed.h
+===================================================================
+--- linux-2.6.24.7.orig/include/linux/phy_fixed.h
++++ linux-2.6.24.7/include/linux/phy_fixed.h

 @@ -1,38 +1,31 @@
  #ifndef __PHY_FIXED_H
  #define __PHY_FIXED_H
 @@ -1,38 +1,31 @@
  #ifndef __PHY_FIXED_H
  #define __PHY_FIXED_H


@@ -71441,10 +71912,11 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/linux/phy_fixed.h powerpc.g
 +                                         struct fixed_phy_status *));
  
  #endif /* __PHY_FIXED_H */
 +                                         struct fixed_phy_status *));
  
  #endif /* __PHY_FIXED_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/linux/pmu.h powerpc.git/include/linux/pmu.h
---- linux-2.6.24/include/linux/pmu.h   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/linux/pmu.h    2008-01-28 20:26:44.000000000 +0100
-@@ -159,41 +159,7 @@
+Index: linux-2.6.24.7/include/linux/pmu.h
+===================================================================
+--- linux-2.6.24.7.orig/include/linux/pmu.h
++++ linux-2.6.24.7/include/linux/pmu.h
+@@ -159,41 +159,7 @@ extern void pmu_unlock(void);

  extern int pmu_present(void);
  extern int pmu_get_model(void);
  
  extern int pmu_present(void);
  extern int pmu_get_model(void);
  

diff --git a/target/linux/generic-2.6/patches-2.6.24/801-usb_serial_endpoint_size.patch b/target/linux/generic-2.6/patches-2.6.24/801-usb_serial_endpoint_size.patch
index 5b61c73..dc9d9c7 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/801-usb_serial_endpoint_size.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/801-usb_serial_endpoint_size.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23-rc6/drivers/usb/serial/usb-serial.c
+Index: linux-2.6.24.7/drivers/usb/serial/usb-serial.c

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/drivers/usb/serial/usb-serial.c      2007-09-21 16:23:52.000000000 +0800
-+++ linux-2.6.23-rc6/drivers/usb/serial/usb-serial.c   2007-09-21 16:24:09.000000000 +0800
-@@ -58,6 +58,7 @@
+--- linux-2.6.24.7.orig/drivers/usb/serial/usb-serial.c
++++ linux-2.6.24.7/drivers/usb/serial/usb-serial.c
+@@ -58,6 +58,7 @@ static struct usb_driver usb_serial_driv

     drivers depend on it.
  */
  
     drivers depend on it.
  */
  


@@ -10,7 +10,7 @@ Index: linux-2.6.23-rc6/drivers/usb/serial/usb-serial.c
  static int debug;
  static struct usb_serial *serial_table[SERIAL_TTY_MINORS];    /* initially all NULL */
  static DEFINE_MUTEX(table_lock);
  static int debug;
  static struct usb_serial *serial_table[SERIAL_TTY_MINORS];    /* initially all NULL */
  static DEFINE_MUTEX(table_lock);

-@@ -866,7 +867,7 @@
+@@ -894,7 +895,7 @@ int usb_serial_probe(struct usb_interfac

                        dev_err(&interface->dev, "No free urbs available\n");
                        goto probe_error;
                }
                        dev_err(&interface->dev, "No free urbs available\n");
                        goto probe_error;
                }


@@ -19,7 +19,7 @@ Index: linux-2.6.23-rc6/drivers/usb/serial/usb-serial.c
                port->bulk_in_size = buffer_size;
                port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
                port->bulk_in_buffer = kmalloc (buffer_size, GFP_KERNEL);
                port->bulk_in_size = buffer_size;
                port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
                port->bulk_in_buffer = kmalloc (buffer_size, GFP_KERNEL);

-@@ -1276,3 +1277,5 @@
+@@ -1306,3 +1307,5 @@ MODULE_LICENSE("GPL");

  
  module_param(debug, bool, S_IRUGO | S_IWUSR);
  MODULE_PARM_DESC(debug, "Debug enabled or not");
  
  module_param(debug, bool, S_IRUGO | S_IWUSR);
  MODULE_PARM_DESC(debug, "Debug enabled or not");

diff --git a/target/linux/generic-2.6/patches-2.6.24/840-unable_to_open_console.patch b/target/linux/generic-2.6/patches-2.6.24/840-unable_to_open_console.patch
index 332f5a5..e227ffd 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/840-unable_to_open_console.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/840-unable_to_open_console.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23.14/init/main.c
+Index: linux-2.6.24.7/init/main.c

 ===================================================================
 ===================================================================

---- linux-2.6.23.14.orig/init/main.c   2008-01-25 19:12:45.000000000 +0100
-+++ linux-2.6.23.14/init/main.c        2008-01-25 19:12:52.000000000 +0100
-@@ -780,7 +780,7 @@
+--- linux-2.6.24.7.orig/init/main.c
++++ linux-2.6.24.7/init/main.c
+@@ -773,7 +773,7 @@ static int noinline init_post(void)

        numa_default_policy();
  
        if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
        numa_default_policy();
  
        if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)

diff --git a/target/linux/generic-2.6/patches-2.6.24/850-jffs2_erase_progress_indicator.patch b/target/linux/generic-2.6/patches-2.6.24/850-jffs2_erase_progress_indicator.patch
index 89b1ca2..d61ee58 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/850-jffs2_erase_progress_indicator.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/850-jffs2_erase_progress_indicator.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.24/fs/jffs2/erase.c linux-2.6.24-owrt/fs/jffs2/erase.c
---- linux-2.6.24/fs/jffs2/erase.c      2008-01-30 17:30:15.000000000 +0100
-+++ linux-2.6.24-owrt/fs/jffs2/erase.c 2008-01-30 22:20:02.000000000 +0100
-@@ -35,6 +35,8 @@
+Index: linux-2.6.24.7/fs/jffs2/erase.c
+===================================================================
+--- linux-2.6.24.7.orig/fs/jffs2/erase.c
++++ linux-2.6.24.7/fs/jffs2/erase.c
+@@ -35,6 +35,8 @@ static void jffs2_erase_block(struct jff

  {
        int ret;
        uint32_t bad_offset;
  {
        int ret;
        uint32_t bad_offset;


@@ -10,7 +11,7 @@ diff -Nur linux-2.6.24/fs/jffs2/erase.c linux-2.6.24-owrt/fs/jffs2/erase.c
  #ifdef __ECOS
         ret = jffs2_flash_erase(c, jeb);
         if (!ret) {
  #ifdef __ECOS
         ret = jffs2_flash_erase(c, jeb);
         if (!ret) {

-@@ -47,6 +49,11 @@
+@@ -47,6 +49,11 @@ static void jffs2_erase_block(struct jff

  
        D1(printk(KERN_DEBUG "jffs2_erase_block(): erase block %#08x (range %#08x-%#08x)\n",
                                jeb->offset, jeb->offset, jeb->offset + c->sector_size));
  
        D1(printk(KERN_DEBUG "jffs2_erase_block(): erase block %#08x (range %#08x-%#08x)\n",
                                jeb->offset, jeb->offset, jeb->offset + c->sector_size));

diff --git a/target/linux/generic-2.6/patches-2.6.24/900-headers_type_and_time.patch b/target/linux/generic-2.6/patches-2.6.24/900-headers_type_and_time.patch
index aef4795..df6a538 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/900-headers_type_and_time.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/900-headers_type_and_time.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.23-rc6/include/linux/time.h
+Index: linux-2.6.24.7/include/linux/time.h

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/include/linux/time.h 2007-09-21 16:23:52.000000000 +0800
-+++ linux-2.6.23-rc6/include/linux/time.h      2007-09-21 16:24:09.000000000 +0800
+--- linux-2.6.24.7.orig/include/linux/time.h
++++ linux-2.6.24.7/include/linux/time.h

 @@ -1,6 +1,10 @@
  #ifndef _LINUX_TIME_H
  #define _LINUX_TIME_H
 @@ -1,6 +1,10 @@
  #ifndef _LINUX_TIME_H
  #define _LINUX_TIME_H


@@ -13,17 +13,17 @@ Index: linux-2.6.23-rc6/include/linux/time.h
  #include <linux/types.h>
  
  #ifdef __KERNEL__
  #include <linux/types.h>
  
  #ifdef __KERNEL__

-@@ -227,4 +231,6 @@
+@@ -231,4 +235,6 @@ struct itimerval {

   */
  #define TIMER_ABSTIME                 0x01
  
 +#endif /* __KERNEL__ DEBIAN */
 +
  #endif
   */
  #define TIMER_ABSTIME                 0x01
  
 +#endif /* __KERNEL__ DEBIAN */
 +
  #endif

-Index: linux-2.6.23-rc6/include/linux/types.h
+Index: linux-2.6.24.7/include/linux/types.h

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/include/linux/types.h        2007-09-21 16:23:52.000000000 +0800
-+++ linux-2.6.23-rc6/include/linux/types.h     2007-09-21 16:24:09.000000000 +0800
+--- linux-2.6.24.7.orig/include/linux/types.h
++++ linux-2.6.24.7/include/linux/types.h

 @@ -1,6 +1,14 @@
  #ifndef _LINUX_TYPES_H
  #define _LINUX_TYPES_H
 @@ -1,6 +1,14 @@
  #ifndef _LINUX_TYPES_H
  #define _LINUX_TYPES_H


@@ -38,8 +38,8 @@ Index: linux-2.6.23-rc6/include/linux/types.h
 +
  #ifdef        __KERNEL__
  
 +
  #ifdef        __KERNEL__
  

- #define BITS_TO_LONGS(bits) \
-@@ -162,6 +170,8 @@
+ #define DECLARE_BITMAP(name,bits) \
+@@ -161,6 +169,8 @@ typedef unsigned long blkcnt_t;

  
  #endif /* __KERNEL_STRICT_NAMES */
  
  
  #endif /* __KERNEL_STRICT_NAMES */
  

diff --git a/target/linux/generic-2.6/patches-2.6.24/902-darwin_scripts_include.patch b/target/linux/generic-2.6/patches-2.6.24/902-darwin_scripts_include.patch
index 2a3a1e0..db7d6cd 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/902-darwin_scripts_include.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/902-darwin_scripts_include.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23-rc6/scripts/genksyms/parse.c_shipped
+Index: linux-2.6.24.7/scripts/genksyms/parse.c_shipped

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/scripts/genksyms/parse.c_shipped     2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.23-rc6/scripts/genksyms/parse.c_shipped  2007-09-21 16:24:10.000000000 +0800
-@@ -144,7 +144,9 @@
+--- linux-2.6.24.7.orig/scripts/genksyms/parse.c_shipped
++++ linux-2.6.24.7/scripts/genksyms/parse.c_shipped
+@@ -160,7 +160,9 @@

  
  
  #include <assert.h>
  
  
  #include <assert.h>


@@ -12,10 +12,10 @@ Index: linux-2.6.23-rc6/scripts/genksyms/parse.c_shipped
  #include "genksyms.h"
  
  static int is_typedef;
  #include "genksyms.h"
  
  static int is_typedef;

-Index: linux-2.6.23-rc6/scripts/genksyms/parse.y
+Index: linux-2.6.24.7/scripts/genksyms/parse.y

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/scripts/genksyms/parse.y     2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.23-rc6/scripts/genksyms/parse.y  2007-09-21 16:24:10.000000000 +0800
+--- linux-2.6.24.7.orig/scripts/genksyms/parse.y
++++ linux-2.6.24.7/scripts/genksyms/parse.y

 @@ -24,7 +24,9 @@
  %{
  
 @@ -24,7 +24,9 @@
  %{
  


@@ -26,10 +26,10 @@ Index: linux-2.6.23-rc6/scripts/genksyms/parse.y
  #include "genksyms.h"
  
  static int is_typedef;
  #include "genksyms.h"
  
  static int is_typedef;

-Index: linux-2.6.23-rc6/scripts/kallsyms.c
+Index: linux-2.6.24.7/scripts/kallsyms.c

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/scripts/kallsyms.c   2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.23-rc6/scripts/kallsyms.c        2007-09-21 16:24:10.000000000 +0800
+--- linux-2.6.24.7.orig/scripts/kallsyms.c
++++ linux-2.6.24.7/scripts/kallsyms.c

 @@ -28,6 +28,35 @@
  #include <stdlib.h>
  #include <string.h>
 @@ -28,6 +28,35 @@
  #include <stdlib.h>
  #include <string.h>


@@ -66,11 +66,11 @@ Index: linux-2.6.23-rc6/scripts/kallsyms.c
  
  #define KSYM_NAME_LEN         128
  
  
  #define KSYM_NAME_LEN         128
  

-Index: linux-2.6.23-rc6/scripts/kconfig/Makefile
+Index: linux-2.6.24.7/scripts/kconfig/Makefile

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/scripts/kconfig/Makefile     2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.23-rc6/scripts/kconfig/Makefile  2007-09-21 16:24:10.000000000 +0800
-@@ -88,6 +88,9 @@
+--- linux-2.6.24.7.orig/scripts/kconfig/Makefile
++++ linux-2.6.24.7/scripts/kconfig/Makefile
+@@ -90,6 +90,9 @@ check-lxdialog  := $(srctree)/$(src)/lxd

  # we really need to do so. (Do not call gcc as part of make mrproper)
  HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
  HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
  # we really need to do so. (Do not call gcc as part of make mrproper)
  HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
  HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))


@@ -80,10 +80,10 @@ Index: linux-2.6.23-rc6/scripts/kconfig/Makefile
  
  HOST_EXTRACFLAGS += -DLOCALE
  
  
  HOST_EXTRACFLAGS += -DLOCALE
  

-Index: linux-2.6.23-rc6/scripts/mod/mk_elfconfig.c
+Index: linux-2.6.24.7/scripts/mod/mk_elfconfig.c

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/scripts/mod/mk_elfconfig.c   2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.23-rc6/scripts/mod/mk_elfconfig.c        2007-09-21 16:24:10.000000000 +0800
+--- linux-2.6.24.7.orig/scripts/mod/mk_elfconfig.c
++++ linux-2.6.24.7/scripts/mod/mk_elfconfig.c

 @@ -1,7 +1,11 @@
  #include <stdio.h>
  #include <stdlib.h>
 @@ -1,7 +1,11 @@
  #include <stdio.h>
  #include <stdlib.h>


@@ -96,10 +96,10 @@ Index: linux-2.6.23-rc6/scripts/mod/mk_elfconfig.c
  
  int
  main(int argc, char **argv)
  
  int
  main(int argc, char **argv)

-Index: linux-2.6.23-rc6/scripts/mod/modpost.h
+Index: linux-2.6.24.7/scripts/mod/modpost.h

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/scripts/mod/modpost.h        2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.23-rc6/scripts/mod/modpost.h     2007-09-21 16:24:10.000000000 +0800
+--- linux-2.6.24.7.orig/scripts/mod/modpost.h
++++ linux-2.6.24.7/scripts/mod/modpost.h

 @@ -7,7 +7,11 @@
  #include <sys/mman.h>
  #include <fcntl.h>
 @@ -7,7 +7,11 @@
  #include <sys/mman.h>
  #include <fcntl.h>

diff --git a/target/linux/generic-2.6/patches-2.6.24/903-hostap_txpower.patch b/target/linux/generic-2.6/patches-2.6.24/903-hostap_txpower.patch
index 6f82cdb..13bd18d 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/903-hostap_txpower.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/903-hostap_txpower.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_ap.c linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_ap.c
---- linux-2.6.17/drivers/net/wireless/hostap/hostap_ap.c       2006-06-18 04:49:35.000000000 +0300
-+++ linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_ap.c       2006-12-10 19:13:33.000000000 +0200
-@@ -2345,13 +2345,13 @@
+Index: linux-2.6.24.7/drivers/net/wireless/hostap/hostap_ap.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/net/wireless/hostap/hostap_ap.c
++++ linux-2.6.24.7/drivers/net/wireless/hostap/hostap_ap.c
+@@ -2358,13 +2358,13 @@ int prism2_ap_get_sta_qual(local_info_t 

                addr[count].sa_family = ARPHRD_ETHER;
                memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
                if (sta->last_rx_silence == 0)
                addr[count].sa_family = ARPHRD_ETHER;
                memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
                if (sta->last_rx_silence == 0)


@@ -21,7 +22,7 @@ diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_ap.c linux-2.6.17-patc
                qual[count].updated = sta->last_rx_updated;
  
                sta->last_rx_updated = IW_QUAL_DBM;
                qual[count].updated = sta->last_rx_updated;
  
                sta->last_rx_updated = IW_QUAL_DBM;

-@@ -2416,13 +2416,13 @@
+@@ -2429,13 +2429,13 @@ int prism2_ap_translate_scan(struct net_

                memset(&iwe, 0, sizeof(iwe));
                iwe.cmd = IWEVQUAL;
                if (sta->last_rx_silence == 0)
                memset(&iwe, 0, sizeof(iwe));
                iwe.cmd = IWEVQUAL;
                if (sta->last_rx_silence == 0)


@@ -41,10 +42,11 @@ diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_ap.c linux-2.6.17-patc
                iwe.u.qual.updated = sta->last_rx_updated;
                iwe.len = IW_EV_QUAL_LEN;
                current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
                iwe.u.qual.updated = sta->last_rx_updated;
                iwe.len = IW_EV_QUAL_LEN;
                current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,

-diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_config.h linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_config.h
---- linux-2.6.17/drivers/net/wireless/hostap/hostap_config.h   2006-06-18 04:49:35.000000000 +0300
-+++ linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_config.h   2006-12-10 19:13:33.000000000 +0200
-@@ -47,4 +47,9 @@
+Index: linux-2.6.24.7/drivers/net/wireless/hostap/hostap_config.h
+===================================================================
+--- linux-2.6.24.7.orig/drivers/net/wireless/hostap/hostap_config.h
++++ linux-2.6.24.7/drivers/net/wireless/hostap/hostap_config.h
+@@ -45,4 +45,9 @@

   */
  /* #define PRISM2_NO_STATION_MODES */
  
   */
  /* #define PRISM2_NO_STATION_MODES */
  


@@ -54,32 +56,35 @@ diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_config.h linux-2.6.17-
 +#define RAW_TXPOWER_SETTING
 +
  #endif /* HOSTAP_CONFIG_H */
 +#define RAW_TXPOWER_SETTING
 +
  #endif /* HOSTAP_CONFIG_H */

-diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap.h linux-2.6.17-patched/drivers/net/wireless/hostap/hostap.h
---- linux-2.6.17/drivers/net/wireless/hostap/hostap.h  2006-06-18 04:49:35.000000000 +0300
-+++ linux-2.6.17-patched/drivers/net/wireless/hostap/hostap.h  2006-12-10 19:20:00.000000000 +0200
-@@ -89,6 +89,7 @@
- extern struct ethtool_ops prism2_ethtool_ops;
+Index: linux-2.6.24.7/drivers/net/wireless/hostap/hostap.h
+===================================================================
+--- linux-2.6.24.7.orig/drivers/net/wireless/hostap/hostap.h
++++ linux-2.6.24.7/drivers/net/wireless/hostap/hostap.h
+@@ -89,6 +89,7 @@ extern const struct iw_handler_def hosta
+ extern const struct ethtool_ops prism2_ethtool_ops;

  
  int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
 +int hostap_restore_power(struct net_device *dev);
  
  
  #endif /* HOSTAP_H */
  
  int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
 +int hostap_restore_power(struct net_device *dev);
  
  
  #endif /* HOSTAP_H */

-diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_hw.c linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_hw.c
---- linux-2.6.17/drivers/net/wireless/hostap/hostap_hw.c       2006-06-18 04:49:35.000000000 +0300
-+++ linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_hw.c       2006-12-10 19:13:33.000000000 +0200
-@@ -1043,6 +1043,7 @@
-                      dev->name, local->fragm_threshold);
+Index: linux-2.6.24.7/drivers/net/wireless/hostap/hostap_hw.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/net/wireless/hostap/hostap_hw.c
++++ linux-2.6.24.7/drivers/net/wireless/hostap/hostap_hw.c
+@@ -933,6 +933,7 @@ static int hfa384x_set_rid(struct net_de
+                       prism2_hw_reset(dev);

        }
  
 +      hostap_restore_power(dev);
        return res;
  }
  
        }
  
 +      hostap_restore_power(dev);
        return res;
  }
  

-diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_info.c linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_info.c
---- linux-2.6.17/drivers/net/wireless/hostap/hostap_info.c     2006-06-18 04:49:35.000000000 +0300
-+++ linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_info.c     2006-12-10 19:13:33.000000000 +0200
-@@ -429,6 +429,11 @@
+Index: linux-2.6.24.7/drivers/net/wireless/hostap/hostap_info.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/net/wireless/hostap/hostap_info.c
++++ linux-2.6.24.7/drivers/net/wireless/hostap/hostap_info.c
+@@ -433,6 +433,11 @@ static void handle_info_queue_linkstatus

        }
  
        /* Get BSSID if we have a valid AP address */
        }
  
        /* Get BSSID if we have a valid AP address */


@@ -91,10 +96,11 @@ diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_info.c linux-2.6.17-pa
        if (connected) {
                netif_carrier_on(local->dev);
                netif_carrier_on(local->ddev);
        if (connected) {
                netif_carrier_on(local->dev);
                netif_carrier_on(local->ddev);

-diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_ioctl.c linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_ioctl.c
---- linux-2.6.17/drivers/net/wireless/hostap/hostap_ioctl.c    2006-06-18 04:49:35.000000000 +0300
-+++ linux-2.6.17-patched/drivers/net/wireless/hostap/hostap_ioctl.c    2006-12-10 21:21:03.000000000 +0200
-@@ -1506,23 +1506,20 @@
+Index: linux-2.6.24.7/drivers/net/wireless/hostap/hostap_ioctl.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/net/wireless/hostap/hostap_ioctl.c
++++ linux-2.6.24.7/drivers/net/wireless/hostap/hostap_ioctl.c
+@@ -1501,23 +1501,20 @@ static int prism2_txpower_hfa386x_to_dBm

                val = 255;
  
        tmp = val;
                val = 255;
  
        tmp = val;


@@ -122,7 +128,7 @@ diff -Nur linux-2.6.17/drivers/net/wireless/hostap/hostap_ioctl.c linux-2.6.17-p
  
        return (unsigned char) tmp;
  }
  
        return (unsigned char) tmp;
  }

-@@ -4086,3 +4083,35 @@
+@@ -4077,3 +4074,35 @@ int hostap_ioctl(struct net_device *dev,

  
        return ret;
  }
  
        return ret;
  }

diff --git a/target/linux/generic-2.6/patches-2.6.24/903-stddef_include.patch b/target/linux/generic-2.6/patches-2.6.24/903-stddef_include.patch
index 9b1f1b2..f4e5cad 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/903-stddef_include.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/903-stddef_include.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23-rc6/include/linux/stddef.h
+Index: linux-2.6.24.7/include/linux/stddef.h

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/include/linux/stddef.h       2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.23-rc6/include/linux/stddef.h    2007-09-21 16:24:10.000000000 +0800
-@@ -16,6 +16,7 @@
+--- linux-2.6.24.7.orig/include/linux/stddef.h
++++ linux-2.6.24.7/include/linux/stddef.h
+@@ -16,6 +16,7 @@ enum {

        false   = 0,
        true    = 1
  };
        false   = 0,
        true    = 1
  };


@@ -10,7 +10,7 @@ Index: linux-2.6.23-rc6/include/linux/stddef.h
  
  #undef offsetof
  #ifdef __compiler_offsetof
  
  #undef offsetof
  #ifdef __compiler_offsetof

-@@ -23,6 +24,5 @@
+@@ -23,6 +24,5 @@ enum {

  #else
  #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
  #endif
  #else
  #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
  #endif

diff --git a/target/linux/generic-2.6/patches-2.6.24/904-ls_time_locale.patch b/target/linux/generic-2.6/patches-2.6.24/904-ls_time_locale.patch
index 3b419c3..7b3f0e4 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/904-ls_time_locale.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/904-ls_time_locale.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23-rc6/scripts/gen_initramfs_list.sh
+Index: linux-2.6.24.7/scripts/gen_initramfs_list.sh

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/scripts/gen_initramfs_list.sh        2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.23-rc6/scripts/gen_initramfs_list.sh     2007-09-21 16:24:11.000000000 +0800
-@@ -125,7 +125,7 @@
+--- linux-2.6.24.7.orig/scripts/gen_initramfs_list.sh
++++ linux-2.6.24.7/scripts/gen_initramfs_list.sh
+@@ -125,7 +125,7 @@ parse() {

                        str="${ftype} ${name} ${location} ${str}"
                        ;;
                "nod")
                        str="${ftype} ${name} ${location} ${str}"
                        ;;
                "nod")


@@ -11,7 +11,7 @@ Index: linux-2.6.23-rc6/scripts/gen_initramfs_list.sh
                        local maj=`field 5 ${dev}`
                        local min=`field 6 ${dev}`
                        maj=${maj%,}
                        local maj=`field 5 ${dev}`
                        local min=`field 6 ${dev}`
                        maj=${maj%,}

-@@ -135,7 +135,7 @@
+@@ -135,7 +135,7 @@ parse() {

                        str="${ftype} ${name} ${str} ${dev} ${maj} ${min}"
                        ;;
                "slink")
                        str="${ftype} ${name} ${str} ${dev} ${maj} ${min}"
                        ;;
                "slink")

diff --git a/target/linux/generic-2.6/patches-2.6.24/905-i386_build.patch b/target/linux/generic-2.6/patches-2.6.24/905-i386_build.patch
index 420111f..9a30524 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/905-i386_build.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/905-i386_build.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.23.9/arch/i386/boot/tools/build.c
+Index: linux-2.6.24.7/arch/x86/boot/tools/build.c

 ===================================================================
 ===================================================================

---- linux-2.6.23.9.orig/arch/x86/boot/tools/build.c    2007-12-12 01:10:17.967096643 +0100
-+++ linux-2.6.23.9/arch/i386/x86/tools/build.c 2007-12-12 01:10:22.051329391 +0100
+--- linux-2.6.24.7.orig/arch/x86/boot/tools/build.c
++++ linux-2.6.24.7/arch/x86/boot/tools/build.c

 @@ -29,7 +29,6 @@
  #include <stdarg.h>
  #include <sys/types.h>
 @@ -29,7 +29,6 @@
  #include <stdarg.h>
  #include <sys/types.h>

diff --git a/target/linux/generic-2.6/patches-2.6.24/920-gpio_dev.patch b/target/linux/generic-2.6/patches-2.6.24/920-gpio_dev.patch
index 13427f1..24f10fb 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/920-gpio_dev.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/920-gpio_dev.patch
@@ -1,21 +1,21 @@
-Index: linux-2.6.23.14/arch/arm/Kconfig
+Index: linux-2.6.24.7/arch/arm/Kconfig

 ===================================================================
 ===================================================================

---- linux-2.6.23.14.orig/arch/arm/Kconfig      2008-01-26 02:46:18.000000000 +0100
-+++ linux-2.6.23.14/arch/arm/Kconfig   2008-01-26 02:46:33.000000000 +0100
-@@ -1039,6 +1039,8 @@
+--- linux-2.6.24.7.orig/arch/arm/Kconfig
++++ linux-2.6.24.7/arch/arm/Kconfig
+@@ -1054,6 +1054,8 @@ source "drivers/ssb/Kconfig"

  
  

- source "drivers/leds/Kconfig"
+ source "drivers/mfd/Kconfig"

  
 +source "drivers/gpio/Kconfig"
 +
  source "drivers/media/Kconfig"
  
  source "drivers/video/Kconfig"
  
 +source "drivers/gpio/Kconfig"
 +
  source "drivers/media/Kconfig"
  
  source "drivers/video/Kconfig"

-Index: linux-2.6.23.14/drivers/Kconfig
+Index: linux-2.6.24.7/drivers/Kconfig

 ===================================================================
 ===================================================================

---- linux-2.6.23.14.orig/drivers/Kconfig       2008-01-26 02:45:44.000000000 +0100
-+++ linux-2.6.23.14/drivers/Kconfig    2008-01-26 02:46:05.000000000 +0100
-@@ -74,6 +74,8 @@
+--- linux-2.6.24.7.orig/drivers/Kconfig
++++ linux-2.6.24.7/drivers/Kconfig
+@@ -78,6 +78,8 @@ source "drivers/mmc/Kconfig"

  
  source "drivers/leds/Kconfig"
  
  
  source "drivers/leds/Kconfig"
  


@@ -24,11 +24,11 @@ Index: linux-2.6.23.14/drivers/Kconfig
  source "drivers/infiniband/Kconfig"
  
  source "drivers/edac/Kconfig"
  source "drivers/infiniband/Kconfig"
  
  source "drivers/edac/Kconfig"

-Index: linux-2.6.23.14/drivers/Makefile
+Index: linux-2.6.24.7/drivers/Makefile

 ===================================================================
 ===================================================================

---- linux-2.6.23.14.orig/drivers/Makefile      2008-01-26 02:44:13.000000000 +0100
-+++ linux-2.6.23.14/drivers/Makefile   2008-01-26 02:44:42.000000000 +0100
-@@ -91,3 +91,4 @@
+--- linux-2.6.24.7.orig/drivers/Makefile
++++ linux-2.6.24.7/drivers/Makefile
+@@ -91,3 +91,4 @@ obj-$(CONFIG_PPC_PS3)                += ps3/

  obj-$(CONFIG_OF)              += of/
  obj-$(CONFIG_SSB)             += ssb/
  obj-$(CONFIG_VIRTIO)          += virtio/
  obj-$(CONFIG_OF)              += of/
  obj-$(CONFIG_SSB)             += ssb/
  obj-$(CONFIG_VIRTIO)          += virtio/

diff --git a/target/linux/generic-2.6/patches-2.6.24/921-gpio_spi_driver.patch b/target/linux/generic-2.6/patches-2.6.24/921-gpio_spi_driver.patch
index aa4e6ee..377e294 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/921-gpio_spi_driver.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/921-gpio_spi_driver.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.23.16/drivers/spi/Kconfig
+Index: linux-2.6.24.7/drivers/spi/Kconfig

 ===================================================================
 ===================================================================

---- linux-2.6.23.16.orig/drivers/spi/Kconfig
-+++ linux-2.6.23.16/drivers/spi/Kconfig
+--- linux-2.6.24.7.orig/drivers/spi/Kconfig
++++ linux-2.6.24.7/drivers/spi/Kconfig

 @@ -100,6 +100,11 @@ config SPI_BUTTERFLY
          inexpensive battery powered microcontroller evaluation board.
          This same cable can be used to flash new firmware.
 @@ -100,6 +100,11 @@ config SPI_BUTTERFLY
          inexpensive battery powered microcontroller evaluation board.
          This same cable can be used to flash new firmware.


@@ -14,10 +14,10 @@ Index: linux-2.6.23.16/drivers/spi/Kconfig
  config SPI_IMX
        tristate "Freescale iMX SPI controller"
        depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL
  config SPI_IMX
        tristate "Freescale iMX SPI controller"
        depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL

-Index: linux-2.6.23.16/drivers/spi/Makefile
+Index: linux-2.6.24.7/drivers/spi/Makefile

 ===================================================================
 ===================================================================

---- linux-2.6.23.16.orig/drivers/spi/Makefile
-+++ linux-2.6.23.16/drivers/spi/Makefile
+--- linux-2.6.24.7.orig/drivers/spi/Makefile
++++ linux-2.6.24.7/drivers/spi/Makefile

 @@ -16,6 +16,7 @@ obj-$(CONFIG_SPI_BFIN)                       += spi_bfin5xx.
  obj-$(CONFIG_SPI_BITBANG)             += spi_bitbang.o
  obj-$(CONFIG_SPI_AU1550)              += au1550_spi.o
 @@ -16,6 +16,7 @@ obj-$(CONFIG_SPI_BFIN)                       += spi_bfin5xx.
  obj-$(CONFIG_SPI_BITBANG)             += spi_bitbang.o
  obj-$(CONFIG_SPI_AU1550)              += au1550_spi.o

diff --git a/target/linux/generic-2.6/patches-2.6.24/922-w1_gpio_driver_backport.patch b/target/linux/generic-2.6/patches-2.6.24/922-w1_gpio_driver_backport.patch
index 414c8ab..12a3490 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/922-w1_gpio_driver_backport.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/922-w1_gpio_driver_backport.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.24.5/drivers/w1/masters/Kconfig
+Index: linux-2.6.24.7/drivers/w1/masters/Kconfig

 ===================================================================
 ===================================================================

---- linux-2.6.24.5.orig/drivers/w1/masters/Kconfig
-+++ linux-2.6.24.5/drivers/w1/masters/Kconfig
+--- linux-2.6.24.7.orig/drivers/w1/masters/Kconfig
++++ linux-2.6.24.7/drivers/w1/masters/Kconfig

 @@ -42,5 +42,15 @@ config W1_MASTER_DS1WM
          in HP iPAQ devices like h5xxx, h2200, and ASIC3-based like
          hx4700.
 @@ -42,5 +42,15 @@ config W1_MASTER_DS1WM
          in HP iPAQ devices like h5xxx, h2200, and ASIC3-based like
          hx4700.


@@ -18,19 +18,19 @@ Index: linux-2.6.24.5/drivers/w1/masters/Kconfig
 +
  endmenu
  
 +
  endmenu
  

-Index: linux-2.6.24.5/drivers/w1/masters/Makefile
+Index: linux-2.6.24.7/drivers/w1/masters/Makefile

 ===================================================================
 ===================================================================

---- linux-2.6.24.5.orig/drivers/w1/masters/Makefile
-+++ linux-2.6.24.5/drivers/w1/masters/Makefile
+--- linux-2.6.24.7.orig/drivers/w1/masters/Makefile
++++ linux-2.6.24.7/drivers/w1/masters/Makefile

 @@ -6,3 +6,4 @@ obj-$(CONFIG_W1_MASTER_MATROX)         += matro
  obj-$(CONFIG_W1_MASTER_DS2490)                += ds2490.o
  obj-$(CONFIG_W1_MASTER_DS2482)                += ds2482.o
  obj-$(CONFIG_W1_MASTER_DS1WM)         += ds1wm.o
 +obj-$(CONFIG_W1_MASTER_GPIO)          += w1-gpio.o
 @@ -6,3 +6,4 @@ obj-$(CONFIG_W1_MASTER_MATROX)         += matro
  obj-$(CONFIG_W1_MASTER_DS2490)                += ds2490.o
  obj-$(CONFIG_W1_MASTER_DS2482)                += ds2482.o
  obj-$(CONFIG_W1_MASTER_DS1WM)         += ds1wm.o
 +obj-$(CONFIG_W1_MASTER_GPIO)          += w1-gpio.o

-Index: linux-2.6.24.5/drivers/w1/masters/w1-gpio.c
+Index: linux-2.6.24.7/drivers/w1/masters/w1-gpio.c

 ===================================================================
 --- /dev/null
 ===================================================================
 --- /dev/null

-+++ linux-2.6.24.5/drivers/w1/masters/w1-gpio.c
++++ linux-2.6.24.7/drivers/w1/masters/w1-gpio.c

 @@ -0,0 +1,124 @@
 +/*
 + * w1-gpio - GPIO w1 bus master driver
 @@ -0,0 +1,124 @@
 +/*
 + * w1-gpio - GPIO w1 bus master driver


@@ -156,10 +156,10 @@ Index: linux-2.6.24.5/drivers/w1/masters/w1-gpio.c
 +MODULE_DESCRIPTION("GPIO w1 bus master driver");
 +MODULE_AUTHOR("Ville Syrjala <syrjala@sci.fi>");
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("GPIO w1 bus master driver");
 +MODULE_AUTHOR("Ville Syrjala <syrjala@sci.fi>");
 +MODULE_LICENSE("GPL");

-Index: linux-2.6.24.5/include/linux/w1-gpio.h
+Index: linux-2.6.24.7/include/linux/w1-gpio.h

 ===================================================================
 --- /dev/null
 ===================================================================
 --- /dev/null

-+++ linux-2.6.24.5/include/linux/w1-gpio.h
++++ linux-2.6.24.7/include/linux/w1-gpio.h

 @@ -0,0 +1,23 @@
 +/*
 + * w1-gpio interface to platform code
 @@ -0,0 +1,23 @@
 +/*
 + * w1-gpio interface to platform code

diff --git a/target/linux/generic-2.6/patches-2.6.24/930-ppc_big_endian_io_memory_accessors.patch b/target/linux/generic-2.6/patches-2.6.24/930-ppc_big_endian_io_memory_accessors.patch
index 939e590..ac01c27 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/930-ppc_big_endian_io_memory_accessors.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/930-ppc_big_endian_io_memory_accessors.patch
@@ -30,10 +30,11 @@ and didn't make it with the ppc32 equivalent. Thanks.
 
 
 ---
 
 
 ---

-diff -uprN a/include/asm-ppc/io.h b/include/asm-ppc/io.h
---- a/include/asm-ppc/io.h     2005-08-21 17:49:44.000000000 -0400
-+++ b/include/asm-ppc/io.h     2005-08-21 20:29:55.000000000 -0400
-@@ -487,11 +487,21 @@ static inline unsigned int ioread16(void
+Index: linux-2.6.24.7/include/asm-ppc/io.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-ppc/io.h
++++ linux-2.6.24.7/include/asm-ppc/io.h
+@@ -413,11 +413,21 @@ static inline unsigned int ioread16(void

        return readw(addr);
  }
  
        return readw(addr);
  }
  


@@ -55,7 +56,7 @@ diff -uprN a/include/asm-ppc/io.h b/include/asm-ppc/io.h
  static inline void iowrite8(u8 val, void __iomem *addr)
  {
        writeb(val, addr);
  static inline void iowrite8(u8 val, void __iomem *addr)
  {
        writeb(val, addr);

-@@ -502,11 +512,21 @@ static inline void iowrite16(u16 val, vo
+@@ -428,11 +438,21 @@ static inline void iowrite16(u16 val, vo

        writew(val, addr);
  }
  
        writew(val, addr);
  }
  


@@ -77,4 +78,3 @@ diff -uprN a/include/asm-ppc/io.h b/include/asm-ppc/io.h
  static inline void ioread8_rep(void __iomem *addr, void *dst, unsigned long count)
  {
        _insb(addr, dst, count);
  static inline void ioread8_rep(void __iomem *addr, void *dst, unsigned long count)
  {
        _insb(addr, dst, count);

-

diff --git a/target/linux/generic-2.6/patches-2.6.24/940-arm_mach_types.patch b/target/linux/generic-2.6/patches-2.6.24/940-arm_mach_types.patch
index 3bd81d4..8f0378f 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/940-arm_mach_types.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/940-arm_mach_types.patch
@@ -1,5 +1,7 @@
---- linux-2.6.24.2/arch/arm/tools/mach-types   2008-04-09 01:34:47.000000000 +0200
-+++ linux-2.6.24.2-owrt/arch/arm/tools/mach-types      2008-04-09 14:26:57.000000000 +0200
+Index: linux-2.6.24.7/arch/arm/tools/mach-types
+===================================================================
+--- linux-2.6.24.7.orig/arch/arm/tools/mach-types
++++ linux-2.6.24.7/arch/arm/tools/mach-types

 @@ -12,7 +12,7 @@
  #
  #   http://www.arm.linux.org.uk/developer/machines/?action=new
 @@ -12,7 +12,7 @@
  #
  #   http://www.arm.linux.org.uk/developer/machines/?action=new


@@ -9,7 +11,7 @@
  #
  # machine_is_xxx      CONFIG_xxxx             MACH_TYPE_xxx           number
  #
  #
  # machine_is_xxx      CONFIG_xxxx             MACH_TYPE_xxx           number
  #

-@@ -266,7 +266,7 @@
+@@ -266,7 +266,7 @@ stork_egg          ARCH_STORK_EGG          STORK_EGG               24

  wismo                 SA1100_WISMO            WISMO                   249
  ezlinx                        ARCH_EZLINX             EZLINX                  250
  at91rm9200            ARCH_AT91RM9200         AT91RM9200              251
  wismo                 SA1100_WISMO            WISMO                   249
  ezlinx                        ARCH_EZLINX             EZLINX                  250
  at91rm9200            ARCH_AT91RM9200         AT91RM9200              251


@@ -18,7 +20,7 @@
  neptune                       ARCH_NEPTUNE            NEPTUNE                 253
  hackkit                       SA1100_HACKKIT          HACKKIT                 254
  pxa_wins30            ARCH_PXA_WINS30         PXA_WINS30              255
  neptune                       ARCH_NEPTUNE            NEPTUNE                 253
  hackkit                       SA1100_HACKKIT          HACKKIT                 254
  pxa_wins30            ARCH_PXA_WINS30         PXA_WINS30              255

-@@ -381,13 +381,13 @@
+@@ -381,13 +381,13 @@ ks8695p                  ARCH_KS8695P            KS8695P                 363

  se4000                        ARCH_SE4000             SE4000                  364
  quadriceps            ARCH_QUADRICEPS         QUADRICEPS              365
  bronco                        ARCH_BRONCO             BRONCO                  366
  se4000                        ARCH_SE4000             SE4000                  364
  quadriceps            ARCH_QUADRICEPS         QUADRICEPS              365
  bronco                        ARCH_BRONCO             BRONCO                  366


@@ -34,7 +36,7 @@
  rcube                 ARCH_RCUBE              RCUBE                   374
  rea_olv                       ARCH_REA_OLV            REA_OLV                 375
  pxa_iphone            ARCH_PXA_IPHONE         PXA_IPHONE              376
  rcube                 ARCH_RCUBE              RCUBE                   374
  rea_olv                       ARCH_REA_OLV            REA_OLV                 375
  pxa_iphone            ARCH_PXA_IPHONE         PXA_IPHONE              376

-@@ -661,7 +661,6 @@
+@@ -661,7 +661,6 @@ a9200ec                    MACH_A9200EC            A9200EC                 645

  pnx0105                       MACH_PNX0105            PNX0105                 646
  adcpoecpu             MACH_ADCPOECPU          ADCPOECPU               647
  csb637                        MACH_CSB637             CSB637                  648
  pnx0105                       MACH_PNX0105            PNX0105                 646
  adcpoecpu             MACH_ADCPOECPU          ADCPOECPU               647
  csb637                        MACH_CSB637             CSB637                  648


@@ -42,7 +44,7 @@
  mb9200                        MACH_MB9200             MB9200                  650
  kulun                 MACH_KULUN              KULUN                   651
  snapper                       MACH_SNAPPER            SNAPPER                 652
  mb9200                        MACH_MB9200             MB9200                  650
  kulun                 MACH_KULUN              KULUN                   651
  snapper                       MACH_SNAPPER            SNAPPER                 652

-@@ -953,7 +952,6 @@
+@@ -953,7 +952,6 @@ fred_jack          MACH_FRED_JACK          FRED_JACK               93

  ttg_color1            MACH_TTG_COLOR1         TTG_COLOR1              940
  nxeb500hmi            MACH_NXEB500HMI         NXEB500HMI              941
  netdcu8                       MACH_NETDCU8            NETDCU8                 942
  ttg_color1            MACH_TTG_COLOR1         TTG_COLOR1              940
  nxeb500hmi            MACH_NXEB500HMI         NXEB500HMI              941
  netdcu8                       MACH_NETDCU8            NETDCU8                 942


@@ -50,7 +52,7 @@
  ng_fvx538             MACH_NG_FVX538          NG_FVX538               944
  ng_fvs338             MACH_NG_FVS338          NG_FVS338               945
  pnx4103                       MACH_PNX4103            PNX4103                 946
  ng_fvx538             MACH_NG_FVX538          NG_FVX538               944
  ng_fvs338             MACH_NG_FVS338          NG_FVS338               945
  pnx4103                       MACH_PNX4103            PNX4103                 946

-@@ -1148,7 +1146,7 @@
+@@ -1148,7 +1146,7 @@ aidx270                  MACH_AIDX270            AIDX270                 1134

  rema                  MACH_REMA               REMA                    1135
  bps1000                       MACH_BPS1000            BPS1000                 1136
  hw90350                       MACH_HW90350            HW90350                 1137
  rema                  MACH_REMA               REMA                    1135
  bps1000                       MACH_BPS1000            BPS1000                 1136
  hw90350                       MACH_HW90350            HW90350                 1137


@@ -59,7 +61,7 @@
  bluetouch             MACH_BLUETOUCH          BLUETOUCH               1139
  vstms                 MACH_VSTMS              VSTMS                   1140
  xsbase270             MACH_XSBASE270          XSBASE270               1141
  bluetouch             MACH_BLUETOUCH          BLUETOUCH               1139
  vstms                 MACH_VSTMS              VSTMS                   1140
  xsbase270             MACH_XSBASE270          XSBASE270               1141

-@@ -1214,7 +1212,7 @@
+@@ -1214,7 +1212,7 @@ osstbox                  MACH_OSSTBOX            OSSTBOX                 1203

  kbat9261              MACH_KBAT9261           KBAT9261                1204
  ct1100                        MACH_CT1100             CT1100                  1205
  akcppxa                       MACH_AKCPPXA            AKCPPXA                 1206
  kbat9261              MACH_KBAT9261           KBAT9261                1204
  ct1100                        MACH_CT1100             CT1100                  1205
  akcppxa                       MACH_AKCPPXA            AKCPPXA                 1206


@@ -68,7 +70,7 @@
  hitrack                       MACH_HITRACK            HITRACK                 1208
  syme1                 MACH_SYME1              SYME1                   1209
  syhl1                 MACH_SYHL1              SYHL1                   1210
  hitrack                       MACH_HITRACK            HITRACK                 1208
  syme1                 MACH_SYME1              SYME1                   1209
  syhl1                 MACH_SYHL1              SYHL1                   1210

-@@ -1299,7 +1297,7 @@
+@@ -1299,7 +1297,7 @@ xp179                    MACH_XP179              XP179                   1290

  h4300                 MACH_H4300              H4300                   1291
  goramo_mlr            MACH_GORAMO_MLR         GORAMO_MLR              1292
  mxc30020evb           MACH_MXC30020EVB        MXC30020EVB             1293
  h4300                 MACH_H4300              H4300                   1291
  goramo_mlr            MACH_GORAMO_MLR         GORAMO_MLR              1292
  mxc30020evb           MACH_MXC30020EVB        MXC30020EVB             1293


@@ -77,7 +79,7 @@
  adsportalplus         MACH_ADSPORTALPLUS      ADSPORTALPLUS           1295
  mmsp2plus             MACH_MMSP2PLUS          MMSP2PLUS               1296
  em_x270                       MACH_EM_X270            EM_X270                 1297
  adsportalplus         MACH_ADSPORTALPLUS      ADSPORTALPLUS           1295
  mmsp2plus             MACH_MMSP2PLUS          MMSP2PLUS               1296
  em_x270                       MACH_EM_X270            EM_X270                 1297

-@@ -1367,3 +1365,346 @@
+@@ -1367,3 +1365,346 @@ db88f5281              MACH_DB88F5281          DB88F5281               13

  csb726                        MACH_CSB726             CSB726                  1359
  tik27                 MACH_TIK27              TIK27                   1360
  mx_uc7420             MACH_MX_UC7420          MX_UC7420               1361
  csb726                        MACH_CSB726             CSB726                  1359
  tik27                 MACH_TIK27              TIK27                   1360
  mx_uc7420             MACH_MX_UC7420          MX_UC7420               1361

diff --git a/target/linux/generic-2.6/patches-2.6.24/950-mtd_cfi_intel_p33_compatbility.patch b/target/linux/generic-2.6/patches-2.6.24/950-mtd_cfi_intel_p33_compatbility.patch
index 4dddce5..67ae1ce 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/950-mtd_cfi_intel_p33_compatbility.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/950-mtd_cfi_intel_p33_compatbility.patch
@@ -1,6 +1,8 @@
---- linux-2.6.24.2/drivers/mtd/chips/cfi_cmdset_0001.c 2008-04-22 12:24:09.000000000 +0200
-+++ linux-2.6.24.2-owrt/drivers/mtd/chips/cfi_cmdset_0001.c    2008-04-22 19:47:38.000000000 +0200
-@@ -277,7 +277,7 @@
+Index: linux-2.6.24.7/drivers/mtd/chips/cfi_cmdset_0001.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/mtd/chips/cfi_cmdset_0001.c
++++ linux-2.6.24.7/drivers/mtd/chips/cfi_cmdset_0001.c
+@@ -277,7 +277,7 @@ read_pri_intelext(struct map_info *map, 

                return NULL;
  
        if (extp->MajorVersion != '1' ||
                return NULL;
  
        if (extp->MajorVersion != '1' ||