update to 2.6.25.1 and refresh patches

SVN-Revision: 11006

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index de07e90cedbbb716ddec87ba1ddd94c8c40bcbea..f43810653635d81770dfbe22d6a4560f1acd57cc 100644 (file)
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -25,8 +25,8 @@ endif
 ifeq ($(LINUX_VERSION),2.6.24.5)
   LINUX_KERNEL_MD5SUM:=26500f8f92895bd33e391088b5edd4ad
 endif
 ifeq ($(LINUX_VERSION),2.6.24.5)
   LINUX_KERNEL_MD5SUM:=26500f8f92895bd33e391088b5edd4ad
 endif

-ifeq ($(LINUX_VERSION),2.6.25)
-  LINUX_KERNEL_MD5SUM:=db95a49a656a3247d4995a797d333153
+ifeq ($(LINUX_VERSION),2.6.25.1)
+  LINUX_KERNEL_MD5SUM:=0d26fcafa00dc5cf27d4bf01301409a0

 endif
 
 # disable the md5sum check for unknown kernel versions
 endif
 
 # disable the md5sum check for unknown kernel versions

diff --git a/target/linux/generic-2.6/patches-2.6.25/001-squashfs.patch b/target/linux/generic-2.6/patches-2.6.25/001-squashfs.patch
index 6d2cb28b98433dbcc4650ee755eb3450ef0ea594..77128cc5bbbe2c9e9bffe1f1ca7f36ac6be7ad4d 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/001-squashfs.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/001-squashfs.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23/fs/Kconfig
+Index: linux-2.6.25.1/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.25.1.orig/fs/Kconfig
++++ linux-2.6.25.1/fs/Kconfig
+@@ -1367,6 +1367,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.25.1/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.25.1.orig/fs/Makefile
++++ linux-2.6.25.1/fs/Makefile
+@@ -73,6 +73,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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1.orig/include/linux/magic.h
++++ linux-2.6.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1.orig/init/do_mounts_rd.c
++++ linux-2.6.25.1/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.25/002-lzma_decompress.patch b/target/linux/generic-2.6/patches-2.6.25/002-lzma_decompress.patch
index 302294c082e5900d3ddc5ad9e6bfe19d3ea75e07..f2c31e75ebbc1a9f1c7ea2e7ffc075d97ecb152b 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/002-lzma_decompress.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/002-lzma_decompress.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.23/include/linux/LzmaDecode.h
+Index: linux-2.6.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1.orig/lib/Makefile
++++ linux-2.6.25.1/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 scatterlist.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 scatterlist.o

diff --git a/target/linux/generic-2.6/patches-2.6.25/003-squashfs_lzma.patch b/target/linux/generic-2.6/patches-2.6.25/003-squashfs_lzma.patch
index 06aa00180cb1f805fc858ea28faa3f038c5800d0..454cd89969a955a5726ca8d0a826334b0edc6ea0 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/003-squashfs_lzma.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/003-squashfs_lzma.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.23-rc6/fs/squashfs/inode.c
+Index: linux-2.6.25.1/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.25.1.orig/fs/squashfs/inode.c
++++ linux-2.6.25.1/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.25/004-extra_optimization.patch b/target/linux/generic-2.6/patches-2.6.25/004-extra_optimization.patch
index 09248fcdac9a55e86cda053424617d588d156eee..c2062f7b0d4556733d25c22b2feae7ff878e2015 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/004-extra_optimization.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/004-extra_optimization.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23-rc6/Makefile
+Index: linux-2.6.25.1/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.25.1.orig/Makefile
++++ linux-2.6.25.1/Makefile
+@@ -533,6 +533,9 @@ endif

  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.25/005-squashfs_fix.patch b/target/linux/generic-2.6/patches-2.6.25/005-squashfs_fix.patch
index 98237269bba25146706870ee20de2b06b5f94ec8..66f8ccce4da1bb0daedcc3a5f2c9d2079f5c2d3d 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/005-squashfs_fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/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.25.1/fs/squashfs/inode.c
+===================================================================
+--- linux-2.6.25.1.orig/fs/squashfs/inode.c
++++ linux-2.6.25.1/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.25/006-gcc4_inline_fix.patch b/target/linux/generic-2.6/patches-2.6.25/006-gcc4_inline_fix.patch
index 704fc752dffbc2a7810202410d065311b6c11e62..52cf2caf517698a28cd660ee70f9dd7230b2365d 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/006-gcc4_inline_fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/006-gcc4_inline_fix.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23/include/asm-mips/system.h
+Index: linux-2.6.25.1/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.25.1.orig/include/asm-mips/system.h
++++ linux-2.6.25.1/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.25/007-samsung_flash.patch b/target/linux/generic-2.6/patches-2.6.25/007-samsung_flash.patch
index 1be698ce0f9b15dbdb47c65e35fa5b4aa56703f5..41e3850d384e45c8c15b8c38e642a65890a12893 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/007-samsung_flash.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/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.25.1/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.25.1.orig/drivers/mtd/chips/cfi_cmdset_0002.c
++++ linux-2.6.25.1/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 @@
+@@ -298,12 +299,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.25/009-revert_intel_flash_breakage.patch b/target/linux/generic-2.6/patches-2.6.25/009-revert_intel_flash_breakage.patch
index 80fb4d40f893b6ff277cdee58203ef330925de45..4e4eefb3fb1274e17fd19460fad7caba91963995 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/009-revert_intel_flash_breakage.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/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.25.1/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.25.1.orig/drivers/mtd/chips/cfi_cmdset_0001.c
++++ linux-2.6.25.1/drivers/mtd/chips/cfi_cmdset_0001.c
+@@ -1008,7 +1008,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 @@
+@@ -1017,7 +1017,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 @@
+@@ -1127,8 +1127,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 @@
+@@ -1140,65 +1140,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 @@
+@@ -1207,7 +1207,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 @@
+@@ -1438,7 +1439,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 @@
+@@ -1678,7 +1679,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 @@
+@@ -1813,7 +1814,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.25/010-disable_old_squashfs_compatibility.patch b/target/linux/generic-2.6/patches-2.6.25/010-disable_old_squashfs_compatibility.patch
index 99c5e2ec335dc59b9724e337207f05538bb701b0..ecc7436e878367399d099d63a306d4f25dcd7216 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/010-disable_old_squashfs_compatibility.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/010-disable_old_squashfs_compatibility.patch
@@ -1,16 +1,16 @@
-Index: linux-2.6.23-rc6/fs/squashfs/Makefile
+Index: linux-2.6.25.1/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.25.1.orig/fs/squashfs/Makefile
++++ linux-2.6.25.1/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.25.1/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.25.1.orig/fs/squashfs/squashfs.h
++++ linux-2.6.25.1/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.25/011-mips_boot.patch b/target/linux/generic-2.6/patches-2.6.25/011-mips_boot.patch
index 08c83d5379ab50876a8bf0a81f216a537b0e78d4..8434d873a31d53ecb0efbfb48b49d7451995ee78 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/011-mips_boot.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/011-mips_boot.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23-rc6/arch/mips/kernel/head.S
+Index: linux-2.6.25.1/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.25.1.orig/arch/mips/kernel/head.S
++++ linux-2.6.25.1/arch/mips/kernel/head.S
+@@ -120,6 +120,8 @@

  #endif
        .endm
  
  #endif
        .endm
  

diff --git a/target/linux/generic-2.6/patches-2.6.25/060-block2mtd_init.patch b/target/linux/generic-2.6/patches-2.6.25/060-block2mtd_init.patch
index b331f7361bddb4d3518da64c1f374459d2166106..fa6325af83c6f863ca777762cf7ef6ea883602da 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/060-block2mtd_init.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/060-block2mtd_init.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
+Index: linux-2.6.25.1/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.25.1.orig/drivers/mtd/devices/block2mtd.c
++++ linux-2.6.25.1/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.25/065-rootfs_split.patch b/target/linux/generic-2.6/patches-2.6.25/065-rootfs_split.patch
index 6b34a7a704a101b632445b7ccbb77360f256c296..7561f11988d472236f07d5b312271abd560d8b26 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/065-rootfs_split.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/065-rootfs_split.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23-rc6/drivers/mtd/Kconfig
+Index: linux-2.6.25.1/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.25.1.orig/drivers/mtd/Kconfig
++++ linux-2.6.25.1/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.25.1/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.25.1.orig/drivers/mtd/mtdpart.c
++++ linux-2.6.25.1/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

-@@ -322,6 +324,316 @@
+@@ -322,6 +324,316 @@ int del_mtd_partitions(struct mtd_info *

        return 0;
  }
  
        return 0;
  }
  


@@ -358,7 +358,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

-@@ -334,171 +646,31 @@
+@@ -334,171 +646,31 @@ int add_mtd_partitions(struct mtd_info *

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


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

-@@ -574,6 +746,32 @@
+@@ -574,6 +746,32 @@ int parse_mtd_partitions(struct mtd_info

        return ret;
  }
  
        return ret;
  }
  


@@ -584,11 +584,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.25.1/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.25.1.orig/drivers/mtd/devices/block2mtd.c
++++ linux-2.6.25.1/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;


@@ -597,7 +597,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;
  


@@ -610,7 +610,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);


@@ -621,7 +621,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);


@@ -639,7 +639,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);


@@ -658,7 +658,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++;
        }


@@ -670,7 +670,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;


@@ -697,7 +697,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;


@@ -707,7 +707,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;


@@ -767,7 +767,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)) {


@@ -867,7 +867,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;


@@ -875,10 +875,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.25.1/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.25.1.orig/drivers/mtd/mtdchar.c
++++ linux-2.6.25.1/drivers/mtd/mtdchar.c

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


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

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

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


@@ -901,11 +901,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.25.1/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.25.1.orig/include/linux/mtd/mtd.h
++++ linux-2.6.25.1/include/linux/mtd/mtd.h
+@@ -98,6 +98,7 @@ struct mtd_oob_ops {

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


@@ -913,7 +913,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 @@
+@@ -211,6 +212,9 @@ struct mtd_info {

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


@@ -923,10 +923,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.25.1/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.25.1.orig/include/linux/mtd/partitions.h
++++ linux-2.6.25.1/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).
   */


@@ -935,7 +935,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 */


@@ -943,7 +943,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 *);


@@ -951,11 +951,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.25.1/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.25.1.orig/include/mtd/mtd-abi.h
++++ linux-2.6.25.1/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.25/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch
index 272a51fcc3d793c328a008d57365f141901f8a93..434b9ab0908036c913b9edf0efb8d4941ed110bb 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23.1/drivers/mtd/redboot.c
+Index: linux-2.6.25.1/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.25.1.orig/drivers/mtd/redboot.c
++++ linux-2.6.25.1/drivers/mtd/redboot.c
+@@ -251,14 +251,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.25/100-netfilter_layer7_2.17.patch b/target/linux/generic-2.6/patches-2.6.25/100-netfilter_layer7_2.17.patch
index afd940d21e955309b6b8b45b5e58ed300bf5a2ee..695c6c0ecc5b61fab43dc27a11ba594b569747c9 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/100-netfilter_layer7_2.17.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/100-netfilter_layer7_2.17.patch
@@ -1,6 +1,8 @@
---- 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
-@@ -633,6 +633,27 @@ config NETFILTER_XT_MATCH_STATE
+Index: linux-2.6.25.1/net/netfilter/Kconfig
+===================================================================
+--- linux-2.6.25.1.orig/net/netfilter/Kconfig
++++ linux-2.6.25.1/net/netfilter/Kconfig
+@@ -735,6 +735,27 @@ config NETFILTER_XT_MATCH_STATE

  
          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.
  


@@ -28,9 +30,11 @@
  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
-@@ -73,6 +73,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_QUOTA) +
+Index: linux-2.6.25.1/net/netfilter/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/net/netfilter/Makefile
++++ linux-2.6.25.1/net/netfilter/Makefile
+@@ -77,6 +77,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RATEEST)

  obj-$(CONFIG_NETFILTER_XT_MATCH_REALM) += xt_realm.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_REALM) += xt_realm.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.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.25.1/net/netfilter/xt_layer7.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/net/netfilter/regexp/regexp.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/net/netfilter/regexp/regexp.h
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/net/netfilter/regexp/regmagic.h
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/net/netfilter/regexp/regsub.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/net/netfilter/regexp/regsub.c

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


@@ -2025,9 +2039,11 @@
 +      }
 +      *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
-@@ -206,6 +206,14 @@ destroy_conntrack(struct nf_conntrack *n
+Index: linux-2.6.25.1/net/netfilter/nf_conntrack_core.c
+===================================================================
+--- linux-2.6.25.1.orig/net/netfilter/nf_conntrack_core.c
++++ linux-2.6.25.1/net/netfilter/nf_conntrack_core.c
+@@ -210,6 +210,14 @@ destroy_conntrack(struct nf_conntrack *n

         * too. */
        nf_ct_remove_expectations(ct);
  
         * too. */
        nf_ct_remove_expectations(ct);
  


@@ -2042,9 +2058,11 @@
        /* 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
-@@ -180,7 +180,12 @@ static int ct_seq_show(struct seq_file *
+Index: linux-2.6.25.1/net/netfilter/nf_conntrack_standalone.c
+===================================================================
+--- linux-2.6.25.1.orig/net/netfilter/nf_conntrack_standalone.c
++++ linux-2.6.25.1/net/netfilter/nf_conntrack_standalone.c
+@@ -181,7 +181,12 @@ static int ct_seq_show(struct seq_file *

                return -ENOSPC;
  #endif
  
                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.25.1/include/net/netfilter/nf_conntrack.h
+===================================================================
+--- linux-2.6.25.1.orig/include/net/netfilter/nf_conntrack.h
++++ linux-2.6.25.1/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.25.1/include/linux/netfilter/xt_layer7.h
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25/101-netfilter_layer7_pktmatch.patch b/target/linux/generic-2.6/patches-2.6.25/101-netfilter_layer7_pktmatch.patch
index 9605e4fa6296a159994a980376e2950fe8e4cc2e..eff900ba5afdd2a11d081fa0ffb50a908471885b 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/101-netfilter_layer7_pktmatch.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/101-netfilter_layer7_pktmatch.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.24/include/linux/netfilter/xt_layer7.h
+Index: linux-2.6.25.1/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.25.1.orig/include/linux/netfilter/xt_layer7.h
++++ linux-2.6.25.1/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.25.1/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.25.1.orig/net/netfilter/xt_layer7.c
++++ linux-2.6.25.1/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.25/110-ipp2p_0.8.1rc1.patch b/target/linux/generic-2.6/patches-2.6.25/110-ipp2p_0.8.1rc1.patch
index eb9e4ddd546ef5267c8859f6699383a496cf65b0..ad180ea7f75432b43a5953e36c70b05847e0bb00 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/110-ipp2p_0.8.1rc1.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1.orig/net/ipv4/netfilter/Kconfig
++++ linux-2.6.25.1/net/ipv4/netfilter/Kconfig
+@@ -57,6 +57,12 @@ config IP_NF_IPTABLES

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


@@ -912,16 +912,16 @@ Index: linux-2.6.23.1/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.1/net/ipv4/netfilter/Makefile
+Index: linux-2.6.25.1/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.25.1.orig/net/ipv4/netfilter/Makefile
++++ linux-2.6.25.1/net/ipv4/netfilter/Makefile
+@@ -47,6 +47,8 @@ obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn
+ obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.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.25/130-netfilter_ipset.patch b/target/linux/generic-2.6/patches-2.6.25/130-netfilter_ipset.patch
index 1828d897e98d103ebe2b5f3e3bd5f87b7da97bac..24c0e71f9791eaabbdfac8e634b5eb0bd39c7790 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/130-netfilter_ipset.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/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.25.1/include/linux/netfilter_ipv4/ip_set.h
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/include/linux/netfilter_ipv4/ip_set_iphash.h
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/include/linux/netfilter_ipv4/ip_set_ipmap.h
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/include/linux/netfilter_ipv4/ip_set_ipporthash.h
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/include/linux/netfilter_ipv4/ip_set_iptree.h
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/include/linux/netfilter_ipv4/ip_set_iptreemap.h
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/include/linux/netfilter_ipv4/ip_set_jhash.h
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/include/linux/netfilter_ipv4/ip_set_macipmap.h
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/include/linux/netfilter_ipv4/ip_set_malloc.h
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/include/linux/netfilter_ipv4/ip_set_nethash.h
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/include/linux/netfilter_ipv4/ip_set_portmap.h
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/include/linux/netfilter_ipv4/ipt_set.h
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/net/ipv4/netfilter/ip_set.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/net/ipv4/netfilter/ip_set_iphash.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/net/ipv4/netfilter/ip_set_ipmap.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/net/ipv4/netfilter/ip_set_ipporthash.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/net/ipv4/netfilter/ip_set_iptree.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/net/ipv4/netfilter/ip_set_iptreemap.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/net/ipv4/netfilter/ip_set_macipmap.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/net/ipv4/netfilter/ip_set_nethash.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/net/ipv4/netfilter/ip_set_portmap.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/net/ipv4/netfilter/ipt_set.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/net/ipv4/netfilter/ipt_SET.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/net/ipv4/netfilter/Kconfig
+===================================================================
+--- linux-2.6.25.1.orig/net/ipv4/netfilter/Kconfig
++++ linux-2.6.25.1/net/ipv4/netfilter/Kconfig
+@@ -385,5 +385,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,19 +7688,20 @@ 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.25.1/net/ipv4/netfilter/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/net/ipv4/netfilter/Makefile
++++ linux-2.6.25.1/net/ipv4/netfilter/Makefile
+@@ -46,6 +46,7 @@ obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o
+ obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o

  obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.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_SET) += ipt_set.o
  
  obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o
  
  obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
 +obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o
  
  obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o
  

-@@ -64,6 +65,18 @@
- obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TOS.o
+@@ -59,6 +60,18 @@ obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += i
+ obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o

  obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o
  obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o
 +obj-$(CONFIG_IP_NF_TARGET_SET) += ipt_SET.o
  obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o
  obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o
 +obj-$(CONFIG_IP_NF_TARGET_SET) += ipt_SET.o

diff --git a/target/linux/generic-2.6/patches-2.6.25/140-netfilter_time.patch b/target/linux/generic-2.6/patches-2.6.25/140-netfilter_time.patch
index e933bc601b7da3fb76cc5661e0ed8e5e2063d53a..9b1c4478f4d8bafa10be4ab56056838bd9b6cbda 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/140-netfilter_time.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/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.25.1/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.25.1/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.25.1/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.25.1/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,13 +206,13 @@ 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.25.1/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 @@
- 
-         To compile it as a module, choose M here.  If unsure, say N.
+--- linux-2.6.25.1.orig/net/ipv4/netfilter/Kconfig
++++ linux-2.6.25.1/net/ipv4/netfilter/Kconfig
+@@ -63,6 +63,22 @@ config IP_NF_MATCH_IPP2P
+       help
+         Module for matching traffic of various Peer-to-Peer applications

  
 +
 +config IP_NF_MATCH_TIME
  
 +
 +config IP_NF_MATCH_TIME


@@ -231,14 +231,14 @@ Index: linux-2.6.23-rc6/net/ipv4/netfilter/Kconfig
 +
 +
  config IP_NF_MATCH_RECENT
 +
 +
  config IP_NF_MATCH_RECENT

-       tristate "recent match support"
+       tristate '"recent" match support'

        depends on IP_NF_IPTABLES
        depends on IP_NF_IPTABLES

-Index: linux-2.6.23-rc6/net/ipv4/netfilter/Makefile
+Index: linux-2.6.25.1/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 @@
- obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o
+--- linux-2.6.25.1.orig/net/ipv4/netfilter/Makefile
++++ linux-2.6.25.1/net/ipv4/netfilter/Makefile
+@@ -47,6 +47,7 @@ obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn
+ obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o

  obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
  obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o
 +obj-$(CONFIG_IP_NF_MATCH_TIME) += ipt_time.o
  obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
  obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o
 +obj-$(CONFIG_IP_NF_MATCH_TIME) += ipt_time.o

diff --git a/target/linux/generic-2.6/patches-2.6.25/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.25/150-netfilter_imq.patch
index 3a7896e0da1d088f585c6cd8e73fd16225f65a89..caaf744041cf2d8e6d005452f7006a9bc8f15a01 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/150-netfilter_imq.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/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.25.1/drivers/net/imq.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/drivers/net/Kconfig
+===================================================================
+--- linux-2.6.25.1.orig/drivers/net/Kconfig
++++ linux-2.6.25.1/drivers/net/Kconfig
+@@ -117,6 +117,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.25.1/drivers/net/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/drivers/net/Makefile
++++ linux-2.6.25.1/drivers/net/Makefile
+@@ -143,6 +143,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.25.1/include/linux/imq.h
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/include/linux/netfilter_ipv4/ipt_IMQ.h
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/include/linux/netfilter_ipv6/ip6t_IMQ.h
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/include/linux/skbuff.h
+===================================================================
+--- linux-2.6.25.1.orig/include/linux/skbuff.h
++++ linux-2.6.25.1/include/linux/skbuff.h
+@@ -296,6 +296,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 @@
+@@ -1736,6 +1740,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.25.1/net/core/dev.c
+===================================================================
+--- linux-2.6.25.1.orig/net/core/dev.c
++++ linux-2.6.25.1/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 @@
+@@ -1537,7 +1540,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.25.1/net/ipv4/netfilter/ipt_IMQ.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/net/ipv4/netfilter/Kconfig
+===================================================================
+--- linux-2.6.25.1.orig/net/ipv4/netfilter/Kconfig
++++ linux-2.6.25.1/net/ipv4/netfilter/Kconfig
+@@ -315,6 +315,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_ECN
        tristate "ECN target support"
        depends on IP_NF_MANGLE
  config IP_NF_TARGET_ECN
        tristate "ECN 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.25.1/net/ipv4/netfilter/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/net/ipv4/netfilter/Makefile
++++ linux-2.6.25.1/net/ipv4/netfilter/Makefile
+@@ -55,6 +55,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.25.1/net/ipv6/netfilter/ip6t_IMQ.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25.1/net/ipv6/netfilter/Kconfig
+===================================================================
+--- linux-2.6.25.1.orig/net/ipv6/netfilter/Kconfig
++++ linux-2.6.25.1/net/ipv6/netfilter/Kconfig
+@@ -179,6 +179,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.25.1/net/ipv6/netfilter/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/net/ipv6/netfilter/Makefile
++++ linux-2.6.25.1/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,13 @@
+Index: linux-2.6.25.1/net/sched/sch_generic.c
+===================================================================
+--- linux-2.6.25.1.orig/net/sched/sch_generic.c
++++ linux-2.6.25.1/net/sched/sch_generic.c
+@@ -182,6 +182,13 @@ static inline int qdisc_restart(struct n

        return ret;
  }
  
        return ret;
  }
  


@@ -867,4 +882,4 @@ 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 {
+       unsigned long start_time = jiffies;

diff --git a/target/linux/generic-2.6/patches-2.6.25/170-netfilter_chaostables_0.8.patch b/target/linux/generic-2.6/patches-2.6.25/170-netfilter_chaostables_0.8.patch
index a5c42fc64163b8dc87248b3975763a8e6f420170..26708c43d3bb238e8b20bd655c208ae48fcb99de 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/170-netfilter_chaostables_0.8.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/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.25.1/include/linux/netfilter/oot_conntrack.h

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

-+++ linux-2.6.24/include/linux/netfilter/oot_conntrack.h
++++ linux-2.6.25.1/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.25.1/include/linux/netfilter/oot_trans.h

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

-+++ linux-2.6.24/include/linux/netfilter/oot_trans.h
++++ linux-2.6.25.1/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.25.1/include/linux/netfilter/xt_CHAOS.h

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

-+++ linux-2.6.24/include/linux/netfilter/xt_CHAOS.h
++++ linux-2.6.25.1/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.25.1/include/linux/netfilter/xt_portscan.h

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

-+++ linux-2.6.24/include/linux/netfilter/xt_portscan.h
++++ linux-2.6.25.1/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.25.1/net/netfilter/find_match.c

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

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

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


@@ -103,11 +103,11 @@ 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.25.1/net/netfilter/Kconfig

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

---- linux-2.6.24.orig/net/netfilter/Kconfig
-+++ linux-2.6.24/net/netfilter/Kconfig
-@@ -265,6 +265,14 @@ config NETFILTER_XTABLES
+--- linux-2.6.25.1.orig/net/netfilter/Kconfig
++++ linux-2.6.25.1/net/netfilter/Kconfig
+@@ -276,6 +276,14 @@ config NETFILTER_XTABLES

  
  # alphabetically ordered list of targets
  
  
  # alphabetically ordered list of targets
  


@@ -122,7 +122,7 @@ Index: linux-2.6.24/net/netfilter/Kconfig
  config NETFILTER_XT_TARGET_CLASSIFY
        tristate '"CLASSIFY" target support'
        depends on NETFILTER_XTABLES
  config NETFILTER_XT_TARGET_CLASSIFY
        tristate '"CLASSIFY" target support'
        depends on NETFILTER_XTABLES

-@@ -292,6 +300,14 @@ config NETFILTER_XT_TARGET_CONNMARK
+@@ -305,6 +313,14 @@ config NETFILTER_XT_TARGET_CONNMARK

          <file:Documentation/kbuild/modules.txt>.  The module will be called
          ipt_CONNMARK.ko.  If unsure, say `N'.
  
          <file:Documentation/kbuild/modules.txt>.  The module will be called
          ipt_CONNMARK.ko.  If unsure, say `N'.
  


@@ -135,9 +135,9 @@ Index: linux-2.6.24/net/netfilter/Kconfig
 +        To compile it as a module, choose M here.  If unsure, say N.
 +
  config NETFILTER_XT_TARGET_DSCP
 +        To compile it as a module, choose M here.  If unsure, say N.
 +
  config NETFILTER_XT_TARGET_DSCP

-       tristate '"DSCP" target support'
+       tristate '"DSCP" and "TOS" target support'

        depends on NETFILTER_XTABLES
        depends on NETFILTER_XTABLES

-@@ -556,6 +572,14 @@ config NETFILTER_XT_MATCH_POLICY
+@@ -640,6 +656,14 @@ config NETFILTER_XT_MATCH_POLICY

  
          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.
  


@@ -150,30 +150,30 @@ Index: linux-2.6.24/net/netfilter/Kconfig
 +        To compile it as a module, choose M here.  If unsure, say N.
 +
  config NETFILTER_XT_MATCH_MULTIPORT
 +        To compile it as a module, choose M here.  If unsure, say N.
 +
  config NETFILTER_XT_MATCH_MULTIPORT

-       tristate "Multiple port match support"
+       tristate '"multiport" Multiple port match support'

        depends on NETFILTER_XTABLES
        depends on NETFILTER_XTABLES

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

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

---- linux-2.6.24.orig/net/netfilter/Makefile
-+++ linux-2.6.24/net/netfilter/Makefile
-@@ -49,6 +49,8 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK
- obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK) += xt_SECMARK.o
+--- linux-2.6.25.1.orig/net/netfilter/Makefile
++++ linux-2.6.25.1/net/netfilter/Makefile
+@@ -50,6 +50,8 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK

  obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o

+ obj-$(CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP) += xt_TCPOPTSTRIP.o

  obj-$(CONFIG_NETFILTER_XT_TARGET_TRACE) += xt_TRACE.o
 +obj-$(CONFIG_NETFILTER_XT_TARGET_CHAOS) += xt_CHAOS.o
 +obj-$(CONFIG_NETFILTER_XT_TARGET_DELUDE) += xt_DELUDE.o
  
  # matches
  obj-$(CONFIG_NETFILTER_XT_MATCH_COMMENT) += xt_comment.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_TRACE) += xt_TRACE.o
 +obj-$(CONFIG_NETFILTER_XT_TARGET_CHAOS) += xt_CHAOS.o
 +obj-$(CONFIG_NETFILTER_XT_TARGET_DELUDE) += xt_DELUDE.o
  
  # matches
  obj-$(CONFIG_NETFILTER_XT_MATCH_COMMENT) += xt_comment.o

-@@ -79,3 +81,4 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) 
+@@ -83,3 +85,4 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) 

  obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.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
  obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.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.25.1/net/netfilter/xt_CHAOS.c

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

-+++ linux-2.6.24/net/netfilter/xt_CHAOS.c
++++ linux-2.6.25.1/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.25.1/net/netfilter/xt_DELUDE.c

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

-+++ linux-2.6.24/net/netfilter/xt_DELUDE.c
++++ linux-2.6.25.1/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.25.1/net/netfilter/xt_portscan.c

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

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

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


@@ -851,11 +851,11 @@ 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.25.1/drivers/char/random.c

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

---- linux-2.6.24.orig/drivers/char/random.c
-+++ linux-2.6.24/drivers/char/random.c
-@@ -1564,6 +1564,8 @@ __u32 secure_tcp_sequence_number(__be32 
+--- linux-2.6.25.1.orig/drivers/char/random.c
++++ linux-2.6.25.1/drivers/char/random.c
+@@ -1563,6 +1563,8 @@ __u32 secure_tcp_sequence_number(__be32 

        return seq;
  }
  
        return seq;
  }
  

diff --git a/target/linux/generic-2.6/patches-2.6.25/171-netfilter_tarpit.patch b/target/linux/generic-2.6/patches-2.6.25/171-netfilter_tarpit.patch
index e08900a46b6626e365548dad6648c11db2a26146..0b47b1f22e1590375627a559f26a770044aaaf8f 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/171-netfilter_tarpit.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/171-netfilter_tarpit.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23/net/netfilter/Kconfig
+Index: linux-2.6.25.1/net/netfilter/Kconfig

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

---- linux-2.6.23.orig/net/netfilter/Kconfig
-+++ linux-2.6.23/net/netfilter/Kconfig
-@@ -401,6 +401,23 @@ config NETFILTER_XT_TARGET_CONNSECMARK
+--- linux-2.6.25.1.orig/net/netfilter/Kconfig
++++ linux-2.6.25.1/net/netfilter/Kconfig
+@@ -437,6 +437,23 @@ config NETFILTER_XT_TARGET_CONNSECMARK

  
          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.
  


@@ -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.25.1/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.25.1.orig/net/netfilter/Makefile
++++ linux-2.6.25.1/net/netfilter/Makefile
+@@ -47,6 +47,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE

  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_RATEEST) += xt_RATEEST.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_TCPOPTSTRIP) += xt_TCPOPTSTRIP.o
+ obj-$(CONFIG_NETFILTER_XT_TARGET_TRACE) += xt_TRACE.o
+Index: linux-2.6.25.1/net/netfilter/xt_TARPIT.c

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

-+++ linux-2.6.23/net/netfilter/xt_TARPIT.c
++++ linux-2.6.25.1/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.25/180-netfilter_depends.patch b/target/linux/generic-2.6/patches-2.6.25/180-netfilter_depends.patch
index 464284f53c8dc0b31c1cd9103979ee337b91a537..460db1159f763ab15dc733d2766f657a8cd1e2ef 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/180-netfilter_depends.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/180-netfilter_depends.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23-rc6/net/netfilter/Kconfig
+Index: linux-2.6.25.1/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.25.1.orig/net/netfilter/Kconfig
++++ linux-2.6.25.1/net/netfilter/Kconfig
+@@ -145,7 +145,7 @@ config NF_CONNTRACK_FTP

  
  config NF_CONNTRACK_H323
        tristate "H.323 protocol support"
  
  config NF_CONNTRACK_H323
        tristate "H.323 protocol support"


@@ -11,7 +11,7 @@ Index: linux-2.6.23-rc6/net/netfilter/Kconfig
        depends on NETFILTER_ADVANCED
        help
          H.323 is a VoIP signalling protocol from ITU-T. As one of the most
        depends on NETFILTER_ADVANCED
        help
          H.323 is a VoIP signalling protocol from ITU-T. As one of the most

-@@ -403,7 +403,7 @@
+@@ -456,7 +456,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.25/190-netfilter_rtsp.patch b/target/linux/generic-2.6/patches-2.6.25/190-netfilter_rtsp.patch
index c5a3f67526175db6e0115ac7382980d73979f969..c2bb99249d41172c98c6e9653cbfde377c581f0d 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/190-netfilter_rtsp.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1.orig/net/ipv4/netfilter/Makefile
++++ linux-2.6.25.1/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.25.1/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.25.1.orig/net/netfilter/Kconfig
++++ linux-2.6.25.1/net/netfilter/Kconfig
+@@ -258,6 +258,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.
  


@@ -329,13 +329,13 @@ Index: linux-2.6.23-rc9/net/netfilter/Kconfig
 +              Documentation/modules.txt.  If unsure, say 'Y'.
 +
  config NF_CT_NETLINK
 +              Documentation/modules.txt.  If unsure, say 'Y'.
 +
  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
+       tristate 'Connection tracking netlink interface'
+       depends on NF_CONNTRACK
+Index: linux-2.6.25.1/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.25.1.orig/net/netfilter/Makefile
++++ linux-2.6.25.1/net/netfilter/Makefile
+@@ -32,6 +32,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.25.1/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.25.1.orig/net/ipv4/netfilter/Kconfig
++++ linux-2.6.25.1/net/ipv4/netfilter/Kconfig
+@@ -277,6 +277,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.25.1/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.25.1/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.25.1/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.25.1/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.25/200-sched_esfq.patch b/target/linux/generic-2.6/patches-2.6.25/200-sched_esfq.patch
index ac5eeee81f4208168143119b977344d64480d2df..142c82ab181a1f20391324adb488f3562a4a3c0d 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/200-sched_esfq.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/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.25.1/include/linux/pkt_sched.h
+===================================================================
+--- linux-2.6.25.1.orig/include/linux/pkt_sched.h
++++ linux-2.6.25.1/include/linux/pkt_sched.h
+@@ -162,8 +162,37 @@ struct tc_sfq_xstats

   *
   *    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.25.1/net/sched/Kconfig
+===================================================================
+--- linux-2.6.25.1.orig/net/sched/Kconfig
++++ linux-2.6.25.1/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.25.1/net/sched/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/net/sched/Makefile
++++ linux-2.6.25.1/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.25.1/net/sched/sch_esfq.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/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.25/202-mips-freestanding.patch b/target/linux/generic-2.6/patches-2.6.25/202-mips-freestanding.patch
index 994c03eb40407016fe4b7b6c83de5bd3ebb2790c..e461729b4fb546935a2189bf6779e34037e32f60 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/202-mips-freestanding.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/202-mips-freestanding.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23-rc6/arch/mips/Makefile
+Index: linux-2.6.25.1/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.25.1.orig/arch/mips/Makefile
++++ linux-2.6.25.1/arch/mips/Makefile
+@@ -593,6 +593,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.25/204-jffs2_eofdetect.patch b/target/linux/generic-2.6/patches-2.6.25/204-jffs2_eofdetect.patch
index f1ffac63694efb54bcce5449b97e9381719bdb7e..3c004888ba88fe108ed0bfc4e4155e86f19b68fe 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/204-jffs2_eofdetect.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/204-jffs2_eofdetect.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23-rc6/fs/jffs2/build.c
+Index: linux-2.6.25.1/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.25.1.orig/fs/jffs2/build.c
++++ linux-2.6.25.1/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.25.1/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.25.1.orig/fs/jffs2/scan.c
++++ linux-2.6.25.1/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.25/207-powerpc_asm_segment_h.patch b/target/linux/generic-2.6/patches-2.6.25/207-powerpc_asm_segment_h.patch
index 50062860da4e0176262b4cbe86db95699c1b7821..1ac884f437deb7719f5a40b77145235041f03e63 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/207-powerpc_asm_segment_h.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/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.25.1/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.25.1/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.25/208-rtl8110sb_fix.patch b/target/linux/generic-2.6/patches-2.6.25/208-rtl8110sb_fix.patch
index 9bb3f2ccc967431aa67ee3f642c6f77e5a425851..7507ec650e272bc916e3a75244b9d08e32c638bf 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/208-rtl8110sb_fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/208-rtl8110sb_fix.patch
@@ -1,35 +1,35 @@
-Index: linux-2.6.23/drivers/net/r8169.c
+Index: linux-2.6.25.1/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.25.1.orig/drivers/net/r8169.c
++++ linux-2.6.25.1/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.25/209-mini_fo.patch b/target/linux/generic-2.6/patches-2.6.25/209-mini_fo.patch
index 54c2c8deefa32fd993bc2b3c2e2db3463a6f7bf5..f6da5058c817c4ebae61d4087cbc0bfe46200bab 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/209-mini_fo.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/209-mini_fo.patch
@@ -1,33 +1,33 @@
-Index: linux-2.6.23/fs/Kconfig
+Index: linux-2.6.25.1/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.25.1.orig/fs/Kconfig
++++ linux-2.6.25.1/fs/Kconfig
+@@ -1449,6 +1449,9 @@ config VXFS_FS
+         To compile this as a module, choose M here: the module will be
+         called freevxfs.  If unsure, say N.
+ 

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

-       tristate "Minix fs support"
-       help
-Index: linux-2.6.23/fs/Makefile
+       tristate "Minix file system support"
+       depends on BLOCK
+Index: linux-2.6.25.1/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.25.1.orig/fs/Makefile
++++ linux-2.6.25.1/fs/Makefile
+@@ -77,6 +77,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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25.1/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.25/210-mini_fo_2.6.25_fixes.patch b/target/linux/generic-2.6/patches-2.6.25/210-mini_fo_2.6.25_fixes.patch
index 77c2ff3e804915bec0ee2feb28033b1695dc8399..337d4de9e3198844c5761dc5076842420272fe89 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/210-mini_fo_2.6.25_fixes.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/210-mini_fo_2.6.25_fixes.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25/fs/mini_fo/main.c
+Index: linux-2.6.25.1/fs/mini_fo/main.c

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

---- linux-2.6.25.orig/fs/mini_fo/main.c
-+++ linux-2.6.25/fs/mini_fo/main.c
+--- linux-2.6.25.1.orig/fs/mini_fo/main.c
++++ linux-2.6.25.1/fs/mini_fo/main.c

 @@ -79,6 +79,7 @@ mini_fo_tri_interpose(dentry_t *hidden_d
         * of the new inode's fields
         */
 @@ -79,6 +79,7 @@ mini_fo_tri_interpose(dentry_t *hidden_d
         * of the new inode's fields
         */


@@ -50,10 +50,10 @@ Index: linux-2.6.25/fs/mini_fo/main.c
                        stohs2(sb) = hidden_root2->d_sb;
  
                        /* validate storage dir, this is done in
                        stohs2(sb) = hidden_root2->d_sb;
  
                        /* validate storage dir, this is done in

-Index: linux-2.6.25/fs/mini_fo/mini_fo.h
+Index: linux-2.6.25.1/fs/mini_fo/mini_fo.h

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

---- linux-2.6.25.orig/fs/mini_fo/mini_fo.h
-+++ linux-2.6.25/fs/mini_fo/mini_fo.h
+--- linux-2.6.25.1.orig/fs/mini_fo/mini_fo.h
++++ linux-2.6.25.1/fs/mini_fo/mini_fo.h

 @@ -302,6 +302,10 @@ extern int mini_fo_tri_interpose(dentry_
  extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
                           dentry_t *src_dentry, struct vfsmount *src_mnt);
 @@ -302,6 +302,10 @@ extern int mini_fo_tri_interpose(dentry_
  extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
                           dentry_t *src_dentry, struct vfsmount *src_mnt);


@@ -95,10 +95,10 @@ Index: linux-2.6.25/fs/mini_fo/mini_fo.h
  /*
   * Definitions for user and kernel code
   */
  /*
   * Definitions for user and kernel code
   */

-Index: linux-2.6.25/fs/mini_fo/super.c
+Index: linux-2.6.25.1/fs/mini_fo/super.c

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

---- linux-2.6.25.orig/fs/mini_fo/super.c
-+++ linux-2.6.25/fs/mini_fo/super.c
+--- linux-2.6.25.1.orig/fs/mini_fo/super.c
++++ linux-2.6.25.1/fs/mini_fo/super.c

 @@ -262,10 +262,31 @@ mini_fo_umount_begin(super_block_t *sb)
  }
  #endif
 @@ -262,10 +262,31 @@ mini_fo_umount_begin(super_block_t *sb)
  }
  #endif


@@ -131,10 +131,10 @@ Index: linux-2.6.25/fs/mini_fo/super.c
  #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
        write_inode:    mini_fo_write_inode,
  #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
  #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
        write_inode:    mini_fo_write_inode,
  #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */

-Index: linux-2.6.25/fs/mini_fo/aux.c
+Index: linux-2.6.25.1/fs/mini_fo/aux.c

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

---- linux-2.6.25.orig/fs/mini_fo/aux.c
-+++ linux-2.6.25/fs/mini_fo/aux.c
+--- linux-2.6.25.1.orig/fs/mini_fo/aux.c
++++ linux-2.6.25.1/fs/mini_fo/aux.c

 @@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb, 
        err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
  
 @@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb, 
        err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
  

diff --git a/target/linux/generic-2.6/patches-2.6.25/213-kobject_uevent.patch b/target/linux/generic-2.6/patches-2.6.25/213-kobject_uevent.patch
index a3d5ee2c707b591f22167da6e186fea64f211eb1..1777b01d7bc56a56660804f07769fc6538a49ef5 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/213-kobject_uevent.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/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.25.1/lib/kobject_uevent.c
+===================================================================
+--- linux-2.6.25.1.orig/lib/kobject_uevent.c
++++ linux-2.6.25.1/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,8 +31,8 @@
  /**
   * kobject_action_type - translate action string to numeric type
   *
  /**
   * kobject_action_type - translate action string to numeric type
   *

-@@ -173,9 +186,7 @@
-       }
+@@ -192,9 +205,7 @@ int kobject_uevent_env(struct kobject *k
+               kobj->state_remove_uevent_sent = 1;

  
        /* we will send an event, so request a new sequence number */
 -      spin_lock(&sequence_lock);
  
        /* we will send an event, so request a new sequence number */
 -      spin_lock(&sequence_lock);

diff --git a/target/linux/generic-2.6/patches-2.6.25/220-sound_kconfig.patch b/target/linux/generic-2.6/patches-2.6.25/220-sound_kconfig.patch
index a7a48f26267c4c46537f9e55cbdd9d1cbfb24736..331ae383803e8f5e621ac874d4012b8aaa2ab4dc 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/220-sound_kconfig.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/220-sound_kconfig.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23.1/sound/core/Kconfig
+Index: linux-2.6.25.1/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.25.1.orig/sound/core/Kconfig
++++ linux-2.6.25.1/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.25/400-ledtrig_morse.patch b/target/linux/generic-2.6/patches-2.6.25/400-ledtrig_morse.patch
index 780fd34a5cda532529e43611a779b527bcc5b0cc..c761ed456bf7bc60ad9f9b86c55f6c8175587722 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/400-ledtrig_morse.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/400-ledtrig_morse.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23-rc9/drivers/leds/Kconfig
+Index: linux-2.6.25.1/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.25.1.orig/drivers/leds/Kconfig
++++ linux-2.6.25.1/drivers/leds/Kconfig
+@@ -181,4 +181,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.25.1/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.25.1.orig/drivers/leds/Makefile
++++ linux-2.6.25.1/drivers/leds/Makefile
+@@ -26,3 +26,4 @@ obj-$(CONFIG_LEDS_HP6XX)             += leds-hp6xx.

  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.25/401-led_alix.patch b/target/linux/generic-2.6/patches-2.6.25/401-led_alix.patch
index cb00274b92b139654a3edcb6e6a0210855f02dd6..9a48bc29549b712603de6edaa795d6285e4ff162 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/401-led_alix.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/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.25.1/drivers/leds/Kconfig
+===================================================================
+--- linux-2.6.25.1.orig/drivers/leds/Kconfig
++++ linux-2.6.25.1/drivers/leds/Kconfig
+@@ -79,6 +79,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.25.1/drivers/leds/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/drivers/leds/Makefile
++++ linux-2.6.25.1/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.25/402-ledtrig_default_on.patch b/target/linux/generic-2.6/patches-2.6.25/402-ledtrig_default_on.patch
index a59915c3ebeddefdb4b5f0bb1b26e52b158d5d62..2cdccf2941d84ea427100ded060db9aa9d4aa8ed 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/402-ledtrig_default_on.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/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.25.1/drivers/leds/Kconfig
+===================================================================
+--- linux-2.6.25.1.orig/drivers/leds/Kconfig
++++ linux-2.6.25.1/drivers/leds/Kconfig
+@@ -191,4 +191,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.25.1/drivers/leds/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/drivers/leds/Makefile
++++ linux-2.6.25.1/drivers/leds/Makefile
+@@ -28,3 +28,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.25/403-ds1672_detect.patch b/target/linux/generic-2.6/patches-2.6.25/403-ds1672_detect.patch
index 3ed2908d0f98ca212d5a13c3afed8f47121cb7bb..efaf82657a362fa68ccd29cb76c4ab4ddbdccf62 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/403-ds1672_detect.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/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.25.1/drivers/rtc/rtc-ds1672.c
+===================================================================
+--- linux-2.6.25.1.orig/drivers/rtc/rtc-ds1672.c
++++ linux-2.6.25.1/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.25/410-gpio_buttons.patch b/target/linux/generic-2.6/patches-2.6.25/410-gpio_buttons.patch
index 8759b3c2d6d5a1387796b7488c5760f193ef1737..ac889fa7235ed426a7a8e16fb86a65f52f0bad5f 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/410-gpio_buttons.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/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.25.1/drivers/input/misc/Kconfig
+===================================================================
+--- linux-2.6.25.1.orig/drivers/input/misc/Kconfig
++++ linux-2.6.25.1/drivers/input/misc/Kconfig
+@@ -197,4 +197,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.25.1/drivers/input/misc/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/drivers/input/misc/Makefile
++++ linux-2.6.25.1/drivers/input/misc/Makefile
+@@ -19,3 +19,4 @@ obj-$(CONFIG_INPUT_YEALINK)          += yealink.

  obj-$(CONFIG_HP_SDC_RTC)              += hp_sdc_rtc.o
  obj-$(CONFIG_INPUT_UINPUT)            += uinput.o
  obj-$(CONFIG_INPUT_APANEL)            += apanel.o
  obj-$(CONFIG_HP_SDC_RTC)              += hp_sdc_rtc.o
  obj-$(CONFIG_INPUT_UINPUT)            += uinput.o
  obj-$(CONFIG_INPUT_APANEL)            += apanel.o

diff --git a/target/linux/generic-2.6/patches-2.6.25/510-Yaffs.patch b/target/linux/generic-2.6/patches-2.6.25/510-Yaffs.patch
index 4f5894c6a55aab3e7dd83043f0638ac936577306..4193983551623ae93a8aa8c73b92148ab82d2347 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/510-Yaffs.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/510-Yaffs.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23-rc6/fs/Kconfig
+Index: linux-2.6.25.1/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.25.1.orig/fs/Kconfig
++++ linux-2.6.25.1/fs/Kconfig
+@@ -421,6 +421,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.25.1/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.25.1.orig/fs/Makefile
++++ linux-2.6.25.1/fs/Makefile
+@@ -121,3 +121,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.25/600-phy_extension.patch b/target/linux/generic-2.6/patches-2.6.25/600-phy_extension.patch
index 8261d4a4811f523343b86c6fab0481ed1177cd9f..c80696f0924498ef6d6e13a6f491bbffc6f6558a 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/600-phy_extension.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/600-phy_extension.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23/drivers/net/phy/phy.c
+Index: linux-2.6.25.1/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.25.1.orig/drivers/net/phy/phy.c
++++ linux-2.6.25.1/drivers/net/phy/phy.c
+@@ -348,6 +348,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.25.1/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.25.1.orig/include/linux/phy.h
++++ linux-2.6.25.1/include/linux/phy.h
+@@ -399,6 +399,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.25/700-powerpc_git.patch b/target/linux/generic-2.6/patches-2.6.25/700-powerpc_git.patch
index f786af9f52418f61d5b45f09fa005573ded34fdc..c207b5561451363be2eec131ab7a0b47ff889c4a 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/700-powerpc_git.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/700-powerpc_git.patch
@@ -1,7 +1,8 @@
-diff -x .git -Nur linux-2.6.25-rc9/Documentation/kernel-parameters.txt powerpc.git/Documentation/kernel-parameters.txt
---- linux-2.6.25-rc9/Documentation/kernel-parameters.txt       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/Documentation/kernel-parameters.txt    2008-04-19 16:40:52.000000000 +0200
-@@ -930,6 +930,8 @@
+Index: linux-2.6.25.1/Documentation/kernel-parameters.txt
+===================================================================
+--- linux-2.6.25.1.orig/Documentation/kernel-parameters.txt
++++ linux-2.6.25.1/Documentation/kernel-parameters.txt
+@@ -930,6 +930,8 @@ and is between 256 and 4096 characters. 

  
        l2cr=           [PPC]
  
  
        l2cr=           [PPC]
  


@@ -10,10 +11,11 @@ diff -x .git -Nur linux-2.6.25-rc9/Documentation/kernel-parameters.txt powerpc.g
        lapic           [X86-32,APIC] Enable the local APIC even if BIOS
                        disabled it.
  
        lapic           [X86-32,APIC] Enable the local APIC even if BIOS
                        disabled it.
  

-diff -x .git -Nur linux-2.6.25-rc9/Documentation/powerpc/booting-without-of.txt powerpc.git/Documentation/powerpc/booting-without-of.txt
---- linux-2.6.25-rc9/Documentation/powerpc/booting-without-of.txt      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/Documentation/powerpc/booting-without-of.txt   2008-04-19 16:40:52.000000000 +0200
-@@ -59,12 +59,39 @@
+Index: linux-2.6.25.1/Documentation/powerpc/booting-without-of.txt
+===================================================================
+--- linux-2.6.25.1.orig/Documentation/powerpc/booting-without-of.txt
++++ linux-2.6.25.1/Documentation/powerpc/booting-without-of.txt
+@@ -59,12 +59,39 @@ Table of Contents

        p) Freescale Synchronous Serial Interface
          q) USB EHCI controllers
  
        p) Freescale Synchronous Serial Interface
          q) USB EHCI controllers
  


@@ -54,7 +56,7 @@ diff -x .git -Nur linux-2.6.25-rc9/Documentation/powerpc/booting-without-of.txt
    Appendix A - Sample SOC node for MPC8540
  
  
    Appendix A - Sample SOC node for MPC8540
  
  

-@@ -1269,10 +1296,6 @@
+@@ -1269,10 +1296,6 @@ platforms are moved over to use the flat

  
    Recommended properties:
  
  
    Recommended properties:
  


@@ -65,7 +67,7 @@ diff -x .git -Nur linux-2.6.25-rc9/Documentation/powerpc/booting-without-of.txt
      - phy-connection-type : a string naming the controller/PHY interface type,
        i.e., "mii" (default), "rmii", "gmii", "rgmii", "rgmii-id", "sgmii",
        "tbi", or "rtbi".  This property is only really needed if the connection
      - phy-connection-type : a string naming the controller/PHY interface type,
        i.e., "mii" (default), "rmii", "gmii", "rgmii", "rgmii-id", "sgmii",
        "tbi", or "rtbi".  This property is only really needed if the connection

-@@ -1622,8 +1645,7 @@
+@@ -1622,8 +1645,7 @@ platforms are moved over to use the flat

     - device_type : should be "network", "hldc", "uart", "transparent"
       "bisync", "atm", or "serial".
     - compatible : could be "ucc_geth" or "fsl_atm" and so on.
     - device_type : should be "network", "hldc", "uart", "transparent"
       "bisync", "atm", or "serial".
     - compatible : could be "ucc_geth" or "fsl_atm" and so on.


@@ -75,7 +77,7 @@ diff -x .git -Nur linux-2.6.25-rc9/Documentation/powerpc/booting-without-of.txt
     - reg : Offset and length of the register set for the device
     - interrupts : <a b> where a is the interrupt number and b is a
       field that represents an encoding of the sense and level
     - reg : Offset and length of the register set for the device
     - interrupts : <a b> where a is the interrupt number and b is a
       field that represents an encoding of the sense and level

-@@ -1667,10 +1689,6 @@
+@@ -1667,10 +1689,6 @@ platforms are moved over to use the flat

     - phy-handle : The phandle for the PHY connected to this controller.
  
     Recommended properties:
     - phy-handle : The phandle for the PHY connected to this controller.
  
     Recommended properties:


@@ -86,7 +88,7 @@ diff -x .git -Nur linux-2.6.25-rc9/Documentation/powerpc/booting-without-of.txt
     - phy-connection-type : a string naming the controller/PHY interface type,
       i.e., "mii" (default), "rmii", "gmii", "rgmii", "rgmii-id" (Internal
       Delay), "rgmii-txid" (delay on TX only), "rgmii-rxid" (delay on RX only),
     - phy-connection-type : a string naming the controller/PHY interface type,
       i.e., "mii" (default), "rmii", "gmii", "rgmii", "rgmii-id" (Internal
       Delay), "rgmii-txid" (delay on TX only), "rgmii-rxid" (delay on RX only),

-@@ -1680,8 +1698,7 @@
+@@ -1680,8 +1698,7 @@ platforms are moved over to use the flat

        ucc@2000 {
                device_type = "network";
                compatible = "ucc_geth";
        ucc@2000 {
                device_type = "network";
                compatible = "ucc_geth";


@@ -96,7 +98,7 @@ diff -x .git -Nur linux-2.6.25-rc9/Documentation/powerpc/booting-without-of.txt
                reg = <2000 200>;
                interrupts = <a0 0>;
                interrupt-parent = <700>;
                reg = <2000 200>;
                interrupts = <a0 0>;
                interrupt-parent = <700>;

-@@ -1995,7 +2012,6 @@
+@@ -1995,7 +2012,6 @@ platforms are moved over to use the flat

                interrupts = <20 8>;
                interrupt-parent = <&PIC>;
                phy-handle = <&PHY0>;
                interrupts = <20 8>;
                interrupt-parent = <&PIC>;
                phy-handle = <&PHY0>;


@@ -104,7 +106,7 @@ diff -x .git -Nur linux-2.6.25-rc9/Documentation/powerpc/booting-without-of.txt
                fsl,cpm-command = <12000300>;
        };
  
                fsl,cpm-command = <12000300>;
        };
  

-@@ -2217,12 +2233,6 @@
+@@ -2217,12 +2233,6 @@ platforms are moved over to use the flat

                          EMAC, that is the content of the current (bogus) "phy-port"
                          property.
  
                          EMAC, that is the content of the current (bogus) "phy-port"
                          property.
  


@@ -117,7 +119,7 @@ diff -x .git -Nur linux-2.6.25-rc9/Documentation/powerpc/booting-without-of.txt
      Optional properties:
      - phy-address       : 1 cell, optional, MDIO address of the PHY. If absent,
                          a search is performed.
      Optional properties:
      - phy-address       : 1 cell, optional, MDIO address of the PHY. If absent,
                          a search is performed.

-@@ -2246,7 +2256,6 @@
+@@ -2246,7 +2256,6 @@ platforms are moved over to use the flat

      Example:
  
        EMAC0: ethernet@40000800 {
      Example:
  
        EMAC0: ethernet@40000800 {


@@ -125,7 +127,7 @@ diff -x .git -Nur linux-2.6.25-rc9/Documentation/powerpc/booting-without-of.txt
                device_type = "network";
                compatible = "ibm,emac-440gp", "ibm,emac";
                interrupt-parent = <&UIC1>;
                device_type = "network";
                compatible = "ibm,emac-440gp", "ibm,emac";
                interrupt-parent = <&UIC1>;

-@@ -2817,9 +2826,528 @@
+@@ -2817,9 +2826,528 @@ platforms are moved over to use the flat

           };
  
  
           };
  
  


@@ -656,7 +658,7 @@ diff -x .git -Nur linux-2.6.25-rc9/Documentation/powerpc/booting-without-of.txt
  ===================================================
  
  The device tree represents the busses and devices of a hardware
  ===================================================
  
  The device tree represents the busses and devices of a hardware

-@@ -2905,6 +3433,54 @@
+@@ -2905,6 +3433,54 @@ encodings listed below:

        2 =  high to low edge sensitive type enabled
        3 =  low to high edge sensitive type enabled
  
        2 =  high to low edge sensitive type enabled
        3 =  low to high edge sensitive type enabled
  


@@ -711,9 +713,10 @@ diff -x .git -Nur linux-2.6.25-rc9/Documentation/powerpc/booting-without-of.txt
  
  Appendix A - Sample SOC node for MPC8540
  ========================================
  
  Appendix A - Sample SOC node for MPC8540
  ========================================

-diff -x .git -Nur linux-2.6.25-rc9/Documentation/powerpc/phyp-assisted-dump.txt powerpc.git/Documentation/powerpc/phyp-assisted-dump.txt
---- linux-2.6.25-rc9/Documentation/powerpc/phyp-assisted-dump.txt      1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/Documentation/powerpc/phyp-assisted-dump.txt   2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/Documentation/powerpc/phyp-assisted-dump.txt
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/Documentation/powerpc/phyp-assisted-dump.txt

 @@ -0,0 +1,127 @@
 +
 +                   Hypervisor-Assisted Dump
 @@ -0,0 +1,127 @@
 +
 +                   Hypervisor-Assisted Dump


@@ -842,10 +845,11 @@ diff -x .git -Nur linux-2.6.25-rc9/Documentation/powerpc/phyp-assisted-dump.txt
 +
 + o Still need to write a shell script, to copy the dump away.
 +   Currently I am parsing it manually.
 +
 + o Still need to write a shell script, to copy the dump away.
 +   Currently I am parsing it manually.

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/Kconfig powerpc.git/arch/powerpc/Kconfig
---- linux-2.6.25-rc9/arch/powerpc/Kconfig      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/Kconfig   2008-04-19 16:40:52.000000000 +0200
-@@ -49,6 +49,19 @@
+Index: linux-2.6.25.1/arch/powerpc/Kconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/Kconfig
++++ linux-2.6.25.1/arch/powerpc/Kconfig
+@@ -49,6 +49,19 @@ config IRQ_PER_CPU

        bool
        default y
  
        bool
        default y
  


@@ -865,7 +869,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/Kconfig powerpc.git/arch/powerpc
  config RWSEM_GENERIC_SPINLOCK
        bool
  
  config RWSEM_GENERIC_SPINLOCK
        bool
  

-@@ -81,6 +94,11 @@
+@@ -81,6 +94,11 @@ config GENERIC_FIND_NEXT_BIT

        bool
        default y
  
        bool
        default y
  


@@ -877,7 +881,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/Kconfig powerpc.git/arch/powerpc
  config ARCH_NO_VIRT_TO_BUS
        def_bool PPC64
  
  config ARCH_NO_VIRT_TO_BUS
        def_bool PPC64
  

-@@ -91,6 +109,7 @@
+@@ -91,6 +109,7 @@ config PPC

        select HAVE_OPROFILE
        select HAVE_KPROBES
        select HAVE_KRETPROBES
        select HAVE_OPROFILE
        select HAVE_KPROBES
        select HAVE_KRETPROBES


@@ -885,7 +889,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/Kconfig powerpc.git/arch/powerpc
  
  config EARLY_PRINTK
        bool
  
  config EARLY_PRINTK
        bool

-@@ -210,15 +229,6 @@
+@@ -210,15 +229,6 @@ source kernel/Kconfig.hz

  source kernel/Kconfig.preempt
  source "fs/Kconfig.binfmt"
  
  source kernel/Kconfig.preempt
  source "fs/Kconfig.binfmt"
  


@@ -901,7 +905,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/Kconfig powerpc.git/arch/powerpc
  config HUGETLB_PAGE_SIZE_VARIABLE
        bool
        depends on HUGETLB_PAGE
  config HUGETLB_PAGE_SIZE_VARIABLE
        bool
        depends on HUGETLB_PAGE

-@@ -307,6 +317,16 @@
+@@ -307,6 +317,16 @@ config CRASH_DUMP

  
          Don't change this unless you know what you are doing.
  
  
          Don't change this unless you know what you are doing.
  


@@ -918,7 +922,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/Kconfig powerpc.git/arch/powerpc
  config PPCBUG_NVRAM
        bool "Enable reading PPCBUG NVRAM during boot" if PPLUS || LOPEC
        default y if PPC_PREP
  config PPCBUG_NVRAM
        bool "Enable reading PPCBUG NVRAM during boot" if PPLUS || LOPEC
        default y if PPC_PREP

-@@ -381,6 +401,26 @@
+@@ -381,6 +401,26 @@ config PPC_64K_PAGES

          while on hardware with such support, it will be used to map
          normal application pages.
  
          while on hardware with such support, it will be used to map
          normal application pages.
  


@@ -945,7 +949,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/Kconfig powerpc.git/arch/powerpc
  config PPC_SUBPAGE_PROT
        bool "Support setting protections for 4k subpages"
        depends on PPC_64K_PAGES
  config PPC_SUBPAGE_PROT
        bool "Support setting protections for 4k subpages"
        depends on PPC_64K_PAGES

-@@ -490,6 +530,14 @@
+@@ -490,6 +530,14 @@ config FSL_PCI

        bool
        select PPC_INDIRECT_PCI
  
        bool
        select PPC_INDIRECT_PCI
  


@@ -960,7 +964,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/Kconfig powerpc.git/arch/powerpc
  # Yes MCA RS/6000s exist but Linux-PPC does not currently support any
  config MCA
        bool
  # Yes MCA RS/6000s exist but Linux-PPC does not currently support any
  config MCA
        bool

-@@ -663,22 +711,6 @@
+@@ -663,22 +711,6 @@ config CONSISTENT_SIZE

        hex "Size of consistent memory pool" if CONSISTENT_SIZE_BOOL
        default "0x00200000" if NOT_COHERENT_CACHE
  
        hex "Size of consistent memory pool" if CONSISTENT_SIZE_BOOL
        default "0x00200000" if NOT_COHERENT_CACHE
  


@@ -983,10 +987,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/Kconfig powerpc.git/arch/powerpc
  config PIN_TLB
        bool "Pinned Kernel TLBs (860 ONLY)"
        depends on ADVANCED_OPTIONS && 8xx
  config PIN_TLB
        bool "Pinned Kernel TLBs (860 ONLY)"
        depends on ADVANCED_OPTIONS && 8xx

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/Kconfig.debug powerpc.git/arch/powerpc/Kconfig.debug
---- linux-2.6.25-rc9/arch/powerpc/Kconfig.debug        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/Kconfig.debug     2008-04-19 16:40:52.000000000 +0200
-@@ -269,7 +269,7 @@
+Index: linux-2.6.25.1/arch/powerpc/Kconfig.debug
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/Kconfig.debug
++++ linux-2.6.25.1/arch/powerpc/Kconfig.debug
+@@ -269,7 +269,7 @@ config PPC_EARLY_DEBUG_CPM_ADDR

        hex "CPM UART early debug transmit descriptor address"
        depends on PPC_EARLY_DEBUG_CPM
        default "0xfa202008" if PPC_EP88XC
        hex "CPM UART early debug transmit descriptor address"
        depends on PPC_EARLY_DEBUG_CPM
        default "0xfa202008" if PPC_EP88XC


@@ -995,10 +1000,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/Kconfig.debug powerpc.git/arch/p
        default "0xff002008" if CPM1
        help
          This specifies the address of the transmit descriptor
        default "0xff002008" if CPM1
        help
          This specifies the address of the transmit descriptor

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/Makefile powerpc.git/arch/powerpc/Makefile
---- linux-2.6.25-rc9/arch/powerpc/Makefile     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/Makefile  2008-04-19 16:40:52.000000000 +0200
-@@ -71,13 +71,11 @@
+Index: linux-2.6.25.1/arch/powerpc/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/Makefile
++++ linux-2.6.25.1/arch/powerpc/Makefile
+@@ -71,13 +71,11 @@ endif

  
  LDFLAGS_vmlinux       := -Bstatic
  
  
  LDFLAGS_vmlinux       := -Bstatic
  


@@ -1016,7 +1022,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/Makefile powerpc.git/arch/powerp
  CPP           = $(CC) -E $(KBUILD_CFLAGS)
  
  CHECKFLAGS    += -m$(CONFIG_WORD_SIZE) -D__powerpc__ -D__powerpc$(CONFIG_WORD_SIZE)__
  CPP           = $(CC) -E $(KBUILD_CFLAGS)
  
  CHECKFLAGS    += -m$(CONFIG_WORD_SIZE) -D__powerpc__ -D__powerpc$(CONFIG_WORD_SIZE)__

-@@ -164,7 +162,7 @@
+@@ -164,7 +162,7 @@ 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)/%,$@)
  


@@ -1025,10 +1031,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/Makefile powerpc.git/arch/powerp
        $(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)
  
  define archhelp
        $(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)
  
  define archhelp

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/Makefile powerpc.git/arch/powerpc/boot/Makefile
---- linux-2.6.25-rc9/arch/powerpc/boot/Makefile        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/Makefile     2008-04-19 16:40:52.000000000 +0200
-@@ -40,6 +40,7 @@
+Index: linux-2.6.25.1/arch/powerpc/boot/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/Makefile
++++ linux-2.6.25.1/arch/powerpc/boot/Makefile
+@@ -40,6 +40,7 @@ $(obj)/ebony.o: BOOTCFLAGS += -mcpu=405

  $(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
  $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
  $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
  $(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
  $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
  $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405


@@ -1036,7 +1043,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/Makefile powerpc.git/arch/p
  
  
  zlib       := inffast.c inflate.c inftrees.c
  
  
  zlib       := inffast.c inflate.c inftrees.c

-@@ -64,7 +65,8 @@
+@@ -64,7 +65,8 @@ src-plat := of.c cuboot-52xx.c cuboot-82

                cuboot-bamboo.c cuboot-mpc7448hpc2.c cuboot-taishan.c \
                fixed-head.S ep88xc.c ep405.c \
                cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \
                cuboot-bamboo.c cuboot-mpc7448hpc2.c cuboot-taishan.c \
                fixed-head.S ep88xc.c ep405.c \
                cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \


@@ -1046,7 +1053,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/Makefile powerpc.git/arch/p
  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))

-@@ -192,7 +194,7 @@
+@@ -192,7 +194,7 @@ image-$(CONFIG_PPC_CHRP)           += zImage.chrp

  image-$(CONFIG_PPC_EFIKA)             += zImage.chrp
  image-$(CONFIG_PPC_PMAC)              += zImage.pmac
  image-$(CONFIG_PPC_HOLLY)             += zImage.holly
  image-$(CONFIG_PPC_EFIKA)             += zImage.chrp
  image-$(CONFIG_PPC_PMAC)              += zImage.pmac
  image-$(CONFIG_PPC_HOLLY)             += zImage.holly


@@ -1055,7 +1062,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/Makefile powerpc.git/arch/p
  image-$(CONFIG_PPC_ISERIES)           += zImage.iseries
  image-$(CONFIG_DEFAULT_UIMAGE)                += uImage
  
  image-$(CONFIG_PPC_ISERIES)           += zImage.iseries
  image-$(CONFIG_DEFAULT_UIMAGE)                += uImage
  

-@@ -216,6 +218,7 @@
+@@ -216,6 +218,7 @@ image-$(CONFIG_RAINIER)                    += cuImage.rai

  image-$(CONFIG_TAISHAN)                       += cuImage.taishan
  image-$(CONFIG_KATMAI)                        += cuImage.katmai
  image-$(CONFIG_WARP)                  += cuImage.warp
  image-$(CONFIG_TAISHAN)                       += cuImage.taishan
  image-$(CONFIG_KATMAI)                        += cuImage.katmai
  image-$(CONFIG_WARP)                  += cuImage.warp


@@ -1063,7 +1070,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/Makefile powerpc.git/arch/p
  
  # Board ports in arch/powerpc/platform/8xx/Kconfig
  image-$(CONFIG_PPC_MPC86XADS)         += cuImage.mpc866ads
  
  # Board ports in arch/powerpc/platform/8xx/Kconfig
  image-$(CONFIG_PPC_MPC86XADS)         += cuImage.mpc866ads

-@@ -255,6 +258,7 @@
+@@ -255,6 +258,7 @@ image-$(CONFIG_TQM8555)                    += cuImage.tqm

  image-$(CONFIG_TQM8560)                       += cuImage.tqm8560
  image-$(CONFIG_SBC8548)                       += cuImage.sbc8548
  image-$(CONFIG_SBC8560)                       += cuImage.sbc8560
  image-$(CONFIG_TQM8560)                       += cuImage.tqm8560
  image-$(CONFIG_SBC8548)                       += cuImage.sbc8548
  image-$(CONFIG_SBC8560)                       += cuImage.sbc8560


@@ -1071,7 +1078,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/Makefile powerpc.git/arch/p
  
  # Board ports in arch/powerpc/platform/embedded6xx/Kconfig
  image-$(CONFIG_STORCENTER)            += cuImage.storcenter
  
  # Board ports in arch/powerpc/platform/embedded6xx/Kconfig
  image-$(CONFIG_STORCENTER)            += cuImage.storcenter

-@@ -285,11 +289,11 @@
+@@ -285,11 +289,11 @@ $(obj)/zImage.%: vmlinux $(wrapperbits)

        $(call if_changed,wrap,$*)
  
  # dtbImage% - a dtbImage is a zImage with an embedded device tree blob
        $(call if_changed,wrap,$*)
  
  # dtbImage% - a dtbImage is a zImage with an embedded device tree blob


@@ -1087,7 +1094,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/Makefile powerpc.git/arch/p
  
  # This cannot be in the root of $(src) as the zImage rule always adds a $(obj)
  # prefix
  
  # This cannot be in the root of $(src) as the zImage rule always adds a $(obj)
  # prefix

-@@ -302,14 +306,24 @@
+@@ -302,14 +306,24 @@ $(obj)/zImage.iseries: vmlinux

  $(obj)/uImage: vmlinux $(wrapperbits)
        $(call if_changed,wrap,uboot)
  
  $(obj)/uImage: vmlinux $(wrapperbits)
        $(call if_changed,wrap,uboot)
  


@@ -1118,7 +1125,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/Makefile powerpc.git/arch/p
  
  # If there isn't a platform selected then just strip the vmlinux.
  ifeq (,$(image-y))
  
  # If there isn't a platform selected then just strip the vmlinux.
  ifeq (,$(image-y))

-@@ -326,7 +340,7 @@
+@@ -326,7 +340,7 @@ install: $(CONFIGURE) $(addprefix $(obj)

  
  # anything not in $(targets)
  clean-files += $(image-) $(initrd-) zImage zImage.initrd cuImage.* treeImage.* \
  
  # anything not in $(targets)
  clean-files += $(image-) $(initrd-) zImage zImage.initrd cuImage.* treeImage.* \


@@ -1127,10 +1134,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/Makefile powerpc.git/arch/p
  
  # clean up files cached by wrapper
  clean-kernel := vmlinux.strip vmlinux.bin
  
  # clean up files cached by wrapper
  clean-kernel := vmlinux.strip vmlinux.bin

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/bamboo.c powerpc.git/arch/powerpc/boot/bamboo.c
---- linux-2.6.25-rc9/arch/powerpc/boot/bamboo.c        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/bamboo.c     2008-04-19 16:40:52.000000000 +0200
-@@ -33,7 +33,8 @@
+Index: linux-2.6.25.1/arch/powerpc/boot/bamboo.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/bamboo.c
++++ linux-2.6.25.1/arch/powerpc/boot/bamboo.c
+@@ -33,7 +33,8 @@ static void bamboo_fixups(void)

        ibm440ep_fixup_clocks(sysclk, 11059200, 25000000);
        ibm4xx_sdram_fixup_memsize();
        ibm4xx_quiesce_eth((u32 *)0xef600e00, (u32 *)0xef600f00);
        ibm440ep_fixup_clocks(sysclk, 11059200, 25000000);
        ibm4xx_sdram_fixup_memsize();
        ibm4xx_quiesce_eth((u32 *)0xef600e00, (u32 *)0xef600f00);


@@ -1140,9 +1148,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/bamboo.c powerpc.git/arch/p
  }
  
  void bamboo_init(void *mac0, void *mac1)
  }
  
  void bamboo_init(void *mac0, void *mac1)

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/cpm-serial.c powerpc.git/arch/powerpc/boot/cpm-serial.c
---- linux-2.6.25-rc9/arch/powerpc/boot/cpm-serial.c    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/cpm-serial.c 2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/cpm-serial.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/cpm-serial.c
++++ linux-2.6.25.1/arch/powerpc/boot/cpm-serial.c

 @@ -11,6 +11,7 @@
  #include "types.h"
  #include "io.h"
 @@ -11,6 +11,7 @@
  #include "types.h"
  #include "io.h"


@@ -1151,7 +1160,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/cpm-serial.c powerpc.git/ar
  
  struct cpm_scc {
        u32 gsmrl;
  
  struct cpm_scc {
        u32 gsmrl;

-@@ -42,6 +43,22 @@
+@@ -42,6 +43,22 @@ struct cpm_param {

        u16 tbase;
        u8 rfcr;
        u8 tfcr;
        u16 tbase;
        u8 rfcr;
        u8 tfcr;


@@ -1174,7 +1183,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/cpm-serial.c powerpc.git/ar
  };
  
  struct cpm_bd {
  };
  
  struct cpm_bd {

-@@ -54,10 +71,10 @@
+@@ -54,10 +71,10 @@ static void *cpcr;

  static struct cpm_param *param;
  static struct cpm_smc *smc;
  static struct cpm_scc *scc;
  static struct cpm_param *param;
  static struct cpm_smc *smc;
  static struct cpm_scc *scc;


@@ -1188,7 +1197,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/cpm-serial.c powerpc.git/ar
  
  static void (*do_cmd)(int op);
  static void (*enable_port)(void);
  
  static void (*do_cmd)(int op);
  static void (*enable_port)(void);

-@@ -119,20 +136,25 @@
+@@ -119,20 +136,25 @@ static int cpm_serial_open(void)

  
        out_8(&param->rfcr, 0x10);
        out_8(&param->tfcr, 0x10);
  
        out_8(&param->rfcr, 0x10);
        out_8(&param->tfcr, 0x10);


@@ -1219,7 +1228,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/cpm-serial.c powerpc.git/ar
  
        do_cmd(CPM_CMD_INIT_RX_TX);
  
  
        do_cmd(CPM_CMD_INIT_RX_TX);
  

-@@ -175,10 +197,12 @@
+@@ -175,10 +197,12 @@ static unsigned char cpm_serial_getc(voi

  
  int cpm_console_init(void *devp, struct serial_console_data *scdp)
  {
  
  int cpm_console_init(void *devp, struct serial_console_data *scdp)
  {


@@ -1235,7 +1244,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/cpm-serial.c powerpc.git/ar
  
        if (dt_is_compatible(devp, "fsl,cpm1-smc-uart")) {
                is_smc = 1;
  
        if (dt_is_compatible(devp, "fsl,cpm1-smc-uart")) {
                is_smc = 1;

-@@ -202,63 +226,64 @@
+@@ -202,63 +226,64 @@ int cpm_console_init(void *devp, struct 

        else
                do_cmd = cpm1_cmd;
  
        else
                do_cmd = cpm1_cmd;
  


@@ -1334,10 +1343,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/cpm-serial.c powerpc.git/ar
  
        scdp->open = cpm_serial_open;
        scdp->putc = cpm_serial_putc;
  
        scdp->open = cpm_serial_open;
        scdp->putc = cpm_serial_putc;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/cuboot-pq2.c powerpc.git/arch/powerpc/boot/cuboot-pq2.c
---- linux-2.6.25-rc9/arch/powerpc/boot/cuboot-pq2.c    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/cuboot-pq2.c 2008-04-19 16:40:52.000000000 +0200
-@@ -128,7 +128,7 @@
+Index: linux-2.6.25.1/arch/powerpc/boot/cuboot-pq2.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/cuboot-pq2.c
++++ linux-2.6.25.1/arch/powerpc/boot/cuboot-pq2.c
+@@ -128,7 +128,7 @@ static void fixup_pci(void)

        u8 *soc_regs;
        int i, len;
        void *node, *parent_node;
        u8 *soc_regs;
        int i, len;
        void *node, *parent_node;


@@ -1346,7 +1356,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/cuboot-pq2.c powerpc.git/ar
  
        node = finddevice("/pci");
        if (!node || !dt_is_compatible(node, "fsl,pq2-pci"))
  
        node = finddevice("/pci");
        if (!node || !dt_is_compatible(node, "fsl,pq2-pci"))

-@@ -141,7 +141,7 @@
+@@ -141,7 +141,7 @@ static void fixup_pci(void)

  
        soc_regs = (u8 *)fsl_get_immr();
        if (!soc_regs)
  
        soc_regs = (u8 *)fsl_get_immr();
        if (!soc_regs)


@@ -1355,7 +1365,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/cuboot-pq2.c powerpc.git/ar
  
        dt_get_reg_format(node, &naddr, &nsize);
        if (naddr != 3 || nsize != 2)
  
        dt_get_reg_format(node, &naddr, &nsize);
        if (naddr != 3 || nsize != 2)

-@@ -153,7 +153,7 @@
+@@ -153,7 +153,7 @@ static void fixup_pci(void)

  
        dt_get_reg_format(parent_node, &naddr, &nsize);
        if (naddr != 1 || nsize != 1)
  
        dt_get_reg_format(parent_node, &naddr, &nsize);
        if (naddr != 1 || nsize != 1)


@@ -1364,7 +1374,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/cuboot-pq2.c powerpc.git/ar
  
        len = getprop(node, "ranges", pci_ranges_buf,
                      sizeof(pci_ranges_buf));
  
        len = getprop(node, "ranges", pci_ranges_buf,
                      sizeof(pci_ranges_buf));

-@@ -170,14 +170,20 @@
+@@ -170,14 +170,20 @@ static void fixup_pci(void)

        }
  
        if (!mem || !mmio || !io)
        }
  
        if (!mem || !mmio || !io)


@@ -1387,7 +1397,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/cuboot-pq2.c powerpc.git/ar
  
        out_be32(&pci_regs[1][0], mem_base->phys_addr | 1);
        out_be32(&pci_regs[2][0], ~(mem->size[1] + mmio->size[1] - 1));
  
        out_be32(&pci_regs[1][0], mem_base->phys_addr | 1);
        out_be32(&pci_regs[2][0], ~(mem->size[1] + mmio->size[1] - 1));

-@@ -201,8 +207,9 @@
+@@ -201,8 +207,9 @@ static void fixup_pci(void)

        out_le32(&pci_regs[0][58], 0);
        out_le32(&pci_regs[0][60], 0);
  
        out_le32(&pci_regs[0][58], 0);
        out_le32(&pci_regs[0][60], 0);
  


@@ -1399,7 +1409,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/cuboot-pq2.c powerpc.git/ar
  
        /* If PCI is disabled, drive RST high to enable. */
        if (!(in_le32(&pci_regs[0][32]) & 1)) {
  
        /* If PCI is disabled, drive RST high to enable. */
        if (!(in_le32(&pci_regs[0][32]) & 1)) {

-@@ -228,7 +235,11 @@
+@@ -228,7 +235,11 @@ static void fixup_pci(void)

        return;
  
  err:
        return;
  
  err:


@@ -1412,10 +1422,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/cuboot-pq2.c powerpc.git/ar
  }
  
  static void pq2_platform_fixups(void)
  }
  
  static void pq2_platform_fixups(void)

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/cuboot-rainier.c powerpc.git/arch/powerpc/boot/cuboot-rainier.c
---- linux-2.6.25-rc9/arch/powerpc/boot/cuboot-rainier.c        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/cuboot-rainier.c     2008-04-19 16:40:52.000000000 +0200
-@@ -42,7 +42,8 @@
+Index: linux-2.6.25.1/arch/powerpc/boot/cuboot-rainier.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/cuboot-rainier.c
++++ linux-2.6.25.1/arch/powerpc/boot/cuboot-rainier.c
+@@ -42,7 +42,8 @@ static void rainier_fixups(void)

        ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
        ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
        ibm4xx_denali_fixup_memsize();
        ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
        ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
        ibm4xx_denali_fixup_memsize();


@@ -1425,10 +1436,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/cuboot-rainier.c powerpc.gi
  }
  
  void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
  }
  
  void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/cuboot-sequoia.c powerpc.git/arch/powerpc/boot/cuboot-sequoia.c
---- linux-2.6.25-rc9/arch/powerpc/boot/cuboot-sequoia.c        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/cuboot-sequoia.c     2008-04-19 16:40:52.000000000 +0200
-@@ -42,7 +42,8 @@
+Index: linux-2.6.25.1/arch/powerpc/boot/cuboot-sequoia.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/cuboot-sequoia.c
++++ linux-2.6.25.1/arch/powerpc/boot/cuboot-sequoia.c
+@@ -42,7 +42,8 @@ static void sequoia_fixups(void)

        ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
        ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
        ibm4xx_denali_fixup_memsize();
        ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
        ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
        ibm4xx_denali_fixup_memsize();


@@ -1438,10 +1450,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/cuboot-sequoia.c powerpc.gi
  }
  
  void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
  }
  
  void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/cuboot-taishan.c powerpc.git/arch/powerpc/boot/cuboot-taishan.c
---- linux-2.6.25-rc9/arch/powerpc/boot/cuboot-taishan.c        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/cuboot-taishan.c     2008-04-19 16:40:52.000000000 +0200
-@@ -40,7 +40,8 @@
+Index: linux-2.6.25.1/arch/powerpc/boot/cuboot-taishan.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/cuboot-taishan.c
++++ linux-2.6.25.1/arch/powerpc/boot/cuboot-taishan.c
+@@ -40,7 +40,8 @@ static void taishan_fixups(void)

  
        ibm4xx_sdram_fixup_memsize();
  
  
        ibm4xx_sdram_fixup_memsize();
  


@@ -1451,10 +1464,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/cuboot-taishan.c powerpc.gi
  
        ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
  }
  
        ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
  }

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/cuboot-warp.c powerpc.git/arch/powerpc/boot/cuboot-warp.c
---- linux-2.6.25-rc9/arch/powerpc/boot/cuboot-warp.c   2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/cuboot-warp.c        2008-04-19 16:40:52.000000000 +0200
-@@ -24,7 +24,7 @@
+Index: linux-2.6.25.1/arch/powerpc/boot/cuboot-warp.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/cuboot-warp.c
++++ linux-2.6.25.1/arch/powerpc/boot/cuboot-warp.c
+@@ -24,7 +24,7 @@ static void warp_fixups(void)

        ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
        ibm4xx_sdram_fixup_memsize();
        ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
        ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
        ibm4xx_sdram_fixup_memsize();
        ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");


@@ -1463,9 +1477,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/cuboot-warp.c powerpc.git/a
  }
  
  
  }
  
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/cuboot-yosemite.c powerpc.git/arch/powerpc/boot/cuboot-yosemite.c
---- linux-2.6.25-rc9/arch/powerpc/boot/cuboot-yosemite.c       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/cuboot-yosemite.c    2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/cuboot-yosemite.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/boot/cuboot-yosemite.c

 @@ -0,0 +1,44 @@
 +/*
 + * Old U-boot compatibility for Yosemite
 @@ -0,0 +1,44 @@
 +/*
 + * Old U-boot compatibility for Yosemite


@@ -1511,10 +1526,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/cuboot-yosemite.c powerpc.g
 +      fdt_init(_dtb_start);
 +      serial_console_init();
 +}
 +      fdt_init(_dtb_start);
 +      serial_console_init();
 +}

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/devtree.c powerpc.git/arch/powerpc/boot/devtree.c
---- linux-2.6.25-rc9/arch/powerpc/boot/devtree.c       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/devtree.c    2008-04-19 16:40:52.000000000 +0200
-@@ -350,3 +350,23 @@
+Index: linux-2.6.25.1/arch/powerpc/boot/devtree.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/devtree.c
++++ linux-2.6.25.1/arch/powerpc/boot/devtree.c
+@@ -350,3 +350,23 @@ int dt_is_compatible(void *node, const c

  
        return 0;
  }
  
        return 0;
  }


@@ -1538,9 +1554,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/devtree.c powerpc.git/arch/
 +      return n;
 +}
 +
 +      return n;
 +}
 +

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/bamboo.dts powerpc.git/arch/powerpc/boot/dts/bamboo.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/bamboo.dts  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/bamboo.dts       2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/bamboo.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/bamboo.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/bamboo.dts

 @@ -204,7 +204,6 @@
                        };
  
 @@ -204,7 +204,6 @@
                        };
  


@@ -1557,9 +1574,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/bamboo.dts powerpc.git/
                                device_type = "network";
                                compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
                                interrupt-parent = <&UIC1>;
                                device_type = "network";
                                compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
                                interrupt-parent = <&UIC1>;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/canyonlands.dts powerpc.git/arch/powerpc/boot/dts/canyonlands.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/canyonlands.dts     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/canyonlands.dts  2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/canyonlands.dts
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/boot/dts/canyonlands.dts

 @@ -0,0 +1,402 @@
 +/*
 + * Device Tree Source for AMCC Canyonlands (460EX)
 @@ -0,0 +1,402 @@
 +/*
 + * Device Tree Source for AMCC Canyonlands (460EX)


@@ -1963,9 +1981,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/canyonlands.dts powerpc
 +              };
 +      };
 +};
 +              };
 +      };
 +};

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/ebony.dts powerpc.git/arch/powerpc/boot/dts/ebony.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/ebony.dts   2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/ebony.dts        2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/ebony.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/ebony.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/ebony.dts

 @@ -241,7 +241,6 @@
                        };
  
 @@ -241,7 +241,6 @@
                        };
  


@@ -1982,9 +2001,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/ebony.dts powerpc.git/a
                                device_type = "network";
                                compatible = "ibm,emac-440gp", "ibm,emac";
                                interrupt-parent = <&UIC1>;
                                device_type = "network";
                                compatible = "ibm,emac-440gp", "ibm,emac";
                                interrupt-parent = <&UIC1>;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/ep8248e.dts powerpc.git/arch/powerpc/boot/dts/ep8248e.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/ep8248e.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/ep8248e.dts      2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/ep8248e.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/ep8248e.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/ep8248e.dts

 @@ -121,8 +121,7 @@
  
                                data@0 {
 @@ -121,8 +121,7 @@
  
                                data@0 {


@@ -2004,9 +2024,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/ep8248e.dts powerpc.git
                                interrupts = <4 8>;
                                interrupt-parent = <&PIC>;
                                fsl,cpm-brg = <7>;
                                interrupts = <4 8>;
                                interrupt-parent = <&PIC>;
                                fsl,cpm-brg = <7>;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/ep88xc.dts powerpc.git/arch/powerpc/boot/dts/ep88xc.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/ep88xc.dts  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/ep88xc.dts       2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/ep88xc.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/ep88xc.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/ep88xc.dts

 @@ -2,7 +2,7 @@
   * EP88xC Device Tree Source
   *
 @@ -2,7 +2,7 @@
   * EP88xC Device Tree Source
   *


@@ -2234,9 +2255,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/ep88xc.dts powerpc.git/
                                fsl,cpm-command = <0000>;
                        };
                };
                                fsl,cpm-command = <0000>;
                        };
                };

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/glacier.dts powerpc.git/arch/powerpc/boot/dts/glacier.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/glacier.dts 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/glacier.dts      2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/glacier.dts
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/boot/dts/glacier.dts

 @@ -0,0 +1,467 @@
 +/*
 + * Device Tree Source for AMCC Glacier (460GT)
 @@ -0,0 +1,467 @@
 +/*
 + * Device Tree Source for AMCC Glacier (460GT)


@@ -2705,9 +2727,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/glacier.dts powerpc.git
 +              };
 +      };
 +};
 +              };
 +      };
 +};

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/haleakala.dts powerpc.git/arch/powerpc/boot/dts/haleakala.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/haleakala.dts       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/haleakala.dts    2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/haleakala.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/haleakala.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/haleakala.dts

 @@ -12,7 +12,7 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -12,7 +12,7 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -2726,9 +2749,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/haleakala.dts powerpc.g
                                rx-fifo-size = <1000>;
                                tx-fifo-size = <800>;
                                phy-mode = "rgmii";
                                rx-fifo-size = <1000>;
                                tx-fifo-size = <800>;
                                phy-mode = "rgmii";

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/katmai.dts powerpc.git/arch/powerpc/boot/dts/katmai.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/katmai.dts  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/katmai.dts       2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/katmai.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/katmai.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/katmai.dts

 @@ -212,7 +212,7 @@
                                mal-tx-channel = <0>;
                                mal-rx-channel = <0>;
 @@ -212,7 +212,7 @@
                                mal-tx-channel = <0>;
                                mal-rx-channel = <0>;


@@ -2738,9 +2762,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/katmai.dts powerpc.git/
                                rx-fifo-size = <1000>;
                                tx-fifo-size = <800>;
                                phy-mode = "gmii";
                                rx-fifo-size = <1000>;
                                tx-fifo-size = <800>;
                                phy-mode = "gmii";

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/kilauea.dts powerpc.git/arch/powerpc/boot/dts/kilauea.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/kilauea.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/kilauea.dts      2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/kilauea.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/kilauea.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/kilauea.dts

 @@ -219,7 +219,7 @@
                                mal-tx-channel = <0>;
                                mal-rx-channel = <0>;
 @@ -219,7 +219,7 @@
                                mal-tx-channel = <0>;
                                mal-rx-channel = <0>;


@@ -2759,9 +2784,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/kilauea.dts powerpc.git
                                rx-fifo-size = <1000>;
                                tx-fifo-size = <800>;
                                phy-mode = "rgmii";
                                rx-fifo-size = <1000>;
                                tx-fifo-size = <800>;
                                phy-mode = "rgmii";

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/ksi8560.dts powerpc.git/arch/powerpc/boot/dts/ksi8560.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/ksi8560.dts 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/ksi8560.dts      2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/ksi8560.dts
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/boot/dts/ksi8560.dts

 @@ -0,0 +1,267 @@
 +/*
 + * Device Tree Source for Emerson KSI8560
 @@ -0,0 +1,267 @@
 +/*
 + * Device Tree Source for Emerson KSI8560


@@ -3030,9 +3056,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/ksi8560.dts powerpc.git
 +              linux,stdout-path = "/soc/cpm/serial@91a00";
 +      };
 +};
 +              linux,stdout-path = "/soc/cpm/serial@91a00";
 +      };
 +};

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/kuroboxHD.dts powerpc.git/arch/powerpc/boot/dts/kuroboxHD.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/kuroboxHD.dts       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/kuroboxHD.dts    2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/kuroboxHD.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/kuroboxHD.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/kuroboxHD.dts

 @@ -7,6 +7,7 @@
   * Based on sandpoint.dts
   *
 @@ -7,6 +7,7 @@
   * Based on sandpoint.dts
   *


@@ -3041,7 +3068,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/kuroboxHD.dts powerpc.g
   *
   * This file is licensed under
   * the terms of the GNU General Public License version 2.  This program
   *
   * This file is licensed under
   * the terms of the GNU General Public License version 2.  This program

-@@ -17,6 +18,8 @@
+@@ -17,6 +18,8 @@ XXXX add flash parts, rtc, ??

  
   */
  
  
   */
  


@@ -3050,7 +3077,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/kuroboxHD.dts powerpc.g
  / {
        model = "KuroboxHD";
        compatible = "linkstation";
  / {
        model = "KuroboxHD";
        compatible = "linkstation";

-@@ -35,19 +38,19 @@
+@@ -35,19 +38,19 @@ XXXX add flash parts, rtc, ??

  
                PowerPC,603e { /* Really 8241 */
                        device_type = "cpu";
  
                PowerPC,603e { /* Really 8241 */
                        device_type = "cpu";


@@ -3076,7 +3103,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/kuroboxHD.dts powerpc.g
        };
  
        soc10x { /* AFAICT need to make soc for 8245's uarts to be defined */
        };
  
        soc10x { /* AFAICT need to make soc for 8245's uarts to be defined */

-@@ -56,26 +59,26 @@
+@@ -56,26 +59,26 @@ XXXX add flash parts, rtc, ??

                device_type = "soc";
                compatible = "mpc10x";
                store-gathering = <0>; /* 0 == off, !0 == on */
                device_type = "soc";
                compatible = "mpc10x";
                store-gathering = <0>; /* 0 == off, !0 == on */


@@ -3111,7 +3138,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/kuroboxHD.dts powerpc.g
                        };
                };
  
                        };
                };
  

-@@ -83,9 +86,9 @@
+@@ -83,9 +86,9 @@ XXXX add flash parts, rtc, ??

                        cell-index = <0>;
                        device_type = "serial";
                        compatible = "ns16550";
                        cell-index = <0>;
                        device_type = "serial";
                        compatible = "ns16550";


@@ -3124,7 +3151,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/kuroboxHD.dts powerpc.g
                        interrupts = <9 0>;
                        interrupt-parent = <&mpic>;
                };
                        interrupts = <9 0>;
                        interrupt-parent = <&mpic>;
                };

-@@ -94,10 +97,10 @@
+@@ -94,10 +97,10 @@ XXXX add flash parts, rtc, ??

                        cell-index = <1>;
                        device_type = "serial";
                        compatible = "ns16550";
                        cell-index = <1>;
                        device_type = "serial";
                        compatible = "ns16550";


@@ -3139,7 +3166,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/kuroboxHD.dts powerpc.g
                        interrupt-parent = <&mpic>;
                };
  
                        interrupt-parent = <&mpic>;
                };
  

-@@ -107,7 +110,7 @@
+@@ -107,7 +110,7 @@ XXXX add flash parts, rtc, ??

                        device_type = "open-pic";
                        compatible = "chrp,open-pic";
                        interrupt-controller;
                        device_type = "open-pic";
                        compatible = "chrp,open-pic";
                        interrupt-controller;


@@ -3148,7 +3175,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/kuroboxHD.dts powerpc.g
                };
  
                pci0: pci@fec00000 {
                };
  
                pci0: pci@fec00000 {

-@@ -116,29 +119,29 @@
+@@ -116,29 +119,29 @@ XXXX add flash parts, rtc, ??

                        #interrupt-cells = <1>;
                        device_type = "pci";
                        compatible = "mpc10x-pci";
                        #interrupt-cells = <1>;
                        device_type = "pci";
                        compatible = "mpc10x-pci";


@@ -3196,9 +3223,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/kuroboxHD.dts powerpc.g
                        >;
                };
        };
                        >;
                };
        };

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/kuroboxHG.dts powerpc.git/arch/powerpc/boot/dts/kuroboxHG.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/kuroboxHG.dts       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/kuroboxHG.dts    2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/kuroboxHG.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/kuroboxHG.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/kuroboxHG.dts

 @@ -7,6 +7,7 @@
   * Based on sandpoint.dts
   *
 @@ -7,6 +7,7 @@
   * Based on sandpoint.dts
   *


@@ -3207,7 +3235,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/kuroboxHG.dts powerpc.g
   *
   * This file is licensed under
   * the terms of the GNU General Public License version 2.  This program
   *
   * This file is licensed under
   * the terms of the GNU General Public License version 2.  This program

-@@ -17,6 +18,8 @@
+@@ -17,6 +18,8 @@ XXXX add flash parts, rtc, ??

  
   */
  
  
   */
  


@@ -3216,7 +3244,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/kuroboxHG.dts powerpc.g
  / {
        model = "KuroboxHG";
        compatible = "linkstation";
  / {
        model = "KuroboxHG";
        compatible = "linkstation";

-@@ -35,19 +38,19 @@
+@@ -35,19 +38,19 @@ XXXX add flash parts, rtc, ??

  
                PowerPC,603e { /* Really 8241 */
                        device_type = "cpu";
  
                PowerPC,603e { /* Really 8241 */
                        device_type = "cpu";


@@ -3242,7 +3270,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/kuroboxHG.dts powerpc.g
        };
  
        soc10x { /* AFAICT need to make soc for 8245's uarts to be defined */
        };
  
        soc10x { /* AFAICT need to make soc for 8245's uarts to be defined */

-@@ -56,26 +59,26 @@
+@@ -56,26 +59,26 @@ XXXX add flash parts, rtc, ??

                device_type = "soc";
                compatible = "mpc10x";
                store-gathering = <0>; /* 0 == off, !0 == on */
                device_type = "soc";
                compatible = "mpc10x";
                store-gathering = <0>; /* 0 == off, !0 == on */


@@ -3277,7 +3305,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/kuroboxHG.dts powerpc.g
                        };
                };
  
                        };
                };
  

-@@ -83,9 +86,9 @@
+@@ -83,9 +86,9 @@ XXXX add flash parts, rtc, ??

                        cell-index = <0>;
                        device_type = "serial";
                        compatible = "ns16550";
                        cell-index = <0>;
                        device_type = "serial";
                        compatible = "ns16550";


@@ -3290,7 +3318,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/kuroboxHG.dts powerpc.g
                        interrupts = <9 0>;
                        interrupt-parent = <&mpic>;
                };
                        interrupts = <9 0>;
                        interrupt-parent = <&mpic>;
                };

-@@ -94,10 +97,10 @@
+@@ -94,10 +97,10 @@ XXXX add flash parts, rtc, ??

                        cell-index = <1>;
                        device_type = "serial";
                        compatible = "ns16550";
                        cell-index = <1>;
                        device_type = "serial";
                        compatible = "ns16550";


@@ -3305,7 +3333,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/kuroboxHG.dts powerpc.g
                        interrupt-parent = <&mpic>;
                };
  
                        interrupt-parent = <&mpic>;
                };
  

-@@ -107,7 +110,7 @@
+@@ -107,7 +110,7 @@ XXXX add flash parts, rtc, ??

                        device_type = "open-pic";
                        compatible = "chrp,open-pic";
                        interrupt-controller;
                        device_type = "open-pic";
                        compatible = "chrp,open-pic";
                        interrupt-controller;


@@ -3314,7 +3342,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/kuroboxHG.dts powerpc.g
                };
  
                pci0: pci@fec00000 {
                };
  
                pci0: pci@fec00000 {

-@@ -116,29 +119,29 @@
+@@ -116,29 +119,29 @@ XXXX add flash parts, rtc, ??

                        #interrupt-cells = <1>;
                        device_type = "pci";
                        compatible = "mpc10x-pci";
                        #interrupt-cells = <1>;
                        device_type = "pci";
                        compatible = "mpc10x-pci";


@@ -3362,9 +3390,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/kuroboxHG.dts powerpc.g
                        >;
                };
        };
                        >;
                };
        };

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/makalu.dts powerpc.git/arch/powerpc/boot/dts/makalu.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/makalu.dts  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/makalu.dts       2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/makalu.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/makalu.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/makalu.dts

 @@ -219,7 +219,7 @@
                                mal-tx-channel = <0>;
                                mal-rx-channel = <0>;
 @@ -219,7 +219,7 @@
                                mal-tx-channel = <0>;
                                mal-rx-channel = <0>;


@@ -3383,9 +3412,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/makalu.dts powerpc.git/
                                rx-fifo-size = <1000>;
                                tx-fifo-size = <800>;
                                phy-mode = "rgmii";
                                rx-fifo-size = <1000>;
                                tx-fifo-size = <800>;
                                phy-mode = "rgmii";

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc7448hpc2.dts powerpc.git/arch/powerpc/boot/dts/mpc7448hpc2.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc7448hpc2.dts     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc7448hpc2.dts  2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc7448hpc2.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/mpc7448hpc2.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/mpc7448hpc2.dts

 @@ -1,7 +1,7 @@
  /*
   * MPC7448HPC2 (Taiga) board Device Tree Source
 @@ -1,7 +1,7 @@
  /*
   * MPC7448HPC2 (Taiga) board Device Tree Source


@@ -3601,9 +3631,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc7448hpc2.dts powerpc
                                interrupt-parent = <&mpic>;
                        };
                };
                                interrupt-parent = <&mpic>;
                        };
                };

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8272ads.dts powerpc.git/arch/powerpc/boot/dts/mpc8272ads.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8272ads.dts      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8272ads.dts   2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc8272ads.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/mpc8272ads.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/mpc8272ads.dts

 @@ -1,7 +1,7 @@
  /*
   * MPC8272 ADS Device Tree Source
 @@ -1,7 +1,7 @@
  /*
   * MPC8272 ADS Device Tree Source


@@ -3905,9 +3936,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8272ads.dts powerpc.
                };
        };
  
                };
        };
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc832x_mds.dts powerpc.git/arch/powerpc/boot/dts/mpc832x_mds.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc832x_mds.dts     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc832x_mds.dts  2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc832x_mds.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/mpc832x_mds.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/mpc832x_mds.dts

 @@ -255,9 +255,7 @@
                enet0: ucc@2200 {
                        device_type = "network";
 @@ -255,9 +255,7 @@
                enet0: ucc@2200 {
                        device_type = "network";


@@ -3938,9 +3970,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc832x_mds.dts powerpc
                        port-number = <0>;      /* Which ttyQEx device */
                        soft-uart;              /* We need Soft-UART */
                        reg = <0x2400 0x200>;
                        port-number = <0>;      /* Which ttyQEx device */
                        soft-uart;              /* We need Soft-UART */
                        reg = <0x2400 0x200>;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc832x_rdb.dts powerpc.git/arch/powerpc/boot/dts/mpc832x_rdb.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc832x_rdb.dts     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc832x_rdb.dts  2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc832x_rdb.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/mpc832x_rdb.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/mpc832x_rdb.dts

 @@ -208,9 +208,7 @@
                enet0: ucc@3000 {
                        device_type = "network";
 @@ -208,9 +208,7 @@
                enet0: ucc@3000 {
                        device_type = "network";


@@ -3961,9 +3994,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc832x_rdb.dts powerpc
                        reg = <0x2200 0x200>;
                        interrupts = <34>;
                        interrupt-parent = <&qeic>;
                        reg = <0x2200 0x200>;
                        interrupts = <34>;
                        interrupt-parent = <&qeic>;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc836x_mds.dts powerpc.git/arch/powerpc/boot/dts/mpc836x_mds.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc836x_mds.dts     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc836x_mds.dts  2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc836x_mds.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/mpc836x_mds.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/mpc836x_mds.dts

 @@ -257,9 +257,7 @@
                enet0: ucc@2000 {
                        device_type = "network";
 @@ -257,9 +257,7 @@
                enet0: ucc@2000 {
                        device_type = "network";


@@ -3984,9 +4018,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc836x_mds.dts powerpc
                        reg = <0x3000 0x200>;
                        interrupts = <33>;
                        interrupt-parent = <&qeic>;
                        reg = <0x3000 0x200>;
                        interrupts = <33>;
                        interrupt-parent = <&qeic>;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8540ads.dts powerpc.git/arch/powerpc/boot/dts/mpc8540ads.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8540ads.dts      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8540ads.dts   2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc8540ads.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/mpc8540ads.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/mpc8540ads.dts

 @@ -1,7 +1,7 @@
  /*
   * MPC8540 ADS Device Tree Source
 @@ -1,7 +1,7 @@
  /*
   * MPC8540 ADS Device Tree Source


@@ -4316,9 +4351,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8540ads.dts powerpc.
                compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
                device_type = "pci";
        };
                compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
                device_type = "pci";
        };

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8541cds.dts powerpc.git/arch/powerpc/boot/dts/mpc8541cds.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8541cds.dts      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8541cds.dts   2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc8541cds.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/mpc8541cds.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/mpc8541cds.dts

 @@ -1,7 +1,7 @@
  /*
   * MPC8541 CDS Device Tree Source
 @@ -1,7 +1,7 @@
  /*
   * MPC8541 CDS Device Tree Source


@@ -4664,9 +4700,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8541cds.dts powerpc.
                compatible = "fsl,mpc8540-pci";
                device_type = "pci";
        };
                compatible = "fsl,mpc8540-pci";
                device_type = "pci";
        };

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8544ds.dts powerpc.git/arch/powerpc/boot/dts/mpc8544ds.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8544ds.dts       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8544ds.dts    2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc8544ds.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/mpc8544ds.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/mpc8544ds.dts

 @@ -1,7 +1,7 @@
  /*
   * MPC8544 DS Device Tree Source
 @@ -1,7 +1,7 @@
  /*
   * MPC8544 DS Device Tree Source


@@ -5203,9 +5240,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8544ds.dts powerpc.g
                                        };
                                };
                        };
                                        };
                                };
                        };

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8548cds.dts powerpc.git/arch/powerpc/boot/dts/mpc8548cds.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8548cds.dts      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8548cds.dts   2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc8548cds.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/mpc8548cds.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/mpc8548cds.dts

 @@ -1,7 +1,7 @@
  /*
   * MPC8548 CDS Device Tree Source
 @@ -1,7 +1,7 @@
  /*
   * MPC8548 CDS Device Tree Source


@@ -5747,9 +5785,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8548cds.dts powerpc.
                };
        };
  };
                };
        };
  };

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8555cds.dts powerpc.git/arch/powerpc/boot/dts/mpc8555cds.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8555cds.dts      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8555cds.dts   2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc8555cds.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/mpc8555cds.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/mpc8555cds.dts

 @@ -1,7 +1,7 @@
  /*
   * MPC8555 CDS Device Tree Source
 @@ -1,7 +1,7 @@
  /*
   * MPC8555 CDS Device Tree Source


@@ -6095,9 +6134,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8555cds.dts powerpc.
                compatible = "fsl,mpc8540-pci";
                device_type = "pci";
        };
                compatible = "fsl,mpc8540-pci";
                device_type = "pci";
        };

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8560ads.dts powerpc.git/arch/powerpc/boot/dts/mpc8560ads.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8560ads.dts      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8560ads.dts   2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc8560ads.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/mpc8560ads.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/mpc8560ads.dts

 @@ -1,7 +1,7 @@
  /*
   * MPC8560 ADS Device Tree Source
 @@ -1,7 +1,7 @@
  /*
   * MPC8560 ADS Device Tree Source


@@ -6491,9 +6531,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8560ads.dts powerpc.
 +                        0x1000000 0x0 0x0 0xe2000000 0x0 0x1000000>;
        };
  };
 +                        0x1000000 0x0 0x0 0xe2000000 0x0 0x1000000>;
        };
  };

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8568mds.dts powerpc.git/arch/powerpc/boot/dts/mpc8568mds.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8568mds.dts      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8568mds.dts   2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc8568mds.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/mpc8568mds.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/mpc8568mds.dts

 @@ -1,7 +1,7 @@
  /*
   * MPC8568E MDS Device Tree Source
 @@ -1,7 +1,7 @@
  /*
   * MPC8568E MDS Device Tree Source


@@ -7070,9 +7111,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8568mds.dts powerpc.
                };
        };
  };
                };
        };
  };

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8572ds.dts powerpc.git/arch/powerpc/boot/dts/mpc8572ds.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8572ds.dts       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8572ds.dts    2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc8572ds.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/mpc8572ds.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/mpc8572ds.dts

 @@ -1,7 +1,7 @@
  /*
   * MPC8572 DS Device Tree Source
 @@ -1,7 +1,7 @@
  /*
   * MPC8572 DS Device Tree Source


@@ -7733,9 +7775,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8572ds.dts powerpc.g
                };
        };
  };
                };
        };
  };

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8641_hpcn.dts powerpc.git/arch/powerpc/boot/dts/mpc8641_hpcn.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8641_hpcn.dts    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8641_hpcn.dts 2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc8641_hpcn.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/mpc8641_hpcn.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/mpc8641_hpcn.dts

 @@ -13,7 +13,7 @@
  
  / {
 @@ -13,7 +13,7 @@
  
  / {


@@ -7745,9 +7788,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8641_hpcn.dts powerp
        #address-cells = <1>;
        #size-cells = <1>;
  
        #address-cells = <1>;
        #size-cells = <1>;
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc866ads.dts powerpc.git/arch/powerpc/boot/dts/mpc866ads.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc866ads.dts       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc866ads.dts    2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc866ads.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/mpc866ads.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/mpc866ads.dts

 @@ -2,6 +2,7 @@
   * MPC866 ADS Device Tree Source
   *
 @@ -2,6 +2,7 @@
   * MPC866 ADS Device Tree Source
   *


@@ -7932,9 +7976,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc866ads.dts powerpc.g
                                interrupt-parent = <&CPM_PIC>;
                                fsl,cpm-command = <0000>;
                                linux,network-index = <1>;
                                interrupt-parent = <&CPM_PIC>;
                                fsl,cpm-command = <0000>;
                                linux,network-index = <1>;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc885ads.dts powerpc.git/arch/powerpc/boot/dts/mpc885ads.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc885ads.dts       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc885ads.dts    2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc885ads.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/mpc885ads.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/mpc885ads.dts

 @@ -2,7 +2,7 @@
   * MPC885 ADS Device Tree Source
   *
 @@ -2,7 +2,7 @@
   * MPC885 ADS Device Tree Source
   *


@@ -8171,9 +8216,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc885ads.dts powerpc.g
                                linux,network-index = <2>;
                        };
                };
                                linux,network-index = <2>;
                        };
                };

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/pq2fads.dts powerpc.git/arch/powerpc/boot/dts/pq2fads.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/pq2fads.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/pq2fads.dts      2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/pq2fads.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/pq2fads.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/pq2fads.dts

 @@ -1,7 +1,7 @@
  /*
   * Device Tree for the PQ2FADS-ZU board with an MPC8280 chip.
 @@ -1,7 +1,7 @@
  /*
   * Device Tree for the PQ2FADS-ZU board with an MPC8280 chip.


@@ -8463,9 +8509,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/pq2fads.dts powerpc.git
                        compatible = "fsl,mpc8280-pic", "fsl,cpm2-pic";
                };
  
                        compatible = "fsl,mpc8280-pic", "fsl,cpm2-pic";
                };
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/prpmc2800.dts powerpc.git/arch/powerpc/boot/dts/prpmc2800.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/prpmc2800.dts       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/prpmc2800.dts    2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/prpmc2800.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/prpmc2800.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/prpmc2800.dts

 @@ -11,6 +11,8 @@
   * if it can determine the exact PrPMC type.
   */
 @@ -11,6 +11,8 @@
   * if it can determine the exact PrPMC type.
   */


@@ -8931,9 +8978,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/prpmc2800.dts powerpc.g
 +              linux,stdout-path = &MPSC0;
        };
  };
 +              linux,stdout-path = &MPSC0;
        };
  };

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/rainier.dts powerpc.git/arch/powerpc/boot/dts/rainier.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/rainier.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/rainier.dts      2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/rainier.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/rainier.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/rainier.dts

 @@ -254,7 +254,6 @@
                        };
  
 @@ -254,7 +254,6 @@
                        };
  


@@ -8968,9 +9016,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/rainier.dts powerpc.git
                                rx-fifo-size = <1000>;
                                tx-fifo-size = <800>;
                                phy-mode = "rgmii";
                                rx-fifo-size = <1000>;
                                tx-fifo-size = <800>;
                                phy-mode = "rgmii";

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/sbc8641d.dts powerpc.git/arch/powerpc/boot/dts/sbc8641d.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/sbc8641d.dts        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/sbc8641d.dts     2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/sbc8641d.dts
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/boot/dts/sbc8641d.dts

 @@ -0,0 +1,352 @@
 +/*
 + * SBC8641D Device Tree Source
 @@ -0,0 +1,352 @@
 +/*
 + * SBC8641D Device Tree Source


@@ -9324,9 +9373,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/sbc8641d.dts powerpc.gi
 +              };
 +      };
 +};
 +              };
 +      };
 +};

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/sequoia.dts powerpc.git/arch/powerpc/boot/dts/sequoia.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/sequoia.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/sequoia.dts      2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/sequoia.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/sequoia.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/sequoia.dts

 @@ -269,7 +269,6 @@
                        };
  
 @@ -269,7 +269,6 @@
                        };
  


@@ -9361,9 +9411,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/sequoia.dts powerpc.git
                                rx-fifo-size = <1000>;
                                tx-fifo-size = <800>;
                                phy-mode = "rgmii";
                                rx-fifo-size = <1000>;
                                tx-fifo-size = <800>;
                                phy-mode = "rgmii";

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/taishan.dts powerpc.git/arch/powerpc/boot/dts/taishan.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/taishan.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/taishan.dts      2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/taishan.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/taishan.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/taishan.dts

 @@ -104,6 +104,16 @@
                // FIXME: anything else?
        };
 @@ -104,6 +104,16 @@
                // FIXME: anything else?
        };


@@ -9457,9 +9508,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/taishan.dts powerpc.git
                        };
  
  
                        };
  
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/walnut.dts powerpc.git/arch/powerpc/boot/dts/walnut.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/walnut.dts  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/walnut.dts       2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/walnut.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/walnut.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/walnut.dts

 @@ -125,7 +125,6 @@
                        };
  
 @@ -125,7 +125,6 @@
                        };
  


@@ -9468,9 +9520,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/walnut.dts powerpc.git/
                                device_type = "network";
                                compatible = "ibm,emac-405gp", "ibm,emac";
                                interrupt-parent = <&UIC0>;
                                device_type = "network";
                                compatible = "ibm,emac-405gp", "ibm,emac";
                                interrupt-parent = <&UIC0>;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/warp.dts powerpc.git/arch/powerpc/boot/dts/warp.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/warp.dts    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/warp.dts 2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/warp.dts
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/dts/warp.dts
++++ linux-2.6.25.1/arch/powerpc/boot/dts/warp.dts

 @@ -204,7 +204,6 @@
                        };
  
 @@ -204,7 +204,6 @@
                        };
  


@@ -9479,9 +9532,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/warp.dts powerpc.git/ar
                                device_type = "network";
                                compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
                                interrupt-parent = <&UIC1>;
                                device_type = "network";
                                compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
                                interrupt-parent = <&UIC1>;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/yosemite.dts powerpc.git/arch/powerpc/boot/dts/yosemite.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/yosemite.dts        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/yosemite.dts     2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/dts/yosemite.dts
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/boot/dts/yosemite.dts

 @@ -0,0 +1,304 @@
 +/*
 + * Device Tree Source for AMCC Yosemite
 @@ -0,0 +1,304 @@
 +/*
 + * Device Tree Source for AMCC Yosemite


@@ -9787,10 +9841,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/yosemite.dts powerpc.gi
 +              linux,stdout-path = "/plb/opb/serial@ef600300";
 +      };
 +};
 +              linux,stdout-path = "/plb/opb/serial@ef600300";
 +      };
 +};

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/ebony.c powerpc.git/arch/powerpc/boot/ebony.c
---- linux-2.6.25-rc9/arch/powerpc/boot/ebony.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/ebony.c      2008-04-19 16:40:52.000000000 +0200
-@@ -75,7 +75,8 @@
+Index: linux-2.6.25.1/arch/powerpc/boot/ebony.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/ebony.c
++++ linux-2.6.25.1/arch/powerpc/boot/ebony.c
+@@ -75,7 +75,8 @@ static void ebony_fixups(void)

  
        ibm440gp_fixup_clocks(sysclk, 6 * 1843200);
        ibm4xx_sdram_fixup_memsize();
  
        ibm440gp_fixup_clocks(sysclk, 6 * 1843200);
        ibm4xx_sdram_fixup_memsize();


@@ -9800,9 +9855,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/ebony.c powerpc.git/arch/po
        ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
        ebony_flashsel_fixup();
  }
        ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
        ebony_flashsel_fixup();
  }

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/libfdt-wrapper.c powerpc.git/arch/powerpc/boot/libfdt-wrapper.c
---- linux-2.6.25-rc9/arch/powerpc/boot/libfdt-wrapper.c        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/libfdt-wrapper.c     2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/libfdt-wrapper.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/libfdt-wrapper.c
++++ linux-2.6.25.1/arch/powerpc/boot/libfdt-wrapper.c

 @@ -35,7 +35,7 @@
  #define check_err(err) \
        ({ \
 @@ -35,7 +35,7 @@
  #define check_err(err) \
        ({ \


@@ -9812,10 +9868,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/libfdt-wrapper.c powerpc.gi
                               fdt_strerror(err)); \
                if (BAD_ERROR(err)) \
                        exit(); \
                               fdt_strerror(err)); \
                if (BAD_ERROR(err)) \
                        exit(); \

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/mpc52xx-psc.c powerpc.git/arch/powerpc/boot/mpc52xx-psc.c
---- linux-2.6.25-rc9/arch/powerpc/boot/mpc52xx-psc.c   2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/mpc52xx-psc.c        2008-04-19 16:40:52.000000000 +0200
-@@ -51,14 +51,9 @@
+Index: linux-2.6.25.1/arch/powerpc/boot/mpc52xx-psc.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/mpc52xx-psc.c
++++ linux-2.6.25.1/arch/powerpc/boot/mpc52xx-psc.c
+@@ -51,14 +51,9 @@ static unsigned char psc_getc(void)

  
  int mpc5200_psc_console_init(void *devp, struct serial_console_data *scdp)
  {
  
  int mpc5200_psc_console_init(void *devp, struct serial_console_data *scdp)
  {


@@ -9832,10 +9889,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/mpc52xx-psc.c powerpc.git/a
  
        scdp->open = psc_open;
        scdp->putc = psc_putc;
  
        scdp->open = psc_open;
        scdp->putc = psc_putc;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/mpsc.c powerpc.git/arch/powerpc/boot/mpsc.c
---- linux-2.6.25-rc9/arch/powerpc/boot/mpsc.c  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/mpsc.c       2008-04-19 16:40:52.000000000 +0200
-@@ -141,7 +141,7 @@
+Index: linux-2.6.25.1/arch/powerpc/boot/mpsc.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/mpsc.c
++++ linux-2.6.25.1/arch/powerpc/boot/mpsc.c
+@@ -141,7 +141,7 @@ int mpsc_console_init(void *devp, struct

        if (mpscintr_base == NULL)
                goto err_out;
  
        if (mpscintr_base == NULL)
                goto err_out;
  


@@ -9844,10 +9902,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/mpsc.c powerpc.git/arch/pow
        if (n != sizeof(v))
                goto err_out;
        reg_set = (int)v;
        if (n != sizeof(v))
                goto err_out;
        reg_set = (int)v;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/mv64x60.c powerpc.git/arch/powerpc/boot/mv64x60.c
---- linux-2.6.25-rc9/arch/powerpc/boot/mv64x60.c       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/mv64x60.c    2008-04-19 16:40:52.000000000 +0200
-@@ -535,7 +535,7 @@
+Index: linux-2.6.25.1/arch/powerpc/boot/mv64x60.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/mv64x60.c
++++ linux-2.6.25.1/arch/powerpc/boot/mv64x60.c
+@@ -535,7 +535,7 @@ u8 *mv64x60_get_bridge_pbase(void)

        u32 v[2];
        void *devp;
  
        u32 v[2];
        void *devp;
  


@@ -9856,7 +9915,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/mv64x60.c powerpc.git/arch/
        if (devp == NULL)
                goto err_out;
        if (getprop(devp, "reg", v, sizeof(v)) != sizeof(v))
        if (devp == NULL)
                goto err_out;
        if (getprop(devp, "reg", v, sizeof(v)) != sizeof(v))

-@@ -553,7 +553,7 @@
+@@ -553,7 +553,7 @@ u8 *mv64x60_get_bridge_base(void)

        u32 v;
        void *devp;
  
        u32 v;
        void *devp;
  


@@ -9865,10 +9924,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/mv64x60.c powerpc.git/arch/
        if (devp == NULL)
                goto err_out;
        if (getprop(devp, "virtual-reg", &v, sizeof(v)) != sizeof(v))
        if (devp == NULL)
                goto err_out;
        if (getprop(devp, "virtual-reg", &v, sizeof(v)) != sizeof(v))

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/mv64x60_i2c.c powerpc.git/arch/powerpc/boot/mv64x60_i2c.c
---- linux-2.6.25-rc9/arch/powerpc/boot/mv64x60_i2c.c   2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/mv64x60_i2c.c        2008-04-19 16:40:52.000000000 +0200
-@@ -185,7 +185,7 @@
+Index: linux-2.6.25.1/arch/powerpc/boot/mv64x60_i2c.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/mv64x60_i2c.c
++++ linux-2.6.25.1/arch/powerpc/boot/mv64x60_i2c.c
+@@ -185,7 +185,7 @@ int mv64x60_i2c_open(void)

        u32 v;
        void *devp;
  
        u32 v;
        void *devp;
  


@@ -9877,10 +9937,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/mv64x60_i2c.c powerpc.git/a
        if (devp == NULL)
                goto err_out;
        if (getprop(devp, "virtual-reg", &v, sizeof(v)) != sizeof(v))
        if (devp == NULL)
                goto err_out;
        if (getprop(devp, "virtual-reg", &v, sizeof(v)) != sizeof(v))

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/ns16550.c powerpc.git/arch/powerpc/boot/ns16550.c
---- linux-2.6.25-rc9/arch/powerpc/boot/ns16550.c       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/ns16550.c    2008-04-19 16:40:52.000000000 +0200
-@@ -55,15 +55,9 @@
+Index: linux-2.6.25.1/arch/powerpc/boot/ns16550.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/ns16550.c
++++ linux-2.6.25.1/arch/powerpc/boot/ns16550.c
+@@ -55,15 +55,9 @@ static u8 ns16550_tstc(void)

  int ns16550_console_init(void *devp, struct serial_console_data *scdp)
  {
        int n;
  int ns16550_console_init(void *devp, struct serial_console_data *scdp)
  {
        int n;


@@ -9898,10 +9959,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/ns16550.c powerpc.git/arch/
  
        n = getprop(devp, "reg-shift", &reg_shift, sizeof(reg_shift));
        if (n != sizeof(reg_shift))
  
        n = getprop(devp, "reg-shift", &reg_shift, sizeof(reg_shift));
        if (n != sizeof(reg_shift))

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/ops.h powerpc.git/arch/powerpc/boot/ops.h
---- linux-2.6.25-rc9/arch/powerpc/boot/ops.h   2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/ops.h        2008-04-19 16:40:52.000000000 +0200
-@@ -95,6 +95,7 @@
+Index: linux-2.6.25.1/arch/powerpc/boot/ops.h
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/ops.h
++++ linux-2.6.25.1/arch/powerpc/boot/ops.h
+@@ -95,6 +95,7 @@ int dt_xlate_reg(void *node, int res, un

  int dt_xlate_addr(void *node, u32 *buf, int buflen, unsigned long *xlated_addr);
  int dt_is_compatible(void *node, const char *compat);
  void dt_get_reg_format(void *node, u32 *naddr, u32 *nsize);
  int dt_xlate_addr(void *node, u32 *buf, int buflen, unsigned long *xlated_addr);
  int dt_is_compatible(void *node, const char *compat);
  void dt_get_reg_format(void *node, u32 *naddr, u32 *nsize);


@@ -9909,10 +9971,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/ops.h powerpc.git/arch/powe
  
  static inline void *finddevice(const char *name)
  {
  
  static inline void *finddevice(const char *name)
  {

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/prpmc2800.c powerpc.git/arch/powerpc/boot/prpmc2800.c
---- linux-2.6.25-rc9/arch/powerpc/boot/prpmc2800.c     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/prpmc2800.c  2008-04-19 16:40:52.000000000 +0200
-@@ -344,20 +344,20 @@
+Index: linux-2.6.25.1/arch/powerpc/boot/prpmc2800.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/prpmc2800.c
++++ linux-2.6.25.1/arch/powerpc/boot/prpmc2800.c
+@@ -344,20 +344,20 @@ static void prpmc2800_bridge_setup(u32 m

                        acc_bits);
  
        /* Get the cpu -> pci i/o & mem mappings from the device tree */
                        acc_bits);
  
        /* Get the cpu -> pci i/o & mem mappings from the device tree */


@@ -9938,7 +10001,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/prpmc2800.c powerpc.git/arc
  
        enables = in_le32((u32 *)(bridge_base + MV64x60_CPU_BAR_ENABLE));
        enables |= 0x0007fe00; /* Disable all cpu->pci windows */
  
        enables = in_le32((u32 *)(bridge_base + MV64x60_CPU_BAR_ENABLE));
        enables |= 0x0007fe00; /* Disable all cpu->pci windows */

-@@ -429,9 +429,9 @@
+@@ -429,9 +429,9 @@ static void prpmc2800_fixups(void)

        setprop(devp, "model", model, l);
  
        /* Set /cpus/PowerPC,7447/clock-frequency */
        setprop(devp, "model", model, l);
  
        /* Set /cpus/PowerPC,7447/clock-frequency */


@@ -9950,7 +10013,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/prpmc2800.c powerpc.git/arc
        v[0] = bip->core_speed;
        setprop(devp, "clock-frequency", &v[0], sizeof(v[0]));
  
        v[0] = bip->core_speed;
        setprop(devp, "clock-frequency", &v[0], sizeof(v[0]));
  

-@@ -443,16 +443,17 @@
+@@ -443,16 +443,17 @@ static void prpmc2800_fixups(void)

        v[1] = bip->mem_size;
        setprop(devp, "reg", v, sizeof(v));
  
        v[1] = bip->mem_size;
        setprop(devp, "reg", v, sizeof(v));
  


@@ -9972,9 +10035,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/prpmc2800.c powerpc.git/arc
        if (devp == NULL)
                fatal("Error: Missing User FLASH device tree node\n\r");
        rc = getprop(devp, "reg", v, sizeof(v));
        if (devp == NULL)
                fatal("Error: Missing User FLASH device tree node\n\r");
        rc = getprop(devp, "reg", v, sizeof(v));

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/ps3-head.S powerpc.git/arch/powerpc/boot/ps3-head.S
---- linux-2.6.25-rc9/arch/powerpc/boot/ps3-head.S      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/ps3-head.S   2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/ps3-head.S
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/ps3-head.S
++++ linux-2.6.25.1/arch/powerpc/boot/ps3-head.S

 @@ -27,8 +27,9 @@
  /*
   * __system_reset_overlay - The PS3 first stage entry.
 @@ -27,8 +27,9 @@
  /*
   * __system_reset_overlay - The PS3 first stage entry.


@@ -9987,7 +10051,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/ps3-head.S powerpc.git/arch
   *
   * The PS3 has a single processor with two threads.
   */
   *
   * The PS3 has a single processor with two threads.
   */

-@@ -47,8 +48,6 @@
+@@ -47,8 +48,6 @@ __system_reset_overlay:

  
        mfspr   r3, 0x88
        cntlzw. r3, r3
  
        mfspr   r3, 0x88
        cntlzw. r3, r3


@@ -9996,7 +10060,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/ps3-head.S powerpc.git/arch
        beq     1f
  
        /* Secondary goes to __secondary_hold in kernel. */
        beq     1f
  
        /* Secondary goes to __secondary_hold in kernel. */

-@@ -57,8 +56,14 @@
+@@ -57,8 +56,14 @@ __system_reset_overlay:

        mtctr   r4
        bctr
  
        mtctr   r4
        bctr
  


@@ -10012,7 +10076,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/ps3-head.S powerpc.git/arch
        or      31, 31, 31 /* db16cyc */
        or      31, 31, 31 /* db16cyc */
  
        or      31, 31, 31 /* db16cyc */
        or      31, 31, 31 /* db16cyc */
  

-@@ -67,16 +72,18 @@
+@@ -67,16 +72,18 @@ __system_reset_overlay:

        mtctr   r4
        bctr
  
        mtctr   r4
        bctr
  


@@ -10035,9 +10099,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/ps3-head.S powerpc.git/arch
  
 -      . = __system_reset_kernel + 0x100
 +      . = __system_reset_kernel + 512
  
 -      . = __system_reset_kernel + 0x100
 +      . = __system_reset_kernel + 512

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/ps3.c powerpc.git/arch/powerpc/boot/ps3.c
---- linux-2.6.25-rc9/arch/powerpc/boot/ps3.c   2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/ps3.c        2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/ps3.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/ps3.c
++++ linux-2.6.25.1/arch/powerpc/boot/ps3.c

 @@ -27,10 +27,10 @@
  #include "page.h"
  #include "ops.h"
 @@ -27,10 +27,10 @@
  #include "page.h"
  #include "ops.h"


@@ -10053,7 +10118,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/ps3.c powerpc.git/arch/powe
        u64 in_4, u64 in_5, u64 *out_1, u64 *out_2);
  
  #ifdef DEBUG
        u64 in_4, u64 in_5, u64 *out_1, u64 *out_2);
  
  #ifdef DEBUG

-@@ -46,6 +46,7 @@
+@@ -46,6 +46,7 @@ BSS_STACK(4096);

   * edit the command line passed to vmlinux (by setting /chosen/bootargs).
   * The buffer is put in it's own section so that tools may locate it easier.
   */
   * edit the command line passed to vmlinux (by setting /chosen/bootargs).
   * The buffer is put in it's own section so that tools may locate it easier.
   */


@@ -10061,7 +10126,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/ps3.c powerpc.git/arch/powe
  static char cmdline[COMMAND_LINE_SIZE]
        __attribute__((__section__("__builtin_cmdline")));
  
  static char cmdline[COMMAND_LINE_SIZE]
        __attribute__((__section__("__builtin_cmdline")));
  

-@@ -75,7 +76,7 @@
+@@ -75,7 +76,7 @@ static void ps3_exit(void)

  
  static int ps3_repository_read_rm_size(u64 *rm_size)
  {
  
  static int ps3_repository_read_rm_size(u64 *rm_size)
  {


@@ -10070,7 +10135,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/ps3.c powerpc.git/arch/powe
        u64 lpar_id;
        u64 ppe_id;
        u64 v2;
        u64 lpar_id;
        u64 ppe_id;
        u64 v2;

-@@ -114,16 +115,17 @@
+@@ -114,16 +115,17 @@ void ps3_copy_vectors(void)

  {
        extern char __system_reset_kernel[];
  
  {
        extern char __system_reset_kernel[];
  


@@ -10091,7 +10156,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/ps3.c powerpc.git/arch/powe
  
        console_ops.write = ps3_console_write;
        platform_ops.exit = ps3_exit;
  
        console_ops.write = ps3_console_write;
        platform_ops.exit = ps3_exit;

-@@ -151,6 +153,11 @@
+@@ -151,6 +153,11 @@ void platform_init(void)

  
        printf(" flat tree at 0x%lx\n\r", ft_addr);
  
  
        printf(" flat tree at 0x%lx\n\r", ft_addr);
  


@@ -10103,10 +10168,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/ps3.c powerpc.git/arch/powe
        ((kernel_entry_t)0)(ft_addr, 0, NULL);
  
        ps3_exit();
        ((kernel_entry_t)0)(ft_addr, 0, NULL);
  
        ps3_exit();

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/serial.c powerpc.git/arch/powerpc/boot/serial.c
---- linux-2.6.25-rc9/arch/powerpc/boot/serial.c        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/serial.c     2008-04-19 16:40:52.000000000 +0200
-@@ -119,7 +119,7 @@
+Index: linux-2.6.25.1/arch/powerpc/boot/serial.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/serial.c
++++ linux-2.6.25.1/arch/powerpc/boot/serial.c
+@@ -119,7 +119,7 @@ int serial_console_init(void)

  
        if (dt_is_compatible(devp, "ns16550"))
                rc = ns16550_console_init(devp, &serial_cd);
  
        if (dt_is_compatible(devp, "ns16550"))
                rc = ns16550_console_init(devp, &serial_cd);


@@ -10115,9 +10181,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/serial.c powerpc.git/arch/p
                rc = mpsc_console_init(devp, &serial_cd);
        else if (dt_is_compatible(devp, "fsl,cpm1-scc-uart") ||
                 dt_is_compatible(devp, "fsl,cpm1-smc-uart") ||
                rc = mpsc_console_init(devp, &serial_cd);
        else if (dt_is_compatible(devp, "fsl,cpm1-scc-uart") ||
                 dt_is_compatible(devp, "fsl,cpm1-smc-uart") ||

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/simpleboot.c powerpc.git/arch/powerpc/boot/simpleboot.c
---- linux-2.6.25-rc9/arch/powerpc/boot/simpleboot.c    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/simpleboot.c 2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/simpleboot.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/boot/simpleboot.c

 @@ -0,0 +1,84 @@
 +/*
 + * The simple platform -- for booting when firmware doesn't supply a device
 @@ -0,0 +1,84 @@
 +/*
 + * The simple platform -- for booting when firmware doesn't supply a device


@@ -10203,10 +10270,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/simpleboot.c powerpc.git/ar
 +      fdt_init(_dtb_start);
 +      serial_console_init();
 +}
 +      fdt_init(_dtb_start);
 +      serial_console_init();
 +}

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/treeboot-walnut.c powerpc.git/arch/powerpc/boot/treeboot-walnut.c
---- linux-2.6.25-rc9/arch/powerpc/boot/treeboot-walnut.c       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/treeboot-walnut.c    2008-04-19 16:40:52.000000000 +0200
-@@ -68,7 +68,7 @@
+Index: linux-2.6.25.1/arch/powerpc/boot/treeboot-walnut.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/treeboot-walnut.c
++++ linux-2.6.25.1/arch/powerpc/boot/treeboot-walnut.c
+@@ -68,7 +68,7 @@ static void walnut_fixups(void)

        ibm4xx_quiesce_eth((u32 *)0xef600800, NULL);
        ibm4xx_fixup_ebc_ranges("/plb/ebc");
        walnut_flashsel_fixup();
        ibm4xx_quiesce_eth((u32 *)0xef600800, NULL);
        ibm4xx_fixup_ebc_ranges("/plb/ebc");
        walnut_flashsel_fixup();


@@ -10215,9 +10283,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/treeboot-walnut.c powerpc.g
  }
  
  void platform_init(void)
  }
  
  void platform_init(void)

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/virtex405-head.S powerpc.git/arch/powerpc/boot/virtex405-head.S
---- linux-2.6.25-rc9/arch/powerpc/boot/virtex405-head.S        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/virtex405-head.S     2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/boot/virtex405-head.S
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/boot/virtex405-head.S

 @@ -0,0 +1,30 @@
 +#include "ppc_asm.h"
 +
 @@ -0,0 +1,30 @@
 +#include "ppc_asm.h"
 +


@@ -10249,10 +10318,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/virtex405-head.S powerpc.gi
 +      addi    r9,r9,0x20
 +      bdnz    1b
 +2:    b       _zimage_start_lib
 +      addi    r9,r9,0x20
 +      bdnz    1b
 +2:    b       _zimage_start_lib

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/wrapper powerpc.git/arch/powerpc/boot/wrapper
---- linux-2.6.25-rc9/arch/powerpc/boot/wrapper 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/wrapper      2008-04-19 16:40:52.000000000 +0200
-@@ -174,7 +174,7 @@
+Index: linux-2.6.25.1/arch/powerpc/boot/wrapper
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/boot/wrapper
++++ linux-2.6.25.1/arch/powerpc/boot/wrapper
+@@ -174,7 +174,7 @@ cuboot*)

      *-mpc83*)
          platformo=$object/cuboot-83xx.o
          ;;
      *-mpc83*)
          platformo=$object/cuboot-83xx.o
          ;;


@@ -10261,7 +10331,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/wrapper powerpc.git/arch/po
          platformo=$object/cuboot-85xx-cpm2.o
          ;;
      *-mpc85*|*-tqm8540|*-sbc85*)
          platformo=$object/cuboot-85xx-cpm2.o
          ;;
      *-mpc85*|*-tqm8540|*-sbc85*)

-@@ -199,6 +199,10 @@
+@@ -199,6 +199,10 @@ adder875-redboot)

      platformo="$object/fixed-head.o $object/redboot-8xx.o"
      binary=y
      ;;
      platformo="$object/fixed-head.o $object/redboot-8xx.o"
      binary=y
      ;;


@@ -10272,7 +10342,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/wrapper powerpc.git/arch/po
  esac
  
  vmz="$tmpdir/`basename \"$kernel\"`.$ext"
  esac
  
  vmz="$tmpdir/`basename \"$kernel\"`.$ext"

-@@ -226,10 +230,13 @@
+@@ -226,10 +230,13 @@ if [ -n "$version" ]; then

      uboot_version="-n Linux-$version"
  fi
  
      uboot_version="-n Linux-$version"
  fi
  


@@ -10287,7 +10357,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/wrapper powerpc.git/arch/po
        $uboot_version -d "$vmz" "$ofile"
      if [ -z "$cacheit" ]; then
        rm -f "$vmz"
        $uboot_version -d "$vmz" "$ofile"
      if [ -z "$cacheit" ]; then
        rm -f "$vmz"

-@@ -298,15 +305,16 @@
+@@ -298,15 +305,16 @@ treeboot*)

      exit 0
      ;;
  ps3)
      exit 0
      ;;
  ps3)


@@ -10313,7 +10383,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/wrapper powerpc.git/arch/po
  
      system_reset_overlay=0x`${CROSS}nm "$ofile" \
          | grep ' __system_reset_overlay$'       \
  
      system_reset_overlay=0x`${CROSS}nm "$ofile" \
          | grep ' __system_reset_overlay$'       \

-@@ -317,7 +325,7 @@
+@@ -317,7 +325,7 @@ ps3)

          | cut -d' ' -f1`
      system_reset_kernel=`printf "%d" $system_reset_kernel`
      overlay_dest="256"
          | cut -d' ' -f1`
      system_reset_kernel=`printf "%d" $system_reset_kernel`
      overlay_dest="256"


@@ -10322,9 +10392,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/wrapper powerpc.git/arch/po
  
      ${CROSS}objcopy -O binary "$ofile" "$ofile.bin"
  
  
      ${CROSS}objcopy -O binary "$ofile" "$ofile.bin"
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/40x/ep405_defconfig powerpc.git/arch/powerpc/configs/40x/ep405_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/40x/ep405_defconfig  1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/40x/ep405_defconfig       2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/40x/ep405_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/40x/ep405_defconfig

 @@ -0,0 +1,968 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,968 @@
 +#
 +# Automatically generated make config: don't edit


@@ -11294,9 +11365,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/40x/ep405_defconfig powe
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/40x/kilauea_defconfig powerpc.git/arch/powerpc/configs/40x/kilauea_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/40x/kilauea_defconfig        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/40x/kilauea_defconfig     2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/40x/kilauea_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/40x/kilauea_defconfig

 @@ -0,0 +1,839 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,839 @@
 +#
 +# Automatically generated make config: don't edit


@@ -12137,9 +12209,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/40x/kilauea_defconfig po
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/40x/makalu_defconfig powerpc.git/arch/powerpc/configs/40x/makalu_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/40x/makalu_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/40x/makalu_defconfig      2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/40x/makalu_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/40x/makalu_defconfig

 @@ -0,0 +1,839 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,839 @@
 +#
 +# Automatically generated make config: don't edit


@@ -12980,9 +13053,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/40x/makalu_defconfig pow
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/40x/walnut_defconfig powerpc.git/arch/powerpc/configs/40x/walnut_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/40x/walnut_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/40x/walnut_defconfig      2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/40x/walnut_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/40x/walnut_defconfig

 @@ -0,0 +1,887 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,887 @@
 +#
 +# Automatically generated make config: don't edit


@@ -13871,9 +13945,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/40x/walnut_defconfig pow
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/44x/bamboo_defconfig powerpc.git/arch/powerpc/configs/44x/bamboo_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/44x/bamboo_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/44x/bamboo_defconfig      2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/44x/bamboo_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/44x/bamboo_defconfig

 @@ -0,0 +1,815 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,815 @@
 +#
 +# Automatically generated make config: don't edit


@@ -14690,9 +14765,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/44x/bamboo_defconfig pow
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/44x/canyonlands_defconfig powerpc.git/arch/powerpc/configs/44x/canyonlands_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/44x/canyonlands_defconfig    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/44x/canyonlands_defconfig 2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/44x/canyonlands_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/44x/canyonlands_defconfig

 @@ -0,0 +1,721 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,721 @@
 +#
 +# Automatically generated make config: don't edit


@@ -15415,9 +15491,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/44x/canyonlands_defconfi
 +# 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 -Nur linux-2.6.25-rc9/arch/powerpc/configs/44x/ebony_defconfig powerpc.git/arch/powerpc/configs/44x/ebony_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/44x/ebony_defconfig  1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/44x/ebony_defconfig       2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/44x/ebony_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/44x/ebony_defconfig

 @@ -0,0 +1,898 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,898 @@
 +#
 +# Automatically generated make config: don't edit


@@ -16317,9 +16394,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/44x/ebony_defconfig powe
 +# CONFIG_CRYPTO_LZO is not set
 +# CONFIG_CRYPTO_HW is not set
 +# CONFIG_PPC_CLOCK is not set
 +# CONFIG_CRYPTO_LZO is not set
 +# CONFIG_CRYPTO_HW is not set
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/44x/katmai_defconfig powerpc.git/arch/powerpc/configs/44x/katmai_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/44x/katmai_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/44x/katmai_defconfig      2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/44x/katmai_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/44x/katmai_defconfig

 @@ -0,0 +1,790 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,790 @@
 +#
 +# Automatically generated make config: don't edit


@@ -17111,9 +17189,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/44x/katmai_defconfig pow
 +# 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 -Nur linux-2.6.25-rc9/arch/powerpc/configs/44x/rainier_defconfig powerpc.git/arch/powerpc/configs/44x/rainier_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/44x/rainier_defconfig        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/44x/rainier_defconfig     2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/44x/rainier_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/44x/rainier_defconfig

 @@ -0,0 +1,899 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,899 @@
 +#
 +# Automatically generated make config: don't edit


@@ -18014,9 +18093,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/44x/rainier_defconfig po
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/44x/sequoia_defconfig powerpc.git/arch/powerpc/configs/44x/sequoia_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/44x/sequoia_defconfig        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/44x/sequoia_defconfig     2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/44x/sequoia_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/44x/sequoia_defconfig

 @@ -0,0 +1,916 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,916 @@
 +#
 +# Automatically generated make config: don't edit


@@ -18934,9 +19014,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/44x/sequoia_defconfig po
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/44x/taishan_defconfig powerpc.git/arch/powerpc/configs/44x/taishan_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/44x/taishan_defconfig        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/44x/taishan_defconfig     2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/44x/taishan_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/44x/taishan_defconfig

 @@ -0,0 +1,815 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,815 @@
 +#
 +# Automatically generated make config: don't edit


@@ -19753,9 +19834,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/44x/taishan_defconfig po
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/44x/warp_defconfig powerpc.git/arch/powerpc/configs/44x/warp_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/44x/warp_defconfig   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/44x/warp_defconfig        2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/44x/warp_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/44x/warp_defconfig

 @@ -0,0 +1,1110 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,1110 @@
 +#
 +# Automatically generated make config: don't edit


@@ -20867,9 +20949,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/44x/warp_defconfig power
 +# CONFIG_CRYPTO_LZO is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set
 +# CONFIG_CRYPTO_LZO is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig powerpc.git/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig        2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig

 @@ -0,0 +1,1395 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,1395 @@
 +#
 +# Automatically generated make config: don't edit


@@ -22266,9 +22349,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc8313_rdb_defconf
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig powerpc.git/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig        2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig

 @@ -0,0 +1,1451 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,1451 @@
 +#
 +# Automatically generated make config: don't edit


@@ -23721,9 +23805,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc8315_rdb_defconf
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc832x_mds_defconfig powerpc.git/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc832x_mds_defconfig   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/83xx/mpc832x_mds_defconfig        2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/83xx/mpc832x_mds_defconfig

 @@ -0,0 +1,1081 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,1081 @@
 +#
 +# Automatically generated make config: don't edit


@@ -24806,9 +24891,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc832x_mds_defconf
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig powerpc.git/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig        2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig

 @@ -0,0 +1,1233 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,1233 @@
 +#
 +# Automatically generated make config: don't edit


@@ -26043,9 +26129,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc832x_rdb_defconf
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc834x_itx_defconfig powerpc.git/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc834x_itx_defconfig   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/83xx/mpc834x_itx_defconfig        2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/83xx/mpc834x_itx_defconfig

 @@ -0,0 +1,1295 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,1295 @@
 +#
 +# Automatically generated make config: don't edit


@@ -27342,9 +27429,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc834x_itx_defconf
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig powerpc.git/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig      2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig

 @@ -0,0 +1,1222 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,1222 @@
 +#
 +# Automatically generated make config: don't edit


@@ -28568,9 +28656,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc834x_itxgp_defco
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc834x_mds_defconfig powerpc.git/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc834x_mds_defconfig   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/83xx/mpc834x_mds_defconfig        2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/83xx/mpc834x_mds_defconfig

 @@ -0,0 +1,1021 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,1021 @@
 +#
 +# Automatically generated make config: don't edit


@@ -29593,9 +29682,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc834x_mds_defconf
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc836x_mds_defconfig powerpc.git/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc836x_mds_defconfig   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/83xx/mpc836x_mds_defconfig        2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/83xx/mpc836x_mds_defconfig

 @@ -0,0 +1,1079 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,1079 @@
 +#
 +# Automatically generated make config: don't edit


@@ -30676,9 +30766,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc836x_mds_defconf
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc837x_mds_defconfig powerpc.git/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc837x_mds_defconfig   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/83xx/mpc837x_mds_defconfig        2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/83xx/mpc837x_mds_defconfig

 @@ -0,0 +1,899 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,899 @@
 +#
 +# Automatically generated make config: don't edit


@@ -31579,9 +31670,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc837x_mds_defconf
 +# CONFIG_CRYPTO_LZO is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set
 +# CONFIG_CRYPTO_LZO is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig powerpc.git/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig        2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig

 @@ -0,0 +1,930 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,930 @@
 +#
 +# Automatically generated make config: don't edit


@@ -32513,9 +32605,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc837x_rdb_defconf
 +# CONFIG_CRYPTO_LZO is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set
 +# CONFIG_CRYPTO_LZO is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/sbc834x_defconfig powerpc.git/arch/powerpc/configs/83xx/sbc834x_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/83xx/sbc834x_defconfig       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/83xx/sbc834x_defconfig    2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/83xx/sbc834x_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/83xx/sbc834x_defconfig

 @@ -0,0 +1,828 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,828 @@
 +#
 +# Automatically generated make config: don't edit


@@ -33345,9 +33438,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/sbc834x_defconfig p
 +# CONFIG_CRYPTO_LZO is not set
 +# CONFIG_CRYPTO_HW is not set
 +# CONFIG_PPC_CLOCK is not set
 +# CONFIG_CRYPTO_LZO is not set
 +# CONFIG_CRYPTO_HW is not set
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/ksi8560_defconfig powerpc.git/arch/powerpc/configs/85xx/ksi8560_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/85xx/ksi8560_defconfig       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/85xx/ksi8560_defconfig    2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/85xx/ksi8560_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/85xx/ksi8560_defconfig

 @@ -0,0 +1,899 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,899 @@
 +#
 +# Automatically generated make config: don't edit


@@ -34248,9 +34342,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/ksi8560_defconfig p
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/mpc8540_ads_defconfig powerpc.git/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/85xx/mpc8540_ads_defconfig   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/85xx/mpc8540_ads_defconfig        2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/85xx/mpc8540_ads_defconfig

 @@ -0,0 +1,796 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,796 @@
 +#
 +# Automatically generated make config: don't edit


@@ -35048,9 +35143,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/mpc8540_ads_defconf
 +# CONFIG_CRYPTO_LZO is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set
 +# CONFIG_CRYPTO_LZO is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/mpc8544_ds_defconfig powerpc.git/arch/powerpc/configs/85xx/mpc8544_ds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/85xx/mpc8544_ds_defconfig    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/85xx/mpc8544_ds_defconfig 2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/85xx/mpc8544_ds_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/85xx/mpc8544_ds_defconfig

 @@ -0,0 +1,1564 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,1564 @@
 +#
 +# Automatically generated make config: don't edit


@@ -36616,9 +36712,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/mpc8544_ds_defconfi
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/mpc8560_ads_defconfig powerpc.git/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/85xx/mpc8560_ads_defconfig   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/85xx/mpc8560_ads_defconfig        2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/85xx/mpc8560_ads_defconfig

 @@ -0,0 +1,885 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,885 @@
 +#
 +# Automatically generated make config: don't edit


@@ -37505,9 +37602,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/mpc8560_ads_defconf
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/mpc8568mds_defconfig powerpc.git/arch/powerpc/configs/85xx/mpc8568mds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/85xx/mpc8568mds_defconfig    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/85xx/mpc8568mds_defconfig 2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/85xx/mpc8568mds_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/85xx/mpc8568mds_defconfig

 @@ -0,0 +1,1117 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,1117 @@
 +#
 +# Automatically generated make config: don't edit


@@ -38626,9 +38724,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/mpc8568mds_defconfi
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/mpc8572_ds_defconfig powerpc.git/arch/powerpc/configs/85xx/mpc8572_ds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/85xx/mpc8572_ds_defconfig    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/85xx/mpc8572_ds_defconfig 2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/85xx/mpc8572_ds_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/85xx/mpc8572_ds_defconfig

 @@ -0,0 +1,1549 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,1549 @@
 +#
 +# Automatically generated make config: don't edit


@@ -40179,9 +40278,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/mpc8572_ds_defconfi
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig powerpc.git/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig        2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig

 @@ -0,0 +1,935 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,935 @@
 +#
 +# Automatically generated make config: don't edit


@@ -41118,9 +41218,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/mpc85xx_cds_defconf
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/sbc8548_defconfig powerpc.git/arch/powerpc/configs/85xx/sbc8548_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/85xx/sbc8548_defconfig       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/85xx/sbc8548_defconfig    2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/85xx/sbc8548_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/85xx/sbc8548_defconfig

 @@ -0,0 +1,812 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,812 @@
 +#
 +# Automatically generated make config: don't edit


@@ -41934,9 +42035,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/sbc8548_defconfig p
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/sbc8560_defconfig powerpc.git/arch/powerpc/configs/85xx/sbc8560_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/85xx/sbc8560_defconfig       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/85xx/sbc8560_defconfig    2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/85xx/sbc8560_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/85xx/sbc8560_defconfig

 @@ -0,0 +1,830 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,830 @@
 +#
 +# Automatically generated make config: don't edit


@@ -42768,9 +42870,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/sbc8560_defconfig p
 +# CONFIG_CRYPTO_LZO is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set
 +# CONFIG_CRYPTO_LZO is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/stx_gp3_defconfig powerpc.git/arch/powerpc/configs/85xx/stx_gp3_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/85xx/stx_gp3_defconfig       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/85xx/stx_gp3_defconfig    2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/85xx/stx_gp3_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/85xx/stx_gp3_defconfig

 @@ -0,0 +1,1253 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,1253 @@
 +#
 +# Automatically generated make config: don't edit


@@ -44025,9 +44128,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/stx_gp3_defconfig p
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/tqm8540_defconfig powerpc.git/arch/powerpc/configs/85xx/tqm8540_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/85xx/tqm8540_defconfig       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/85xx/tqm8540_defconfig    2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/85xx/tqm8540_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/85xx/tqm8540_defconfig

 @@ -0,0 +1,1097 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,1097 @@
 +#
 +# Automatically generated make config: don't edit


@@ -45126,9 +45230,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/tqm8540_defconfig p
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/tqm8541_defconfig powerpc.git/arch/powerpc/configs/85xx/tqm8541_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/85xx/tqm8541_defconfig       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/85xx/tqm8541_defconfig    2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/85xx/tqm8541_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/85xx/tqm8541_defconfig

 @@ -0,0 +1,1109 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,1109 @@
 +#
 +# Automatically generated make config: don't edit


@@ -46239,9 +46344,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/tqm8541_defconfig p
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/tqm8555_defconfig powerpc.git/arch/powerpc/configs/85xx/tqm8555_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/85xx/tqm8555_defconfig       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/85xx/tqm8555_defconfig    2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/85xx/tqm8555_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/85xx/tqm8555_defconfig

 @@ -0,0 +1,1109 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,1109 @@
 +#
 +# Automatically generated make config: don't edit


@@ -47352,9 +47458,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/tqm8555_defconfig p
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/tqm8560_defconfig powerpc.git/arch/powerpc/configs/85xx/tqm8560_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/85xx/tqm8560_defconfig       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/85xx/tqm8560_defconfig    2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/85xx/tqm8560_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/85xx/tqm8560_defconfig

 @@ -0,0 +1,1109 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,1109 @@
 +#
 +# Automatically generated make config: don't edit


@@ -48465,9 +48572,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/tqm8560_defconfig p
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/bamboo_defconfig powerpc.git/arch/powerpc/configs/bamboo_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/bamboo_defconfig     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/bamboo_defconfig  1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/bamboo_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/bamboo_defconfig
++++ /dev/null

 @@ -1,815 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,815 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -49284,9 +49392,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/bamboo_defconfig powerpc
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/chrp32_defconfig powerpc.git/arch/powerpc/configs/chrp32_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/chrp32_defconfig     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/chrp32_defconfig  2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/chrp32_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/chrp32_defconfig
++++ linux-2.6.25.1/arch/powerpc/configs/chrp32_defconfig

 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit


@@ -49296,7 +49405,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/chrp32_defconfig powerpc
  #
  # CONFIG_PPC64 is not set
  
  #
  # CONFIG_PPC64 is not set
  

-@@ -74,8 +74,6 @@
+@@ -74,8 +74,6 @@ CONFIG_IKCONFIG_PROC=y

  CONFIG_LOG_BUF_SHIFT=15
  # CONFIG_CGROUPS is not set
  # CONFIG_GROUP_SCHED is not set
  CONFIG_LOG_BUF_SHIFT=15
  # CONFIG_CGROUPS is not set
  # CONFIG_GROUP_SCHED is not set


@@ -49305,7 +49414,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/chrp32_defconfig powerpc
  CONFIG_SYSFS_DEPRECATED=y
  CONFIG_SYSFS_DEPRECATED_V2=y
  # CONFIG_RELAY is not set
  CONFIG_SYSFS_DEPRECATED=y
  CONFIG_SYSFS_DEPRECATED_V2=y
  # CONFIG_RELAY is not set

-@@ -243,7 +241,7 @@
+@@ -243,7 +241,7 @@ CONFIG_PCI_SYSCALL=y

  # CONFIG_PCIEPORTBUS is not set
  CONFIG_ARCH_SUPPORTS_MSI=y
  # CONFIG_PCI_MSI is not set
  # CONFIG_PCIEPORTBUS is not set
  CONFIG_ARCH_SUPPORTS_MSI=y
  # CONFIG_PCI_MSI is not set


@@ -49314,7 +49423,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/chrp32_defconfig powerpc
  # CONFIG_PCI_DEBUG is not set
  # CONFIG_PCCARD is not set
  # CONFIG_HOTPLUG_PCI is not set
  # CONFIG_PCI_DEBUG is not set
  # CONFIG_PCCARD is not set
  # CONFIG_HOTPLUG_PCI is not set

-@@ -1328,6 +1326,7 @@
+@@ -1328,6 +1326,7 @@ CONFIG_PLIST=y

  CONFIG_HAS_IOMEM=y
  CONFIG_HAS_IOPORT=y
  CONFIG_HAS_DMA=y
  CONFIG_HAS_IOMEM=y
  CONFIG_HAS_IOPORT=y
  CONFIG_HAS_DMA=y


@@ -49322,9 +49431,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/chrp32_defconfig powerpc
  
  #
  # Kernel hacking
  
  #
  # Kernel hacking

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/ebony_defconfig powerpc.git/arch/powerpc/configs/ebony_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/ebony_defconfig      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/ebony_defconfig   1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/ebony_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/ebony_defconfig
++++ /dev/null

 @@ -1,898 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,898 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -50224,9 +50334,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/ebony_defconfig powerpc.
 -# CONFIG_CRYPTO_LZO is not set
 -# CONFIG_CRYPTO_HW is not set
 -# CONFIG_PPC_CLOCK is not set
 -# CONFIG_CRYPTO_LZO is not set
 -# CONFIG_CRYPTO_HW is not set
 -# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/ep405_defconfig powerpc.git/arch/powerpc/configs/ep405_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/ep405_defconfig      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/ep405_defconfig   1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/ep405_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/ep405_defconfig
++++ /dev/null

 @@ -1,968 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,968 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -51196,9 +51307,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/ep405_defconfig powerpc.
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/g5_defconfig powerpc.git/arch/powerpc/configs/g5_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/g5_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/g5_defconfig      2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/g5_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/g5_defconfig
++++ linux-2.6.25.1/arch/powerpc/configs/g5_defconfig

 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit


@@ -51208,7 +51320,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/g5_defconfig powerpc.git
  #
  CONFIG_PPC64=y
  
  #
  CONFIG_PPC64=y
  

-@@ -77,8 +77,6 @@
+@@ -77,8 +77,6 @@ CONFIG_IKCONFIG_PROC=y

  CONFIG_LOG_BUF_SHIFT=17
  # CONFIG_CGROUPS is not set
  # CONFIG_GROUP_SCHED is not set
  CONFIG_LOG_BUF_SHIFT=17
  # CONFIG_CGROUPS is not set
  # CONFIG_GROUP_SCHED is not set


@@ -51217,7 +51329,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/g5_defconfig powerpc.git
  CONFIG_SYSFS_DEPRECATED=y
  CONFIG_SYSFS_DEPRECATED_V2=y
  # CONFIG_RELAY is not set
  CONFIG_SYSFS_DEPRECATED=y
  CONFIG_SYSFS_DEPRECATED_V2=y
  # CONFIG_RELAY is not set

-@@ -276,7 +274,7 @@
+@@ -276,7 +274,7 @@ CONFIG_PCI_SYSCALL=y

  # CONFIG_PCIEPORTBUS is not set
  CONFIG_ARCH_SUPPORTS_MSI=y
  CONFIG_PCI_MSI=y
  # CONFIG_PCIEPORTBUS is not set
  CONFIG_ARCH_SUPPORTS_MSI=y
  CONFIG_PCI_MSI=y


@@ -51226,7 +51338,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/g5_defconfig powerpc.git
  # CONFIG_PCI_DEBUG is not set
  # CONFIG_PCCARD is not set
  # CONFIG_HOTPLUG_PCI is not set
  # CONFIG_PCI_DEBUG is not set
  # CONFIG_PCCARD is not set
  # CONFIG_HOTPLUG_PCI is not set

-@@ -1596,6 +1594,7 @@
+@@ -1596,6 +1594,7 @@ CONFIG_PLIST=y

  CONFIG_HAS_IOMEM=y
  CONFIG_HAS_IOPORT=y
  CONFIG_HAS_DMA=y
  CONFIG_HAS_IOMEM=y
  CONFIG_HAS_IOPORT=y
  CONFIG_HAS_DMA=y


@@ -51234,9 +51346,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/g5_defconfig powerpc.git
  
  #
  # Kernel hacking
  
  #
  # Kernel hacking

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/iseries_defconfig powerpc.git/arch/powerpc/configs/iseries_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/iseries_defconfig    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/iseries_defconfig 2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/iseries_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/iseries_defconfig
++++ linux-2.6.25.1/arch/powerpc/configs/iseries_defconfig

 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit


@@ -51246,7 +51359,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/iseries_defconfig powerp
  #
  CONFIG_PPC64=y
  
  #
  CONFIG_PPC64=y
  

-@@ -77,8 +77,6 @@
+@@ -77,8 +77,6 @@ CONFIG_IKCONFIG_PROC=y

  CONFIG_LOG_BUF_SHIFT=17
  # CONFIG_CGROUPS is not set
  # CONFIG_GROUP_SCHED is not set
  CONFIG_LOG_BUF_SHIFT=17
  # CONFIG_CGROUPS is not set
  # CONFIG_GROUP_SCHED is not set


@@ -51255,7 +51368,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/iseries_defconfig powerp
  CONFIG_SYSFS_DEPRECATED=y
  CONFIG_SYSFS_DEPRECATED_V2=y
  # CONFIG_RELAY is not set
  CONFIG_SYSFS_DEPRECATED=y
  CONFIG_SYSFS_DEPRECATED_V2=y
  # CONFIG_RELAY is not set

-@@ -261,7 +259,7 @@
+@@ -261,7 +259,7 @@ CONFIG_PCI_SYSCALL=y

  # CONFIG_PCIEPORTBUS is not set
  CONFIG_ARCH_SUPPORTS_MSI=y
  # CONFIG_PCI_MSI is not set
  # CONFIG_PCIEPORTBUS is not set
  CONFIG_ARCH_SUPPORTS_MSI=y
  # CONFIG_PCI_MSI is not set


@@ -51264,7 +51377,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/iseries_defconfig powerp
  # CONFIG_PCI_DEBUG is not set
  # CONFIG_PCCARD is not set
  # CONFIG_HOTPLUG_PCI is not set
  # CONFIG_PCI_DEBUG is not set
  # CONFIG_PCCARD is not set
  # CONFIG_HOTPLUG_PCI is not set

-@@ -1065,6 +1063,7 @@
+@@ -1065,6 +1063,7 @@ CONFIG_PLIST=y

  CONFIG_HAS_IOMEM=y
  CONFIG_HAS_IOPORT=y
  CONFIG_HAS_DMA=y
  CONFIG_HAS_IOMEM=y
  CONFIG_HAS_IOPORT=y
  CONFIG_HAS_DMA=y


@@ -51272,9 +51385,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/iseries_defconfig powerp
  
  #
  # Kernel hacking
  
  #
  # Kernel hacking

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/katmai_defconfig powerpc.git/arch/powerpc/configs/katmai_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/katmai_defconfig     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/katmai_defconfig  1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/katmai_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/katmai_defconfig
++++ /dev/null

 @@ -1,790 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,790 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -52066,9 +52180,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/katmai_defconfig powerpc
 -# 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 -Nur linux-2.6.25-rc9/arch/powerpc/configs/kilauea_defconfig powerpc.git/arch/powerpc/configs/kilauea_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/kilauea_defconfig    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/kilauea_defconfig 1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/kilauea_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/kilauea_defconfig
++++ /dev/null

 @@ -1,839 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,839 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -52909,9 +53024,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/kilauea_defconfig powerp
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/makalu_defconfig powerpc.git/arch/powerpc/configs/makalu_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/makalu_defconfig     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/makalu_defconfig  1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/makalu_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/makalu_defconfig
++++ /dev/null

 @@ -1,839 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,839 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -53752,10 +53868,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/makalu_defconfig powerpc
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/maple_defconfig powerpc.git/arch/powerpc/configs/maple_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/maple_defconfig      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/maple_defconfig   2008-04-19 16:40:52.000000000 +0200
-@@ -333,7 +333,7 @@
+Index: linux-2.6.25.1/arch/powerpc/configs/maple_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/maple_defconfig
++++ linux-2.6.25.1/arch/powerpc/configs/maple_defconfig
+@@ -333,7 +333,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"

  CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
  CONFIG_STANDALONE=y
  CONFIG_PREVENT_FIRMWARE_BUILD=y
  CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
  CONFIG_STANDALONE=y
  CONFIG_PREVENT_FIRMWARE_BUILD=y


@@ -53764,7 +53881,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/maple_defconfig powerpc.
  # CONFIG_DEBUG_DRIVER is not set
  # CONFIG_DEBUG_DEVRES is not set
  # CONFIG_SYS_HYPERVISOR is not set
  # CONFIG_DEBUG_DRIVER is not set
  # CONFIG_DEBUG_DEVRES is not set
  # CONFIG_SYS_HYPERVISOR is not set

-@@ -374,6 +374,7 @@
+@@ -374,6 +374,7 @@ CONFIG_BLK_DEV_IDEDISK=y

  CONFIG_BLK_DEV_IDECD=y
  # CONFIG_BLK_DEV_IDETAPE is not set
  # CONFIG_BLK_DEV_IDEFLOPPY is not set
  CONFIG_BLK_DEV_IDECD=y
  # CONFIG_BLK_DEV_IDETAPE is not set
  # CONFIG_BLK_DEV_IDEFLOPPY is not set


@@ -53772,7 +53889,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/maple_defconfig powerpc.
  CONFIG_IDE_TASK_IOCTL=y
  CONFIG_IDE_PROC_FS=y
  
  CONFIG_IDE_TASK_IOCTL=y
  CONFIG_IDE_PROC_FS=y
  

-@@ -427,10 +428,129 @@
+@@ -427,10 +428,129 @@ CONFIG_IDE_ARCH_OBSOLETE_INIT=y

  # SCSI device support
  #
  # CONFIG_RAID_ATTRS is not set
  # SCSI device support
  #
  # CONFIG_RAID_ATTRS is not set


@@ -53905,7 +54022,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/maple_defconfig powerpc.
  # CONFIG_MD is not set
  # CONFIG_FUSION is not set
  
  # CONFIG_MD is not set
  # CONFIG_FUSION is not set
  

-@@ -536,6 +656,7 @@
+@@ -536,6 +656,7 @@ CONFIG_USB_PEGASUS=y

  # CONFIG_HIPPI is not set
  # CONFIG_PPP is not set
  # CONFIG_SLIP is not set
  # CONFIG_HIPPI is not set
  # CONFIG_PPP is not set
  # CONFIG_SLIP is not set


@@ -53913,7 +54030,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/maple_defconfig powerpc.
  # CONFIG_SHAPER is not set
  # CONFIG_NETCONSOLE is not set
  # CONFIG_NETPOLL is not set
  # CONFIG_SHAPER is not set
  # CONFIG_NETCONSOLE is not set
  # CONFIG_NETPOLL is not set

-@@ -783,12 +904,14 @@
+@@ -783,12 +904,14 @@ CONFIG_USB_UHCI_HCD=y

  #
  # may also be needed; see USB_STORAGE Help for more information
  #
  #
  # may also be needed; see USB_STORAGE Help for more information
  #


@@ -53928,9 +54045,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/maple_defconfig powerpc.
  CONFIG_USB_MON=y
  
  #
  CONFIG_USB_MON=y
  
  #

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc8313_rdb_defconfig powerpc.git/arch/powerpc/configs/mpc8313_rdb_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc8313_rdb_defconfig        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc8313_rdb_defconfig     1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/mpc8313_rdb_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/mpc8313_rdb_defconfig
++++ /dev/null

 @@ -1,1393 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,1393 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -55325,9 +55443,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc8313_rdb_defconfig po
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc8315_rdb_defconfig powerpc.git/arch/powerpc/configs/mpc8315_rdb_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc8315_rdb_defconfig        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc8315_rdb_defconfig     1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/mpc8315_rdb_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/mpc8315_rdb_defconfig
++++ /dev/null

 @@ -1,1451 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,1451 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -56780,9 +56899,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc8315_rdb_defconfig po
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc832x_mds_defconfig powerpc.git/arch/powerpc/configs/mpc832x_mds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc832x_mds_defconfig        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc832x_mds_defconfig     1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/mpc832x_mds_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/mpc832x_mds_defconfig
++++ /dev/null

 @@ -1,1081 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,1081 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -57865,9 +57985,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc832x_mds_defconfig po
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_PPC_LIB_RHEAP=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_PPC_LIB_RHEAP=y

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc832x_rdb_defconfig powerpc.git/arch/powerpc/configs/mpc832x_rdb_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc832x_rdb_defconfig        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc832x_rdb_defconfig     1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/mpc832x_rdb_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/mpc832x_rdb_defconfig
++++ /dev/null

 @@ -1,1233 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,1233 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -59102,9 +59223,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc832x_rdb_defconfig po
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_PPC_LIB_RHEAP=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_PPC_LIB_RHEAP=y

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc834x_itx_defconfig powerpc.git/arch/powerpc/configs/mpc834x_itx_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc834x_itx_defconfig        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc834x_itx_defconfig     1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/mpc834x_itx_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/mpc834x_itx_defconfig
++++ /dev/null

 @@ -1,1295 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,1295 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -60401,9 +60523,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc834x_itx_defconfig po
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc834x_itxgp_defconfig powerpc.git/arch/powerpc/configs/mpc834x_itxgp_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc834x_itxgp_defconfig      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc834x_itxgp_defconfig   1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/mpc834x_itxgp_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/mpc834x_itxgp_defconfig
++++ /dev/null

 @@ -1,1222 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,1222 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -61627,9 +61750,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc834x_itxgp_defconfig
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc834x_mds_defconfig powerpc.git/arch/powerpc/configs/mpc834x_mds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc834x_mds_defconfig        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc834x_mds_defconfig     1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/mpc834x_mds_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/mpc834x_mds_defconfig
++++ /dev/null

 @@ -1,1021 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,1021 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -62652,9 +62776,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc834x_mds_defconfig po
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc836x_mds_defconfig powerpc.git/arch/powerpc/configs/mpc836x_mds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc836x_mds_defconfig        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc836x_mds_defconfig     1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/mpc836x_mds_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/mpc836x_mds_defconfig
++++ /dev/null

 @@ -1,1079 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,1079 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -63735,9 +63860,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc836x_mds_defconfig po
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_PPC_LIB_RHEAP=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_PPC_LIB_RHEAP=y

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc837x_mds_defconfig powerpc.git/arch/powerpc/configs/mpc837x_mds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc837x_mds_defconfig        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc837x_mds_defconfig     1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/mpc837x_mds_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/mpc837x_mds_defconfig
++++ /dev/null

 @@ -1,899 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,899 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -64638,9 +64764,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc837x_mds_defconfig po
 -# CONFIG_CRYPTO_LZO is not set
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_PPC_CLOCK is not set
 -# CONFIG_CRYPTO_LZO is not set
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc837x_rdb_defconfig powerpc.git/arch/powerpc/configs/mpc837x_rdb_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc837x_rdb_defconfig        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc837x_rdb_defconfig     1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/mpc837x_rdb_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/mpc837x_rdb_defconfig
++++ /dev/null

 @@ -1,930 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,930 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -65572,9 +65699,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc837x_rdb_defconfig po
 -# CONFIG_CRYPTO_LZO is not set
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_PPC_CLOCK is not set
 -# CONFIG_CRYPTO_LZO is not set
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc83xx_defconfig powerpc.git/arch/powerpc/configs/mpc83xx_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc83xx_defconfig    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc83xx_defconfig 2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/mpc83xx_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/mpc83xx_defconfig
++++ linux-2.6.25.1/arch/powerpc/configs/mpc83xx_defconfig

 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit


@@ -65585,7 +65713,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc83xx_defconfig powerp
  #
  # CONFIG_PPC64 is not set
  
  #
  # CONFIG_PPC64 is not set
  

-@@ -201,6 +201,7 @@
+@@ -201,6 +201,7 @@ CONFIG_PREEMPT_NONE=y

  # CONFIG_PREEMPT is not set
  CONFIG_BINFMT_ELF=y
  # CONFIG_BINFMT_MISC is not set
  # CONFIG_PREEMPT is not set
  CONFIG_BINFMT_ELF=y
  # CONFIG_BINFMT_MISC is not set


@@ -65593,7 +65721,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc83xx_defconfig powerp
  CONFIG_MATH_EMULATION=y
  # CONFIG_IOMMU_HELPER is not set
  CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
  CONFIG_MATH_EMULATION=y
  # CONFIG_IOMMU_HELPER is not set
  CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y

-@@ -353,7 +354,90 @@
+@@ -353,7 +354,90 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y

  # CONFIG_FW_LOADER is not set
  # CONFIG_SYS_HYPERVISOR is not set
  # CONFIG_CONNECTOR is not set
  # CONFIG_FW_LOADER is not set
  # CONFIG_SYS_HYPERVISOR is not set
  # CONFIG_CONNECTOR is not set


@@ -65685,7 +65813,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc83xx_defconfig powerp
  CONFIG_OF_DEVICE=y
  # CONFIG_PARPORT is not set
  CONFIG_BLK_DEV=y
  CONFIG_OF_DEVICE=y
  # CONFIG_PARPORT is not set
  CONFIG_BLK_DEV=y

-@@ -362,6 +446,7 @@
+@@ -362,6 +446,7 @@ CONFIG_BLK_DEV=y

  CONFIG_BLK_DEV_LOOP=y
  # CONFIG_BLK_DEV_CRYPTOLOOP is not set
  # CONFIG_BLK_DEV_NBD is not set
  CONFIG_BLK_DEV_LOOP=y
  # CONFIG_BLK_DEV_CRYPTOLOOP is not set
  # CONFIG_BLK_DEV_NBD is not set


@@ -65693,7 +65821,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc83xx_defconfig powerp
  CONFIG_BLK_DEV_RAM=y
  CONFIG_BLK_DEV_RAM_COUNT=16
  CONFIG_BLK_DEV_RAM_SIZE=32768
  CONFIG_BLK_DEV_RAM=y
  CONFIG_BLK_DEV_RAM_COUNT=16
  CONFIG_BLK_DEV_RAM_SIZE=32768

-@@ -469,6 +554,15 @@
+@@ -469,6 +554,15 @@ CONFIG_NETDEV_10000=y

  #
  # CONFIG_WLAN_PRE80211 is not set
  # CONFIG_WLAN_80211 is not set
  #
  # CONFIG_WLAN_PRE80211 is not set
  # CONFIG_WLAN_80211 is not set


@@ -65709,7 +65837,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc83xx_defconfig powerp
  # CONFIG_WAN is not set
  # CONFIG_PPP is not set
  # CONFIG_SLIP is not set
  # CONFIG_WAN is not set
  # CONFIG_PPP is not set
  # CONFIG_SLIP is not set

-@@ -563,6 +657,7 @@
+@@ -563,6 +657,7 @@ CONFIG_I2C_MPC=y

  # CONFIG_I2C_SIMTEC is not set
  # CONFIG_I2C_TAOS_EVM is not set
  # CONFIG_I2C_STUB is not set
  # CONFIG_I2C_SIMTEC is not set
  # CONFIG_I2C_TAOS_EVM is not set
  # CONFIG_I2C_STUB is not set


@@ -65717,7 +65845,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc83xx_defconfig powerp
  
  #
  # Miscellaneous I2C Chip support
  
  #
  # Miscellaneous I2C Chip support

-@@ -648,6 +743,11 @@
+@@ -648,6 +743,11 @@ CONFIG_WATCHDOG=y

  CONFIG_83xx_WDT=y
  
  #
  CONFIG_83xx_WDT=y
  
  #


@@ -65729,7 +65857,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc83xx_defconfig powerp
  # Sonics Silicon Backplane
  #
  CONFIG_SSB_POSSIBLE=y
  # Sonics Silicon Backplane
  #
  CONFIG_SSB_POSSIBLE=y

-@@ -664,6 +764,7 @@
+@@ -664,6 +764,7 @@ CONFIG_SSB_POSSIBLE=y

  # CONFIG_VIDEO_DEV is not set
  # CONFIG_DVB_CORE is not set
  CONFIG_DAB=y
  # CONFIG_VIDEO_DEV is not set
  # CONFIG_DVB_CORE is not set
  CONFIG_DAB=y


@@ -65737,7 +65865,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc83xx_defconfig powerp
  
  #
  # Graphics support
  
  #
  # Graphics support

-@@ -686,6 +787,14 @@
+@@ -686,6 +787,14 @@ CONFIG_HID_SUPPORT=y

  CONFIG_HID=y
  # CONFIG_HID_DEBUG is not set
  # CONFIG_HIDRAW is not set
  CONFIG_HID=y
  # CONFIG_HID_DEBUG is not set
  # CONFIG_HIDRAW is not set


@@ -65752,7 +65880,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc83xx_defconfig powerp
  CONFIG_USB_SUPPORT=y
  CONFIG_USB_ARCH_HAS_HCD=y
  # CONFIG_USB_ARCH_HAS_OHCI is not set
  CONFIG_USB_SUPPORT=y
  CONFIG_USB_ARCH_HAS_HCD=y
  # CONFIG_USB_ARCH_HAS_OHCI is not set

-@@ -715,8 +824,55 @@
+@@ -715,8 +824,55 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y

  # CONFIG_USB_R8A66597_HCD is not set
  
  #
  # CONFIG_USB_R8A66597_HCD is not set
  
  #


@@ -65808,7 +65936,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc83xx_defconfig powerp
  # CONFIG_USB_GADGET is not set
  # CONFIG_MMC is not set
  # CONFIG_MEMSTICK is not set
  # CONFIG_USB_GADGET is not set
  # CONFIG_MMC is not set
  # CONFIG_MEMSTICK is not set

-@@ -792,6 +948,7 @@
+@@ -792,6 +948,7 @@ 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


@@ -65816,7 +65944,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc83xx_defconfig powerp
  # CONFIG_CRAMFS is not set
  # CONFIG_VXFS_FS is not set
  # CONFIG_MINIX_FS is not set
  # CONFIG_CRAMFS is not set
  # CONFIG_VXFS_FS is not set
  # CONFIG_MINIX_FS is not set

-@@ -862,6 +1019,7 @@
+@@ -862,6 +1019,7 @@ CONFIG_PLIST=y

  CONFIG_HAS_IOMEM=y
  CONFIG_HAS_IOPORT=y
  CONFIG_HAS_DMA=y
  CONFIG_HAS_IOMEM=y
  CONFIG_HAS_IOPORT=y
  CONFIG_HAS_DMA=y


@@ -65824,9 +65952,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc83xx_defconfig powerp
  
  #
  # Kernel hacking
  
  #
  # Kernel hacking

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc8540_ads_defconfig powerpc.git/arch/powerpc/configs/mpc8540_ads_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc8540_ads_defconfig        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc8540_ads_defconfig     1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/mpc8540_ads_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/mpc8540_ads_defconfig
++++ /dev/null

 @@ -1,796 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,796 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -66624,9 +66753,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc8540_ads_defconfig po
 -# CONFIG_CRYPTO_LZO is not set
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_PPC_CLOCK is not set
 -# CONFIG_CRYPTO_LZO is not set
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc8544_ds_defconfig powerpc.git/arch/powerpc/configs/mpc8544_ds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc8544_ds_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc8544_ds_defconfig      1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/mpc8544_ds_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/mpc8544_ds_defconfig
++++ /dev/null

 @@ -1,1549 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,1549 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -68177,9 +68307,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc8544_ds_defconfig pow
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc8560_ads_defconfig powerpc.git/arch/powerpc/configs/mpc8560_ads_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc8560_ads_defconfig        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc8560_ads_defconfig     1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/mpc8560_ads_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/mpc8560_ads_defconfig
++++ /dev/null

 @@ -1,885 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,885 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -69066,9 +69197,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc8560_ads_defconfig po
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_PPC_LIB_RHEAP=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_PPC_LIB_RHEAP=y

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc8568mds_defconfig powerpc.git/arch/powerpc/configs/mpc8568mds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc8568mds_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc8568mds_defconfig      1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/mpc8568mds_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/mpc8568mds_defconfig
++++ /dev/null

 @@ -1,1117 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,1117 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -70187,9 +70319,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc8568mds_defconfig pow
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_PPC_LIB_RHEAP=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_PPC_LIB_RHEAP=y

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc8572_ds_defconfig powerpc.git/arch/powerpc/configs/mpc8572_ds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc8572_ds_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc8572_ds_defconfig      1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/mpc8572_ds_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/mpc8572_ds_defconfig
++++ /dev/null

 @@ -1,1549 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,1549 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -71740,9 +71873,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc8572_ds_defconfig pow
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc85xx_cds_defconfig powerpc.git/arch/powerpc/configs/mpc85xx_cds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc85xx_cds_defconfig        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc85xx_cds_defconfig     1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/mpc85xx_cds_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/mpc85xx_cds_defconfig
++++ /dev/null

 @@ -1,935 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,935 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -72679,9 +72813,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc85xx_cds_defconfig po
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/pmac32_defconfig powerpc.git/arch/powerpc/configs/pmac32_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/pmac32_defconfig     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/pmac32_defconfig  2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/pmac32_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/pmac32_defconfig
++++ linux-2.6.25.1/arch/powerpc/configs/pmac32_defconfig

 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit


@@ -72691,7 +72826,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/pmac32_defconfig powerpc
  #
  # CONFIG_PPC64 is not set
  
  #
  # CONFIG_PPC64 is not set
  

-@@ -77,8 +77,6 @@
+@@ -77,8 +77,6 @@ CONFIG_IKCONFIG_PROC=y

  CONFIG_LOG_BUF_SHIFT=14
  # CONFIG_CGROUPS is not set
  # CONFIG_GROUP_SCHED is not set
  CONFIG_LOG_BUF_SHIFT=14
  # CONFIG_CGROUPS is not set
  # CONFIG_GROUP_SCHED is not set


@@ -72700,7 +72835,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/pmac32_defconfig powerpc
  CONFIG_SYSFS_DEPRECATED=y
  CONFIG_SYSFS_DEPRECATED_V2=y
  # CONFIG_RELAY is not set
  CONFIG_SYSFS_DEPRECATED=y
  CONFIG_SYSFS_DEPRECATED_V2=y
  # CONFIG_RELAY is not set

-@@ -272,7 +270,7 @@
+@@ -272,7 +270,7 @@ CONFIG_PCI_SYSCALL=y

  # CONFIG_PCIEPORTBUS is not set
  CONFIG_ARCH_SUPPORTS_MSI=y
  # CONFIG_PCI_MSI is not set
  # CONFIG_PCIEPORTBUS is not set
  CONFIG_ARCH_SUPPORTS_MSI=y
  # CONFIG_PCI_MSI is not set


@@ -72709,7 +72844,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/pmac32_defconfig powerpc
  # CONFIG_PCI_DEBUG is not set
  CONFIG_PCCARD=m
  # CONFIG_PCMCIA_DEBUG is not set
  # CONFIG_PCI_DEBUG is not set
  CONFIG_PCCARD=m
  # CONFIG_PCMCIA_DEBUG is not set

-@@ -1895,6 +1893,7 @@
+@@ -1895,6 +1893,7 @@ CONFIG_PLIST=y

  CONFIG_HAS_IOMEM=y
  CONFIG_HAS_IOPORT=y
  CONFIG_HAS_DMA=y
  CONFIG_HAS_IOMEM=y
  CONFIG_HAS_IOPORT=y
  CONFIG_HAS_DMA=y


@@ -72717,9 +72852,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/pmac32_defconfig powerpc
  
  #
  # Kernel hacking
  
  #
  # Kernel hacking

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/ppc40x_defconfig powerpc.git/arch/powerpc/configs/ppc40x_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/ppc40x_defconfig     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/ppc40x_defconfig  2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/ppc40x_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/ppc40x_defconfig

 @@ -0,0 +1,896 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,896 @@
 +#
 +# Automatically generated make config: don't edit


@@ -73617,9 +73753,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/ppc40x_defconfig powerpc
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/ppc44x_defconfig powerpc.git/arch/powerpc/configs/ppc44x_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/ppc44x_defconfig     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/ppc44x_defconfig  2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/ppc44x_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/ppc44x_defconfig
++++ linux-2.6.25.1/arch/powerpc/configs/ppc44x_defconfig

 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit


@@ -73630,7 +73767,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/ppc44x_defconfig powerpc
  #
  # CONFIG_PPC64 is not set
  
  #
  # CONFIG_PPC64 is not set
  

-@@ -79,6 +79,7 @@
+@@ -79,6 +79,7 @@ CONFIG_FAIR_GROUP_SCHED=y

  CONFIG_USER_SCHED=y
  # CONFIG_CGROUP_SCHED is not set
  CONFIG_SYSFS_DEPRECATED=y
  CONFIG_USER_SCHED=y
  # CONFIG_CGROUP_SCHED is not set
  CONFIG_SYSFS_DEPRECATED=y


@@ -73638,7 +73775,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/ppc44x_defconfig powerpc
  # CONFIG_RELAY is not set
  # CONFIG_NAMESPACES is not set
  CONFIG_BLK_DEV_INITRD=y
  # CONFIG_RELAY is not set
  # CONFIG_NAMESPACES is not set
  CONFIG_BLK_DEV_INITRD=y

-@@ -113,6 +114,7 @@
+@@ -113,6 +114,7 @@ CONFIG_SLUB=y

  CONFIG_HAVE_OPROFILE=y
  # CONFIG_KPROBES is not set
  CONFIG_HAVE_KPROBES=y
  CONFIG_HAVE_OPROFILE=y
  # CONFIG_KPROBES is not set
  CONFIG_HAVE_KPROBES=y


@@ -73646,7 +73783,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/ppc44x_defconfig powerpc
  CONFIG_PROC_PAGE_MONITOR=y
  CONFIG_SLABINFO=y
  CONFIG_RT_MUTEXES=y
  CONFIG_PROC_PAGE_MONITOR=y
  CONFIG_SLABINFO=y
  CONFIG_RT_MUTEXES=y

-@@ -143,7 +145,6 @@
+@@ -143,7 +145,6 @@ CONFIG_DEFAULT_AS=y

  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="anticipatory"
  CONFIG_CLASSIC_RCU=y
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="anticipatory"
  CONFIG_CLASSIC_RCU=y


@@ -73654,7 +73791,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/ppc44x_defconfig powerpc
  CONFIG_PPC4xx_PCI_EXPRESS=y
  
  #
  CONFIG_PPC4xx_PCI_EXPRESS=y
  
  #

-@@ -161,12 +162,15 @@
+@@ -161,12 +162,15 @@ CONFIG_TAISHAN=y

  CONFIG_KATMAI=y
  CONFIG_RAINIER=y
  CONFIG_WARP=y
  CONFIG_KATMAI=y
  CONFIG_RAINIER=y
  CONFIG_WARP=y


@@ -73670,7 +73807,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/ppc44x_defconfig powerpc
  CONFIG_IBM440EP_ERR42=y
  # CONFIG_IPIC is not set
  # CONFIG_MPIC is not set
  CONFIG_IBM440EP_ERR42=y
  # CONFIG_IPIC is not set
  # CONFIG_MPIC is not set

-@@ -199,7 +203,6 @@
+@@ -199,7 +203,6 @@ CONFIG_HZ=250

  CONFIG_PREEMPT_NONE=y
  # CONFIG_PREEMPT_VOLUNTARY is not set
  # CONFIG_PREEMPT is not set
  CONFIG_PREEMPT_NONE=y
  # CONFIG_PREEMPT_VOLUNTARY is not set
  # CONFIG_PREEMPT is not set


@@ -73678,7 +73815,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/ppc44x_defconfig powerpc
  CONFIG_BINFMT_ELF=y
  # CONFIG_BINFMT_MISC is not set
  CONFIG_MATH_EMULATION=y
  CONFIG_BINFMT_ELF=y
  # CONFIG_BINFMT_MISC is not set
  CONFIG_MATH_EMULATION=y

-@@ -232,6 +235,7 @@
+@@ -232,6 +235,7 @@ CONFIG_ISA_DMA_API=y

  #
  CONFIG_ZONE_DMA=y
  CONFIG_PPC_INDIRECT_PCI=y
  #
  CONFIG_ZONE_DMA=y
  CONFIG_PPC_INDIRECT_PCI=y


@@ -73686,7 +73823,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/ppc44x_defconfig powerpc
  CONFIG_PCI=y
  CONFIG_PCI_DOMAINS=y
  CONFIG_PCI_SYSCALL=y
  CONFIG_PCI=y
  CONFIG_PCI_DOMAINS=y
  CONFIG_PCI_SYSCALL=y

-@@ -678,6 +682,7 @@
+@@ -678,6 +682,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y

  # CONFIG_INFINIBAND is not set
  # CONFIG_EDAC is not set
  # CONFIG_RTC_CLASS is not set
  # CONFIG_INFINIBAND is not set
  # CONFIG_EDAC is not set
  # CONFIG_RTC_CLASS is not set


@@ -73694,7 +73831,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/ppc44x_defconfig powerpc
  
  #
  # Userspace I/O
  
  #
  # Userspace I/O

-@@ -805,6 +810,7 @@
+@@ -805,6 +810,7 @@ CONFIG_PLIST=y

  CONFIG_HAS_IOMEM=y
  CONFIG_HAS_IOPORT=y
  CONFIG_HAS_DMA=y
  CONFIG_HAS_IOMEM=y
  CONFIG_HAS_IOPORT=y
  CONFIG_HAS_DMA=y


@@ -73702,9 +73839,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/ppc44x_defconfig powerpc
  
  #
  # Kernel hacking
  
  #
  # Kernel hacking

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/ppc64_defconfig powerpc.git/arch/powerpc/configs/ppc64_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/ppc64_defconfig      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/ppc64_defconfig   2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/ppc64_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/ppc64_defconfig
++++ linux-2.6.25.1/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


@@ -73714,7 +73852,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/ppc64_defconfig powerpc.
  #
  CONFIG_PPC64=y
  
  #
  CONFIG_PPC64=y
  

-@@ -84,8 +84,6 @@
+@@ -84,8 +84,6 @@ CONFIG_CGROUPS=y

  # CONFIG_CGROUP_NS is not set
  CONFIG_CPUSETS=y
  # CONFIG_GROUP_SCHED is not set
  # CONFIG_CGROUP_NS is not set
  CONFIG_CPUSETS=y
  # CONFIG_GROUP_SCHED is not set


@@ -73723,7 +73861,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/ppc64_defconfig powerpc.
  # CONFIG_CGROUP_CPUACCT is not set
  # CONFIG_RESOURCE_COUNTERS is not set
  CONFIG_SYSFS_DEPRECATED=y
  # CONFIG_CGROUP_CPUACCT is not set
  # CONFIG_RESOURCE_COUNTERS is not set
  CONFIG_SYSFS_DEPRECATED=y

-@@ -289,6 +287,7 @@
+@@ -289,6 +287,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y

  CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
  CONFIG_KEXEC=y
  # CONFIG_CRASH_DUMP is not set
  CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
  CONFIG_KEXEC=y
  # CONFIG_CRASH_DUMP is not set


@@ -73731,7 +73869,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/ppc64_defconfig powerpc.
  CONFIG_IRQ_ALL_CPUS=y
  # CONFIG_NUMA is not set
  CONFIG_ARCH_SELECT_MEMORY_MODEL=y
  CONFIG_IRQ_ALL_CPUS=y
  # CONFIG_NUMA is not set
  CONFIG_ARCH_SELECT_MEMORY_MODEL=y

-@@ -335,7 +334,7 @@
+@@ -335,7 +334,7 @@ CONFIG_PCI_SYSCALL=y

  # CONFIG_PCIEPORTBUS is not set
  CONFIG_ARCH_SUPPORTS_MSI=y
  CONFIG_PCI_MSI=y
  # CONFIG_PCIEPORTBUS is not set
  CONFIG_ARCH_SUPPORTS_MSI=y
  CONFIG_PCI_MSI=y


@@ -73740,7 +73878,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/ppc64_defconfig powerpc.
  # CONFIG_PCI_DEBUG is not set
  CONFIG_PCCARD=y
  # CONFIG_PCMCIA_DEBUG is not set
  # CONFIG_PCI_DEBUG is not set
  CONFIG_PCCARD=y
  # CONFIG_PCMCIA_DEBUG is not set

-@@ -1881,6 +1880,7 @@
+@@ -1881,6 +1880,7 @@ CONFIG_PLIST=y

  CONFIG_HAS_IOMEM=y
  CONFIG_HAS_IOPORT=y
  CONFIG_HAS_DMA=y
  CONFIG_HAS_IOMEM=y
  CONFIG_HAS_IOPORT=y
  CONFIG_HAS_DMA=y


@@ -73748,9 +73886,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/ppc64_defconfig powerpc.
  
  #
  # Kernel hacking
  
  #
  # Kernel hacking

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/pseries_defconfig powerpc.git/arch/powerpc/configs/pseries_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/pseries_defconfig    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/pseries_defconfig 2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/pseries_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/pseries_defconfig
++++ linux-2.6.25.1/arch/powerpc/configs/pseries_defconfig

 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit


@@ -73760,7 +73899,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/pseries_defconfig powerp
  #
  CONFIG_PPC64=y
  
  #
  CONFIG_PPC64=y
  

-@@ -83,8 +83,6 @@
+@@ -83,8 +83,6 @@ CONFIG_CGROUPS=y

  CONFIG_CGROUP_NS=y
  CONFIG_CPUSETS=y
  # CONFIG_GROUP_SCHED is not set
  CONFIG_CGROUP_NS=y
  CONFIG_CPUSETS=y
  # CONFIG_GROUP_SCHED is not set


@@ -73769,7 +73908,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/pseries_defconfig powerp
  CONFIG_CGROUP_CPUACCT=y
  # CONFIG_RESOURCE_COUNTERS is not set
  CONFIG_SYSFS_DEPRECATED=y
  CONFIG_CGROUP_CPUACCT=y
  # CONFIG_RESOURCE_COUNTERS is not set
  CONFIG_SYSFS_DEPRECATED=y

-@@ -237,6 +235,7 @@
+@@ -237,6 +235,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y

  CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
  CONFIG_KEXEC=y
  # CONFIG_CRASH_DUMP is not set
  CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
  CONFIG_KEXEC=y
  # CONFIG_CRASH_DUMP is not set


@@ -73777,7 +73916,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/pseries_defconfig powerp
  CONFIG_IRQ_ALL_CPUS=y
  CONFIG_NUMA=y
  CONFIG_NODES_SHIFT=4
  CONFIG_IRQ_ALL_CPUS=y
  CONFIG_NUMA=y
  CONFIG_NODES_SHIFT=4

-@@ -283,7 +282,7 @@
+@@ -283,7 +282,7 @@ CONFIG_PCI_SYSCALL=y

  # CONFIG_PCIEPORTBUS is not set
  CONFIG_ARCH_SUPPORTS_MSI=y
  CONFIG_PCI_MSI=y
  # CONFIG_PCIEPORTBUS is not set
  CONFIG_ARCH_SUPPORTS_MSI=y
  CONFIG_PCI_MSI=y


@@ -73786,7 +73925,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/pseries_defconfig powerp
  # CONFIG_PCI_DEBUG is not set
  # CONFIG_PCCARD is not set
  CONFIG_HOTPLUG_PCI=m
  # CONFIG_PCI_DEBUG is not set
  # CONFIG_PCCARD is not set
  CONFIG_HOTPLUG_PCI=m

-@@ -1519,6 +1518,7 @@
+@@ -1519,6 +1518,7 @@ CONFIG_PLIST=y

  CONFIG_HAS_IOMEM=y
  CONFIG_HAS_IOPORT=y
  CONFIG_HAS_DMA=y
  CONFIG_HAS_IOMEM=y
  CONFIG_HAS_IOPORT=y
  CONFIG_HAS_DMA=y


@@ -73794,9 +73933,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/pseries_defconfig powerp
  
  #
  # Kernel hacking
  
  #
  # Kernel hacking

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/rainier_defconfig powerpc.git/arch/powerpc/configs/rainier_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/rainier_defconfig    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/rainier_defconfig 1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/rainier_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/rainier_defconfig
++++ /dev/null

 @@ -1,899 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,899 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -74697,9 +74837,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/rainier_defconfig powerp
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/sbc834x_defconfig powerpc.git/arch/powerpc/configs/sbc834x_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/sbc834x_defconfig    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/sbc834x_defconfig 1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/sbc834x_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/sbc834x_defconfig
++++ /dev/null

 @@ -1,828 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,828 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -75529,9 +75670,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/sbc834x_defconfig powerp
 -# CONFIG_CRYPTO_LZO is not set
 -# CONFIG_CRYPTO_HW is not set
 -# CONFIG_PPC_CLOCK is not set
 -# CONFIG_CRYPTO_LZO is not set
 -# CONFIG_CRYPTO_HW is not set
 -# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/sbc8548_defconfig powerpc.git/arch/powerpc/configs/sbc8548_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/sbc8548_defconfig    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/sbc8548_defconfig 1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/sbc8548_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/sbc8548_defconfig
++++ /dev/null

 @@ -1,812 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,812 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -76345,9 +76487,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/sbc8548_defconfig powerp
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/sbc8560_defconfig powerpc.git/arch/powerpc/configs/sbc8560_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/sbc8560_defconfig    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/sbc8560_defconfig 1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/sbc8560_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/sbc8560_defconfig
++++ /dev/null

 @@ -1,830 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,830 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -77179,9 +77322,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/sbc8560_defconfig powerp
 -# CONFIG_CRYPTO_LZO is not set
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_PPC_CLOCK is not set
 -# CONFIG_CRYPTO_LZO is not set
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/sbc8641d_defconfig powerpc.git/arch/powerpc/configs/sbc8641d_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/sbc8641d_defconfig   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/sbc8641d_defconfig        2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/configs/sbc8641d_defconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/configs/sbc8641d_defconfig

 @@ -0,0 +1,1342 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,1342 @@
 +#
 +# Automatically generated make config: don't edit


@@ -78525,9 +78669,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/sbc8641d_defconfig power
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/sequoia_defconfig powerpc.git/arch/powerpc/configs/sequoia_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/sequoia_defconfig    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/sequoia_defconfig 1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/sequoia_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/sequoia_defconfig
++++ /dev/null

 @@ -1,916 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,916 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -79445,9 +79590,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/sequoia_defconfig powerp
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/stx_gp3_defconfig powerpc.git/arch/powerpc/configs/stx_gp3_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/stx_gp3_defconfig    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/stx_gp3_defconfig 1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/stx_gp3_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/stx_gp3_defconfig
++++ /dev/null

 @@ -1,1253 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,1253 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -80702,9 +80848,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/stx_gp3_defconfig powerp
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_PPC_LIB_RHEAP=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_PPC_LIB_RHEAP=y

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/taishan_defconfig powerpc.git/arch/powerpc/configs/taishan_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/taishan_defconfig    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/taishan_defconfig 1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/taishan_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/taishan_defconfig
++++ /dev/null

 @@ -1,815 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,815 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -81521,9 +81668,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/taishan_defconfig powerp
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/tqm8540_defconfig powerpc.git/arch/powerpc/configs/tqm8540_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/tqm8540_defconfig    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/tqm8540_defconfig 1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/tqm8540_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/tqm8540_defconfig
++++ /dev/null

 @@ -1,1097 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,1097 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -82622,9 +82770,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/tqm8540_defconfig powerp
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/tqm8541_defconfig powerpc.git/arch/powerpc/configs/tqm8541_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/tqm8541_defconfig    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/tqm8541_defconfig 1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/tqm8541_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/tqm8541_defconfig
++++ /dev/null

 @@ -1,1109 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,1109 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -83735,9 +83884,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/tqm8541_defconfig powerp
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_PPC_LIB_RHEAP=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_PPC_LIB_RHEAP=y

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/tqm8555_defconfig powerpc.git/arch/powerpc/configs/tqm8555_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/tqm8555_defconfig    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/tqm8555_defconfig 1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/tqm8555_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/tqm8555_defconfig
++++ /dev/null

 @@ -1,1109 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,1109 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -84848,9 +84998,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/tqm8555_defconfig powerp
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_PPC_LIB_RHEAP=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_PPC_LIB_RHEAP=y

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/tqm8560_defconfig powerpc.git/arch/powerpc/configs/tqm8560_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/tqm8560_defconfig    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/tqm8560_defconfig 1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/tqm8560_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/tqm8560_defconfig
++++ /dev/null

 @@ -1,1109 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,1109 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -85961,9 +86112,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/tqm8560_defconfig powerp
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_PPC_LIB_RHEAP=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_PPC_LIB_RHEAP=y

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/walnut_defconfig powerpc.git/arch/powerpc/configs/walnut_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/walnut_defconfig     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/walnut_defconfig  1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/walnut_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/walnut_defconfig
++++ /dev/null

 @@ -1,887 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,887 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -86852,9 +87004,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/walnut_defconfig powerpc
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_CRYPTO_DEV_HIFN_795X is not set
 -# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/warp_defconfig powerpc.git/arch/powerpc/configs/warp_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/warp_defconfig       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/warp_defconfig    1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/configs/warp_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/configs/warp_defconfig
++++ /dev/null

 @@ -1,1110 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,1110 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -87966,10 +88119,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/warp_defconfig powerpc.g
 -# CONFIG_CRYPTO_LZO is not set
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_PPC_CLOCK is not set
 -# CONFIG_CRYPTO_LZO is not set
 -CONFIG_CRYPTO_HW=y
 -# CONFIG_PPC_CLOCK is not set

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/Makefile powerpc.git/arch/powerpc/kernel/Makefile
---- linux-2.6.25-rc9/arch/powerpc/kernel/Makefile      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/Makefile   2008-04-19 16:40:52.000000000 +0200
-@@ -67,6 +67,7 @@
+Index: linux-2.6.25.1/arch/powerpc/kernel/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/Makefile
++++ linux-2.6.25.1/arch/powerpc/kernel/Makefile
+@@ -67,6 +67,7 @@ obj-$(CONFIG_BOOTX_TEXT)     += btext.o

  obj-$(CONFIG_SMP)             += smp.o
  obj-$(CONFIG_KPROBES)         += kprobes.o
  obj-$(CONFIG_PPC_UDBG_16550)  += legacy_serial.o udbg_16550.o
  obj-$(CONFIG_SMP)             += smp.o
  obj-$(CONFIG_KPROBES)         += kprobes.o
  obj-$(CONFIG_PPC_UDBG_16550)  += legacy_serial.o udbg_16550.o


@@ -87977,9 +88131,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/Makefile powerpc.git/arch
  
  pci64-$(CONFIG_PPC64)         += pci_dn.o isa-bridge.o
  obj-$(CONFIG_PCI)             += pci_$(CONFIG_WORD_SIZE).o $(pci64-y) \
  
  pci64-$(CONFIG_PPC64)         += pci_dn.o isa-bridge.o
  obj-$(CONFIG_PCI)             += pci_$(CONFIG_WORD_SIZE).o $(pci64-y) \

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/asm-offsets.c powerpc.git/arch/powerpc/kernel/asm-offsets.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/asm-offsets.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/asm-offsets.c      2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/kernel/asm-offsets.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/asm-offsets.c
++++ linux-2.6.25.1/arch/powerpc/kernel/asm-offsets.c

 @@ -26,8 +26,6 @@
  #ifdef CONFIG_PPC64
  #include <linux/time.h>
 @@ -26,8 +26,6 @@
  #ifdef CONFIG_PPC64
  #include <linux/time.h>


@@ -87999,7 +88154,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/asm-offsets.c powerpc.git
  
  #define DEFINE(sym, val) \
        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
  
  #define DEFINE(sym, val) \
        asm volatile("\n->" #sym " %0 " #val : : "i" (val))

-@@ -60,7 +61,6 @@
+@@ -60,7 +61,6 @@ int main(void)

        DEFINE(AUDITCONTEXT, offsetof(struct task_struct, audit_context));
  #else
        DEFINE(THREAD_INFO, offsetof(struct task_struct, stack));
        DEFINE(AUDITCONTEXT, offsetof(struct task_struct, audit_context));
  #else
        DEFINE(THREAD_INFO, offsetof(struct task_struct, stack));


@@ -88007,7 +88162,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/asm-offsets.c powerpc.git
  #endif /* CONFIG_PPC64 */
  
        DEFINE(KSP, offsetof(struct thread_struct, ksp));
  #endif /* CONFIG_PPC64 */
  
        DEFINE(KSP, offsetof(struct thread_struct, ksp));

-@@ -80,7 +80,6 @@
+@@ -80,7 +80,6 @@ int main(void)

        DEFINE(PGDIR, offsetof(struct thread_struct, pgdir));
  #if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)
        DEFINE(THREAD_DBCR0, offsetof(struct thread_struct, dbcr0));
        DEFINE(PGDIR, offsetof(struct thread_struct, pgdir));
  #if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)
        DEFINE(THREAD_DBCR0, offsetof(struct thread_struct, dbcr0));


@@ -88015,7 +88170,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/asm-offsets.c powerpc.git
  #endif
  #ifdef CONFIG_SPE
        DEFINE(THREAD_EVR0, offsetof(struct thread_struct, evr[0]));
  #endif
  #ifdef CONFIG_SPE
        DEFINE(THREAD_EVR0, offsetof(struct thread_struct, evr[0]));

-@@ -325,6 +324,9 @@
+@@ -325,6 +324,9 @@ int main(void)

        DEFINE(PAGE_OFFSET_VSID, KERNEL_VSID(PAGE_OFFSET));
        DEFINE(VMALLOC_START_ESID, GET_ESID(VMALLOC_START));
        DEFINE(VMALLOC_START_VSID, KERNEL_VSID(VMALLOC_START));
        DEFINE(PAGE_OFFSET_VSID, KERNEL_VSID(PAGE_OFFSET));
        DEFINE(VMALLOC_START_ESID, GET_ESID(VMALLOC_START));
        DEFINE(VMALLOC_START_VSID, KERNEL_VSID(VMALLOC_START));


@@ -88025,9 +88180,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/asm-offsets.c powerpc.git
  #endif
  
        DEFINE(PGD_TABLE_SIZE, PGD_TABLE_SIZE);
  #endif
  
        DEFINE(PGD_TABLE_SIZE, PGD_TABLE_SIZE);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/btext.c powerpc.git/arch/powerpc/kernel/btext.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/btext.c       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/btext.c    2008-03-17 14:03:31.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/kernel/btext.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/btext.c
++++ linux-2.6.25.1/arch/powerpc/kernel/btext.c

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


@@ -88045,9 +88201,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/btext.c powerpc.git/arch/
  #include <asm/processor.h>
  #include <asm/udbg.h>
  
  #include <asm/processor.h>
  #include <asm/udbg.h>
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/cpu_setup_44x.S powerpc.git/arch/powerpc/kernel/cpu_setup_44x.S
---- linux-2.6.25-rc9/arch/powerpc/kernel/cpu_setup_44x.S       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/cpu_setup_44x.S    2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/kernel/cpu_setup_44x.S
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/cpu_setup_44x.S
++++ linux-2.6.25.1/arch/powerpc/kernel/cpu_setup_44x.S

 @@ -3,7 +3,7 @@
   * Valentine Barshak <vbarshak@ru.mvista.com>
   * MontaVista Software, Inc (c) 2007
 @@ -3,7 +3,7 @@
   * Valentine Barshak <vbarshak@ru.mvista.com>
   * MontaVista Software, Inc (c) 2007


@@ -88057,7 +88214,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/cpu_setup_44x.S powerpc.g
   * Benjamin Herrenschmidt <benh@kernel.crashing.org>
   *
   * This program is free software; you can redistribute it and/or
   * Benjamin Herrenschmidt <benh@kernel.crashing.org>
   *
   * This program is free software; you can redistribute it and/or

-@@ -32,6 +32,9 @@
+@@ -32,6 +32,9 @@ _GLOBAL(__setup_cpu_440grx)

        bl      __fixup_440A_mcheck
        mtlr    r4
        blr
        bl      __fixup_440A_mcheck
        mtlr    r4
        blr


@@ -88067,10 +88224,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/cpu_setup_44x.S powerpc.g
  _GLOBAL(__setup_cpu_440gx)
  _GLOBAL(__setup_cpu_440spe)
        b       __fixup_440A_mcheck
  _GLOBAL(__setup_cpu_440gx)
  _GLOBAL(__setup_cpu_440spe)
        b       __fixup_440A_mcheck

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/cputable.c powerpc.git/arch/powerpc/kernel/cputable.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/cputable.c    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/cputable.c 2008-04-19 16:40:52.000000000 +0200
-@@ -36,6 +36,8 @@
+Index: linux-2.6.25.1/arch/powerpc/kernel/cputable.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/cputable.c
++++ linux-2.6.25.1/arch/powerpc/kernel/cputable.c
+@@ -36,6 +36,8 @@ extern void __setup_cpu_440epx(unsigned 

  extern void __setup_cpu_440gx(unsigned long offset, struct cpu_spec* spec);
  extern void __setup_cpu_440grx(unsigned long offset, struct cpu_spec* spec);
  extern void __setup_cpu_440spe(unsigned long offset, struct cpu_spec* spec);
  extern void __setup_cpu_440gx(unsigned long offset, struct cpu_spec* spec);
  extern void __setup_cpu_440grx(unsigned long offset, struct cpu_spec* spec);
  extern void __setup_cpu_440spe(unsigned long offset, struct cpu_spec* spec);


@@ -88079,7 +88237,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/cputable.c powerpc.git/ar
  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);

-@@ -1397,6 +1399,30 @@
+@@ -1397,6 +1399,30 @@ static struct cpu_spec __initdata cpu_sp

                .machine_check          = machine_check_440A,
                .platform               = "ppc440",
        },
                .machine_check          = machine_check_440A,
                .platform               = "ppc440",
        },


@@ -88110,7 +88268,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/cputable.c powerpc.git/ar
  #endif /* CONFIG_44x */
  #ifdef CONFIG_FSL_BOOKE
  #ifdef CONFIG_E200
  #endif /* CONFIG_44x */
  #ifdef CONFIG_FSL_BOOKE
  #ifdef CONFIG_E200

-@@ -1512,7 +1538,7 @@
+@@ -1512,7 +1538,7 @@ struct cpu_spec * __init identify_cpu(un

                                *t = *s;
                        *PTRRELOC(&cur_cpu_spec) = &the_cpu_spec;
  #if defined(CONFIG_PPC64) || defined(CONFIG_BOOKE)
                                *t = *s;
                        *PTRRELOC(&cur_cpu_spec) = &the_cpu_spec;
  #if defined(CONFIG_PPC64) || defined(CONFIG_BOOKE)


@@ -88119,9 +88277,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/cputable.c powerpc.git/ar
                         * setup_cpu for that processor. I will consolidate
                         * that at a later time, for now, just use #ifdef.
                         * we also don't need to PTRRELOC the function pointer
                         * setup_cpu for that processor. I will consolidate
                         * that at a later time, for now, just use #ifdef.
                         * we also don't need to PTRRELOC the function pointer

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/crash.c powerpc.git/arch/powerpc/kernel/crash.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/crash.c       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/crash.c    2008-03-17 14:03:31.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/kernel/crash.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/crash.c
++++ linux-2.6.25.1/arch/powerpc/kernel/crash.c

 @@ -24,12 +24,13 @@
  #include <linux/init.h>
  #include <linux/irq.h>
 @@ -24,12 +24,13 @@
  #include <linux/init.h>
  #include <linux/irq.h>


@@ -88137,9 +88296,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/crash.c powerpc.git/arch/
  #include <asm/firmware.h>
  #include <asm/smp.h>
  #include <asm/system.h>
  #include <asm/firmware.h>
  #include <asm/smp.h>
  #include <asm/system.h>

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/crash_dump.c powerpc.git/arch/powerpc/kernel/crash_dump.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/crash_dump.c  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/crash_dump.c       2008-03-17 14:03:31.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/kernel/crash_dump.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/crash_dump.c
++++ linux-2.6.25.1/arch/powerpc/kernel/crash_dump.c

 @@ -13,8 +13,9 @@
  
  #include <linux/crash_dump.h>
 @@ -13,8 +13,9 @@
  
  #include <linux/crash_dump.h>


@@ -88151,10 +88311,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/crash_dump.c powerpc.git/
  #include <asm/firmware.h>
  #include <asm/uaccess.h>
  
  #include <asm/firmware.h>
  #include <asm/uaccess.h>
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/entry_32.S powerpc.git/arch/powerpc/kernel/entry_32.S
---- linux-2.6.25-rc9/arch/powerpc/kernel/entry_32.S    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/entry_32.S 2008-04-19 16:40:52.000000000 +0200
-@@ -110,9 +110,9 @@
+Index: linux-2.6.25.1/arch/powerpc/kernel/entry_32.S
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/entry_32.S
++++ linux-2.6.25.1/arch/powerpc/kernel/entry_32.S
+@@ -110,9 +110,9 @@ transfer_to_handler:

        stw     r11,PT_REGS(r12)
  #if defined(CONFIG_40x) || defined(CONFIG_BOOKE)
        /* Check to see if the dbcr0 register is set up to debug.  Use the
        stw     r11,PT_REGS(r12)
  #if defined(CONFIG_40x) || defined(CONFIG_BOOKE)
        /* Check to see if the dbcr0 register is set up to debug.  Use the


@@ -88166,7 +88327,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/entry_32.S powerpc.git/ar
        beq+    3f
        /* From user and task is ptraced - load up global dbcr0 */
        li      r12,-1                  /* clear all pending debug events */
        beq+    3f
        /* From user and task is ptraced - load up global dbcr0 */
        li      r12,-1                  /* clear all pending debug events */

-@@ -120,6 +120,12 @@
+@@ -120,6 +120,12 @@ transfer_to_handler:

        lis     r11,global_dbcr0@ha
        tophys(r11,r11)
        addi    r11,r11,global_dbcr0@l
        lis     r11,global_dbcr0@ha
        tophys(r11,r11)
        addi    r11,r11,global_dbcr0@l


@@ -88179,7 +88340,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/entry_32.S powerpc.git/ar
        lwz     r12,0(r11)
        mtspr   SPRN_DBCR0,r12
        lwz     r12,4(r11)
        lwz     r12,0(r11)
        mtspr   SPRN_DBCR0,r12
        lwz     r12,4(r11)

-@@ -238,10 +244,10 @@
+@@ -238,10 +244,10 @@ ret_from_syscall:

        stw     r11,_CCR(r1)
  syscall_exit_cont:
  #if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)
        stw     r11,_CCR(r1)
  syscall_exit_cont:
  #if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)


@@ -88193,7 +88354,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/entry_32.S powerpc.git/ar
        bnel-   load_dbcr0
  #endif
  #ifdef CONFIG_44x
        bnel-   load_dbcr0
  #endif
  #ifdef CONFIG_44x

-@@ -666,10 +672,10 @@
+@@ -666,10 +672,10 @@ user_exc_return:         /* r10 contains MSR_KE

  
  restore_user:
  #if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)
  
  restore_user:
  #if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)


@@ -88207,7 +88368,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/entry_32.S powerpc.git/ar
        bnel-   load_dbcr0
  #endif
  
        bnel-   load_dbcr0
  #endif
  

-@@ -879,6 +885,12 @@
+@@ -879,6 +885,12 @@ load_dbcr0:

        mfspr   r10,SPRN_DBCR0
        lis     r11,global_dbcr0@ha
        addi    r11,r11,global_dbcr0@l
        mfspr   r10,SPRN_DBCR0
        lis     r11,global_dbcr0@ha
        addi    r11,r11,global_dbcr0@l


@@ -88220,7 +88381,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/entry_32.S powerpc.git/ar
        stw     r10,0(r11)
        mtspr   SPRN_DBCR0,r0
        lwz     r10,4(r11)
        stw     r10,0(r11)
        mtspr   SPRN_DBCR0,r0
        lwz     r10,4(r11)

-@@ -891,7 +903,7 @@
+@@ -891,7 +903,7 @@ load_dbcr0:

        .section .bss
        .align  4
  global_dbcr0:
        .section .bss
        .align  4
  global_dbcr0:


@@ -88229,9 +88390,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/entry_32.S powerpc.git/ar
        .previous
  #endif /* !(CONFIG_4xx || CONFIG_BOOKE) */
  
        .previous
  #endif /* !(CONFIG_4xx || CONFIG_BOOKE) */
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/entry_64.S powerpc.git/arch/powerpc/kernel/entry_64.S
---- linux-2.6.25-rc9/arch/powerpc/kernel/entry_64.S    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/entry_64.S 2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/kernel/entry_64.S
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/entry_64.S
++++ linux-2.6.25.1/arch/powerpc/kernel/entry_64.S

 @@ -29,6 +29,8 @@
  #include <asm/cputable.h>
  #include <asm/firmware.h>
 @@ -29,6 +29,8 @@
  #include <asm/cputable.h>
  #include <asm/firmware.h>


@@ -88250,7 +88412,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/entry_64.S powerpc.git/ar
  
        .section        ".text"
        .align 7
  
        .section        ".text"
        .align 7

-@@ -88,6 +90,14 @@
+@@ -88,6 +90,14 @@ system_call_common:

        addi    r9,r1,STACK_FRAME_OVERHEAD
        ld      r11,exception_marker@toc(r2)
        std     r11,-16(r9)             /* "regshere" marker */
        addi    r9,r1,STACK_FRAME_OVERHEAD
        ld      r11,exception_marker@toc(r2)
        std     r11,-16(r9)             /* "regshere" marker */


@@ -88265,7 +88427,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/entry_64.S powerpc.git/ar
        li      r10,1
        stb     r10,PACASOFTIRQEN(r13)
        stb     r10,PACAHARDIRQEN(r13)
        li      r10,1
        stb     r10,PACASOFTIRQEN(r13)
        stb     r10,PACAHARDIRQEN(r13)

-@@ -102,7 +112,7 @@
+@@ -102,7 +112,7 @@ BEGIN_FW_FTR_SECTION

        b       hardware_interrupt_entry
  2:
  END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
        b       hardware_interrupt_entry
  2:
  END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)


@@ -88274,7 +88436,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/entry_64.S powerpc.git/ar
        mfmsr   r11
        ori     r11,r11,MSR_EE
        mtmsrd  r11,1
        mfmsr   r11
        ori     r11,r11,MSR_EE
        mtmsrd  r11,1

-@@ -504,6 +514,10 @@
+@@ -504,6 +514,10 @@ BEGIN_FW_FTR_SECTION

  
        li      r3,0
        stb     r3,PACASOFTIRQEN(r13)   /* ensure we are soft-disabled */
  
        li      r3,0
        stb     r3,PACASOFTIRQEN(r13)   /* ensure we are soft-disabled */


@@ -88285,7 +88447,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/entry_64.S powerpc.git/ar
        ori     r10,r10,MSR_EE
        mtmsrd  r10                     /* hard-enable again */
        addi    r3,r1,STACK_FRAME_OVERHEAD
        ori     r10,r10,MSR_EE
        mtmsrd  r10                     /* hard-enable again */
        addi    r3,r1,STACK_FRAME_OVERHEAD

-@@ -512,7 +526,7 @@
+@@ -512,7 +526,7 @@ BEGIN_FW_FTR_SECTION

  4:
  END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
  #endif
  4:
  END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
  #endif


@@ -88294,7 +88456,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/entry_64.S powerpc.git/ar
  
        /* extract EE bit and use it to restore paca->hard_enabled */
        ld      r3,_MSR(r1)
  
        /* extract EE bit and use it to restore paca->hard_enabled */
        ld      r3,_MSR(r1)

-@@ -580,6 +594,16 @@
+@@ -580,6 +594,16 @@ do_work:

        bne     restore
        /* here we are preempting the current task */
  1:
        bne     restore
        /* here we are preempting the current task */
  1:


@@ -88311,9 +88473,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/entry_64.S powerpc.git/ar
        li      r0,1
        stb     r0,PACASOFTIRQEN(r13)
        stb     r0,PACAHARDIRQEN(r13)
        li      r0,1
        stb     r0,PACASOFTIRQEN(r13)
        stb     r0,PACAHARDIRQEN(r13)

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_32.S powerpc.git/arch/powerpc/kernel/head_32.S
---- linux-2.6.25-rc9/arch/powerpc/kernel/head_32.S     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/head_32.S  2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/kernel/head_32.S
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/head_32.S
++++ linux-2.6.25.1/arch/powerpc/kernel/head_32.S

 @@ -30,6 +30,7 @@
  #include <asm/thread_info.h>
  #include <asm/ppc_asm.h>
 @@ -30,6 +30,7 @@
  #include <asm/thread_info.h>
  #include <asm/ppc_asm.h>


@@ -88322,7 +88485,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_32.S powerpc.git/arc
  
  /* 601 only have IBAT; cr0.eq is set on 601 when using this macro */
  #define LOAD_BAT(n, reg, RA, RB)      \
  
  /* 601 only have IBAT; cr0.eq is set on 601 when using this macro */
  #define LOAD_BAT(n, reg, RA, RB)      \

-@@ -268,8 +269,8 @@
+@@ -268,8 +269,8 @@ __secondary_hold_acknowledge:

        li      r10,MSR_KERNEL & ~(MSR_IR|MSR_DR); /* can take exceptions */ \
        MTMSRD(r10);                    /* (except for mach check in rtas) */ \
        stw     r0,GPR0(r11);   \
        li      r10,MSR_KERNEL & ~(MSR_IR|MSR_DR); /* can take exceptions */ \
        MTMSRD(r10);                    /* (except for mach check in rtas) */ \
        stw     r0,GPR0(r11);   \


@@ -88333,7 +88496,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_32.S powerpc.git/arc
        stw     r10,8(r11);     \
        SAVE_4GPRS(3, r11);     \
        SAVE_2GPRS(7, r11)
        stw     r10,8(r11);     \
        SAVE_4GPRS(3, r11);     \
        SAVE_2GPRS(7, r11)

-@@ -763,23 +764,6 @@
+@@ -763,23 +764,6 @@ load_up_altivec:

        b       fast_exception_return
  
  /*
        b       fast_exception_return
  
  /*


@@ -88357,10 +88520,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_32.S powerpc.git/arc
   * giveup_altivec(tsk)
   * Disable AltiVec for the task given as the argument,
   * and save the AltiVec registers in its thread_struct.
   * giveup_altivec(tsk)
   * Disable AltiVec for the task given as the argument,
   * and save the AltiVec registers in its thread_struct.

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_44x.S powerpc.git/arch/powerpc/kernel/head_44x.S
---- linux-2.6.25-rc9/arch/powerpc/kernel/head_44x.S    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/head_44x.S 2008-04-19 16:40:52.000000000 +0200
-@@ -211,7 +211,7 @@
+Index: linux-2.6.25.1/arch/powerpc/kernel/head_44x.S
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/head_44x.S
++++ linux-2.6.25.1/arch/powerpc/kernel/head_44x.S
+@@ -211,7 +211,7 @@ skpinv:    addi    r4,r4,1                         /* Increment */

        SET_IVOR(12, WatchdogTimer);
        SET_IVOR(13, DataTLBError);
        SET_IVOR(14, InstructionTLBError);
        SET_IVOR(12, WatchdogTimer);
        SET_IVOR(13, DataTLBError);
        SET_IVOR(14, InstructionTLBError);


@@ -88369,7 +88533,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_44x.S powerpc.git/ar
  
        /* Establish the interrupt vector base */
        lis     r4,interrupt_base@h     /* IVPR only uses the high 16-bits */
  
        /* Establish the interrupt vector base */
        lis     r4,interrupt_base@h     /* IVPR only uses the high 16-bits */

-@@ -578,7 +578,7 @@
+@@ -578,7 +578,7 @@ interrupt_base:

        b       InstructionStorage
  
        /* Debug Interrupt */
        b       InstructionStorage
  
        /* Debug Interrupt */


@@ -88378,9 +88542,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_44x.S powerpc.git/ar
  
  /*
   * Local functions
  
  /*
   * Local functions

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_64.S powerpc.git/arch/powerpc/kernel/head_64.S
---- linux-2.6.25-rc9/arch/powerpc/kernel/head_64.S     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/head_64.S  2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/kernel/head_64.S
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/head_64.S
++++ linux-2.6.25.1/arch/powerpc/kernel/head_64.S

 @@ -36,8 +36,7 @@
  #include <asm/firmware.h>
  #include <asm/page_64.h>
 @@ -36,8 +36,7 @@
  #include <asm/firmware.h>
  #include <asm/page_64.h>


@@ -88391,7 +88556,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_64.S powerpc.git/arc
  
  /*
   * We layout physical memory as follows:
  
  /*
   * We layout physical memory as follows:

-@@ -450,8 +449,8 @@
+@@ -450,8 +449,8 @@ bad_stack:

   */
  fast_exc_return_irq:                  /* restores irq state too */
        ld      r3,SOFTE(r1)
   */
  fast_exc_return_irq:                  /* restores irq state too */
        ld      r3,SOFTE(r1)


@@ -88401,7 +88566,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_64.S powerpc.git/arc
        rldicl  r4,r12,49,63            /* get MSR_EE to LSB */
        stb     r4,PACAHARDIRQEN(r13)   /* restore paca->hard_enabled */
        b       1f
        rldicl  r4,r12,49,63            /* get MSR_EE to LSB */
        stb     r4,PACAHARDIRQEN(r13)   /* restore paca->hard_enabled */
        b       1f

-@@ -621,7 +620,7 @@
+@@ -621,7 +620,7 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISER

        mtlr    r10
  
        andi.   r10,r12,MSR_RI  /* check for unrecoverable exception */
        mtlr    r10
  
        andi.   r10,r12,MSR_RI  /* check for unrecoverable exception */


@@ -88410,7 +88575,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_64.S powerpc.git/arc
  
  .machine      push
  .machine      "power4"
  
  .machine      push
  .machine      "power4"

-@@ -643,6 +642,22 @@
+@@ -643,6 +642,22 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISER

        rfid
        b       .       /* prevent speculative execution */
  
        rfid
        b       .       /* prevent speculative execution */
  


@@ -88433,7 +88598,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_64.S powerpc.git/arc
  unrecov_slb:
        EXCEPTION_PROLOG_COMMON(0x4100, PACA_EXSLB)
        DISABLE_INTS
  unrecov_slb:
        EXCEPTION_PROLOG_COMMON(0x4100, PACA_EXSLB)
        DISABLE_INTS

-@@ -808,7 +823,7 @@
+@@ -808,7 +823,7 @@ _STATIC(load_up_altivec)

   * Hash table stuff
   */
        .align  7
   * Hash table stuff
   */
        .align  7


@@ -88442,7 +88607,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_64.S powerpc.git/arc
        std     r3,_DAR(r1)
        std     r4,_DSISR(r1)
  
        std     r3,_DAR(r1)
        std     r4,_DSISR(r1)
  

-@@ -820,6 +835,27 @@
+@@ -820,6 +835,27 @@ BEGIN_FTR_SECTION

  END_FTR_SECTION_IFCLR(CPU_FTR_SLB)
  
        /*
  END_FTR_SECTION_IFCLR(CPU_FTR_SLB)
  
        /*


@@ -88470,7 +88635,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_64.S powerpc.git/arc
         * We need to set the _PAGE_USER bit if MSR_PR is set or if we are
         * accessing a userspace segment (even from the kernel). We assume
         * kernel addresses always have the high bit set.
         * We need to set the _PAGE_USER bit if MSR_PR is set or if we are
         * accessing a userspace segment (even from the kernel). We assume
         * kernel addresses always have the high bit set.

-@@ -832,13 +868,6 @@
+@@ -832,13 +868,6 @@ END_FTR_SECTION_IFCLR(CPU_FTR_SLB)

        rlwimi  r4,r5,22+2,31-2,31-2    /* Set _PAGE_EXEC if trap is 0x400 */
  
        /*
        rlwimi  r4,r5,22+2,31-2,31-2    /* Set _PAGE_EXEC if trap is 0x400 */
  
        /*


@@ -88484,7 +88649,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_64.S powerpc.git/arc
         * r3 contains the faulting address
         * r4 contains the required access permissions
         * r5 contains the trap number
         * r3 contains the faulting address
         * r4 contains the required access permissions
         * r5 contains the trap number

-@@ -848,7 +877,6 @@
+@@ -848,7 +877,6 @@ END_FTR_SECTION_IFCLR(CPU_FTR_SLB)

        bl      .hash_page              /* build HPTE if possible */
        cmpdi   r3,0                    /* see if hash_page succeeded */
  
        bl      .hash_page              /* build HPTE if possible */
        cmpdi   r3,0                    /* see if hash_page succeeded */
  


@@ -88492,7 +88657,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_64.S powerpc.git/arc
  BEGIN_FW_FTR_SECTION
        /*
         * If we had interrupts soft-enabled at the point where the
  BEGIN_FW_FTR_SECTION
        /*
         * If we had interrupts soft-enabled at the point where the

-@@ -860,7 +888,7 @@
+@@ -860,7 +888,7 @@ BEGIN_FW_FTR_SECTION

         */
        beq     13f
  END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
         */
        beq     13f
  END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)


@@ -88501,7 +88666,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_64.S powerpc.git/arc
  BEGIN_FW_FTR_SECTION
        /*
         * Here we have interrupts hard-disabled, so it is sufficient
  BEGIN_FW_FTR_SECTION
        /*
         * Here we have interrupts hard-disabled, so it is sufficient

-@@ -874,11 +902,12 @@
+@@ -874,11 +902,12 @@ END_FW_FTR_SECTION_IFCLR(FW_FEATURE_ISER

  
        /*
         * hash_page couldn't handle it, set soft interrupt enable back
  
        /*
         * hash_page couldn't handle it, set soft interrupt enable back


@@ -88516,7 +88681,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_64.S powerpc.git/arc
        b       11f
  
  /* Here we have a page fault that hash_page can't handle. */
        b       11f
  
  /* Here we have a page fault that hash_page can't handle. */

-@@ -1477,6 +1506,10 @@
+@@ -1477,6 +1506,10 @@ _INIT_STATIC(start_here_multiplatform)

        addi    r2,r2,0x4000
        add     r2,r2,r26
  
        addi    r2,r2,0x4000
        add     r2,r2,r26
  


@@ -88527,7 +88692,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_64.S powerpc.git/arc
        /* Do very early kernel initializations, including initial hash table,
         * stab and slb setup before we turn on relocation.     */
  
        /* Do very early kernel initializations, including initial hash table,
         * stab and slb setup before we turn on relocation.     */
  

-@@ -1505,10 +1538,6 @@
+@@ -1505,10 +1538,6 @@ _INIT_GLOBAL(start_here_common)

        li      r0,0
        stdu    r0,-STACK_FRAME_OVERHEAD(r1)
  
        li      r0,0
        stdu    r0,-STACK_FRAME_OVERHEAD(r1)
  


@@ -88538,9 +88703,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_64.S powerpc.git/arc
        /* Load the TOC */
        ld      r2,PACATOC(r13)
        std     r1,PACAKSAVE(r13)
        /* Load the TOC */
        ld      r2,PACATOC(r13)
        std     r1,PACAKSAVE(r13)

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_booke.h powerpc.git/arch/powerpc/kernel/head_booke.h
---- linux-2.6.25-rc9/arch/powerpc/kernel/head_booke.h  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/head_booke.h       2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/kernel/head_booke.h
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/head_booke.h
++++ linux-2.6.25.1/arch/powerpc/kernel/head_booke.h

 @@ -56,8 +56,17 @@
   * is necessary since the MMU is always on, for Book-E parts, and the stacks
   * are offset from KERNELBASE.
 @@ -56,8 +56,17 @@
   * is necessary since the MMU is always on, for Book-E parts, and the stacks
   * are offset from KERNELBASE.


@@ -88569,7 +88735,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_booke.h powerpc.git/
  #define DEBUG_SPRG            SPRN_SPRG6W
  
  #ifdef CONFIG_SMP
  #define DEBUG_SPRG            SPRN_SPRG6W
  
  #ifdef CONFIG_SMP

-@@ -212,9 +221,8 @@
+@@ -212,9 +221,8 @@ label:

   * save (and later restore) the MSR via SPRN_CSRR1, which will still have
   * the MSR_DE bit set.
   */
   * save (and later restore) the MSR via SPRN_CSRR1, which will still have
   * the MSR_DE bit set.
   */


@@ -88581,7 +88747,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_booke.h powerpc.git/
        DEBUG_EXCEPTION_PROLOG;                                               \
                                                                              \
        /*                                                                    \
        DEBUG_EXCEPTION_PROLOG;                                               \
                                                                              \
        /*                                                                    \

-@@ -234,8 +242,8 @@
+@@ -234,8 +242,8 @@ label:

        cmplw   r12,r10;                                                      \
        blt+    2f;                     /* addr below exception vectors */    \
                                                                              \
        cmplw   r12,r10;                                                      \
        blt+    2f;                     /* addr below exception vectors */    \
                                                                              \


@@ -88592,7 +88758,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_booke.h powerpc.git/
        cmplw   r12,r10;                                                      \
        bgt+    2f;                     /* addr above exception vectors */    \
                                                                              \
        cmplw   r12,r10;                                                      \
        bgt+    2f;                     /* addr above exception vectors */    \
                                                                              \

-@@ -265,9 +273,9 @@
+@@ -265,9 +273,9 @@ label:

  2:    mfspr   r4,SPRN_DBSR;                                                 \
        addi    r3,r1,STACK_FRAME_OVERHEAD;                                   \
        EXC_XFER_TEMPLATE(DebugException, 0x2002, (MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE)), NOCOPY, debug_transfer_to_handler, ret_from_debug_exc)
  2:    mfspr   r4,SPRN_DBSR;                                                 \
        addi    r3,r1,STACK_FRAME_OVERHEAD;                                   \
        EXC_XFER_TEMPLATE(DebugException, 0x2002, (MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE)), NOCOPY, debug_transfer_to_handler, ret_from_debug_exc)


@@ -88605,7 +88771,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_booke.h powerpc.git/
        CRITICAL_EXCEPTION_PROLOG;                                            \
                                                                              \
        /*                                                                    \
        CRITICAL_EXCEPTION_PROLOG;                                            \
                                                                              \
        /*                                                                    \

-@@ -287,8 +295,8 @@
+@@ -287,8 +295,8 @@ label:

        cmplw   r12,r10;                                                      \
        blt+    2f;                     /* addr below exception vectors */    \
                                                                              \
        cmplw   r12,r10;                                                      \
        blt+    2f;                     /* addr below exception vectors */    \
                                                                              \


@@ -88616,7 +88782,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_booke.h powerpc.git/
        cmplw   r12,r10;                                                      \
        bgt+    2f;                     /* addr above exception vectors */    \
                                                                              \
        cmplw   r12,r10;                                                      \
        bgt+    2f;                     /* addr above exception vectors */    \
                                                                              \

-@@ -318,7 +326,6 @@
+@@ -318,7 +326,6 @@ label:

  2:    mfspr   r4,SPRN_DBSR;                                                 \
        addi    r3,r1,STACK_FRAME_OVERHEAD;                                   \
        EXC_XFER_TEMPLATE(DebugException, 0x2002, (MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE)), NOCOPY, crit_transfer_to_handler, ret_from_crit_exc)
  2:    mfspr   r4,SPRN_DBSR;                                                 \
        addi    r3,r1,STACK_FRAME_OVERHEAD;                                   \
        EXC_XFER_TEMPLATE(DebugException, 0x2002, (MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE)), NOCOPY, crit_transfer_to_handler, ret_from_crit_exc)


@@ -88624,10 +88790,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_booke.h powerpc.git/
  
  #define INSTRUCTION_STORAGE_EXCEPTION                                       \
        START_EXCEPTION(InstructionStorage)                                   \
  
  #define INSTRUCTION_STORAGE_EXCEPTION                                       \
        START_EXCEPTION(InstructionStorage)                                   \

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_fsl_booke.S powerpc.git/arch/powerpc/kernel/head_fsl_booke.S
---- linux-2.6.25-rc9/arch/powerpc/kernel/head_fsl_booke.S      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/head_fsl_booke.S   2008-04-19 16:40:52.000000000 +0200
-@@ -68,7 +68,9 @@
+Index: linux-2.6.25.1/arch/powerpc/kernel/head_fsl_booke.S
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/head_fsl_booke.S
++++ linux-2.6.25.1/arch/powerpc/kernel/head_fsl_booke.S
+@@ -68,7 +68,9 @@ _ENTRY(_start);

        mr      r29,r5
        mr      r28,r6
        mr      r27,r7
        mr      r29,r5
        mr      r28,r6
        mr      r27,r7


@@ -88637,7 +88804,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_fsl_booke.S powerpc.
  
  /* We try to not make any assumptions about how the boot loader
   * setup or used the TLBs.  We invalidate all mappings from the
  
  /* We try to not make any assumptions about how the boot loader
   * setup or used the TLBs.  We invalidate all mappings from the

-@@ -167,7 +169,28 @@
+@@ -167,7 +169,28 @@ skpinv:   addi    r6,r6,1                         /* Increment */

        mtspr   SPRN_MAS0,r7
        tlbre
  
        mtspr   SPRN_MAS0,r7
        tlbre
  


@@ -88667,7 +88834,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_fsl_booke.S powerpc.
        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,12 +200,10 @@
+@@ -177,12 +200,10 @@ 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


@@ -88682,7 +88849,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_fsl_booke.S powerpc.
        tlbwe
  
        xori    r6,r4,1
        tlbwe
  
        xori    r6,r4,1

-@@ -232,8 +253,7 @@
+@@ -232,8 +253,7 @@ skpinv:    addi    r6,r6,1                         /* Increment */

        ori     r6,r6,PAGE_OFFSET@l
        rlwimi  r6,r7,0,20,31
        mtspr   SPRN_MAS2,r6
        ori     r6,r6,PAGE_OFFSET@l
        rlwimi  r6,r7,0,20,31
        mtspr   SPRN_MAS2,r6


@@ -88692,7 +88859,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_fsl_booke.S powerpc.
        tlbwe
  
  /* 7. Jump to KERNELBASE mapping */
        tlbwe
  
  /* 7. Jump to KERNELBASE mapping */

-@@ -283,7 +303,10 @@
+@@ -283,7 +303,10 @@ skpinv:   addi    r6,r6,1                         /* Increment */

        SET_IVOR(12, WatchdogTimer);
        SET_IVOR(13, DataTLBError);
        SET_IVOR(14, InstructionTLBError);
        SET_IVOR(12, WatchdogTimer);
        SET_IVOR(13, DataTLBError);
        SET_IVOR(14, InstructionTLBError);


@@ -88704,7 +88871,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_fsl_booke.S powerpc.
        SET_IVOR(32, SPEUnavailable);
        SET_IVOR(33, SPEFloatingPointData);
        SET_IVOR(34, SPEFloatingPointRound);
        SET_IVOR(32, SPEUnavailable);
        SET_IVOR(33, SPEFloatingPointData);
        SET_IVOR(34, SPEFloatingPointRound);

-@@ -718,7 +741,10 @@
+@@ -718,7 +741,10 @@ interrupt_base:

  
  
        /* Debug Interrupt */
  
  
        /* Debug Interrupt */


@@ -88716,10 +88883,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_fsl_booke.S powerpc.
  
  /*
   * Local functions
  
  /*
   * Local functions

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/ibmebus.c powerpc.git/arch/powerpc/kernel/ibmebus.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/ibmebus.c     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/ibmebus.c  2008-04-19 16:40:52.000000000 +0200
-@@ -183,7 +183,7 @@
+Index: linux-2.6.25.1/arch/powerpc/kernel/ibmebus.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/ibmebus.c
++++ linux-2.6.25.1/arch/powerpc/kernel/ibmebus.c
+@@ -183,7 +183,7 @@ static int ibmebus_create_devices(const 

                ret = ibmebus_create_device(child);
                if (ret) {
                        printk(KERN_ERR "%s: failed to create device (%i)",
                ret = ibmebus_create_device(child);
                if (ret) {
                        printk(KERN_ERR "%s: failed to create device (%i)",


@@ -88728,7 +88896,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/ibmebus.c powerpc.git/arc
                        of_node_put(child);
                        break;
                }
                        of_node_put(child);
                        break;
                }

-@@ -269,7 +269,7 @@
+@@ -269,7 +269,7 @@ static ssize_t ibmebus_store_probe(struc

        if (bus_find_device(&ibmebus_bus_type, NULL, path,
                            ibmebus_match_path)) {
                printk(KERN_WARNING "%s: %s has already been probed\n",
        if (bus_find_device(&ibmebus_bus_type, NULL, path,
                            ibmebus_match_path)) {
                printk(KERN_WARNING "%s: %s has already been probed\n",


@@ -88737,7 +88905,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/ibmebus.c powerpc.git/arc
                rc = -EEXIST;
                goto out;
        }
                rc = -EEXIST;
                goto out;
        }

-@@ -279,7 +279,7 @@
+@@ -279,7 +279,7 @@ static ssize_t ibmebus_store_probe(struc

                of_node_put(dn);
        } else {
                printk(KERN_WARNING "%s: no such device node: %s\n",
                of_node_put(dn);
        } else {
                printk(KERN_WARNING "%s: no such device node: %s\n",


@@ -88746,7 +88914,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/ibmebus.c powerpc.git/arc
                rc = -ENODEV;
        }
  
                rc = -ENODEV;
        }
  

-@@ -308,7 +308,7 @@
+@@ -308,7 +308,7 @@ static ssize_t ibmebus_store_remove(stru

                return count;
        } else {
                printk(KERN_WARNING "%s: %s not on the bus\n",
                return count;
        } else {
                printk(KERN_WARNING "%s: %s not on the bus\n",


@@ -88755,7 +88923,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/ibmebus.c powerpc.git/arc
  
                kfree(path);
                return -ENODEV;
  
                kfree(path);
                return -ENODEV;

-@@ -337,14 +337,14 @@
+@@ -337,14 +337,14 @@ static int __init ibmebus_bus_init(void)

        err = of_bus_type_init(&ibmebus_bus_type, "ibmebus");
        if (err) {
                printk(KERN_ERR "%s: failed to register IBM eBus.\n",
        err = of_bus_type_init(&ibmebus_bus_type, "ibmebus");
        if (err) {
                printk(KERN_ERR "%s: failed to register IBM eBus.\n",


@@ -88772,10 +88940,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/ibmebus.c powerpc.git/arc
                bus_unregister(&ibmebus_bus_type);
  
                return err;
                bus_unregister(&ibmebus_bus_type);
  
                return err;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/iommu.c powerpc.git/arch/powerpc/kernel/iommu.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/iommu.c       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/iommu.c    2008-04-19 16:40:52.000000000 +0200
-@@ -520,7 +520,7 @@
+Index: linux-2.6.25.1/arch/powerpc/kernel/iommu.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/iommu.c
++++ linux-2.6.25.1/arch/powerpc/kernel/iommu.c
+@@ -520,7 +520,7 @@ void iommu_free_table(struct iommu_table

        unsigned int order;
  
        if (!tbl || !tbl->it_map) {
        unsigned int order;
  
        if (!tbl || !tbl->it_map) {


@@ -88784,7 +88953,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/iommu.c powerpc.git/arch/
                                node_name);
                return;
        }
                                node_name);
                return;
        }

-@@ -530,7 +530,7 @@
+@@ -530,7 +530,7 @@ void iommu_free_table(struct iommu_table

        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",


@@ -88793,10 +88962,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/iommu.c powerpc.git/arch/
                        break;
                }
        }
                        break;
                }
        }

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/irq.c powerpc.git/arch/powerpc/kernel/irq.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/irq.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/irq.c      2008-04-19 16:40:52.000000000 +0200
-@@ -114,7 +114,7 @@
+Index: linux-2.6.25.1/arch/powerpc/kernel/irq.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/irq.c
++++ linux-2.6.25.1/arch/powerpc/kernel/irq.c
+@@ -114,7 +114,7 @@ static inline void set_soft_enabled(unsi

        : : "r" (enable), "i" (offsetof(struct paca_struct, soft_enabled)));
  }
  
        : : "r" (enable), "i" (offsetof(struct paca_struct, soft_enabled)));
  }
  


@@ -88805,7 +88975,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/irq.c powerpc.git/arch/po
  {
        /*
         * get_paca()->soft_enabled = en;
  {
        /*
         * get_paca()->soft_enabled = en;

-@@ -174,6 +174,7 @@
+@@ -174,6 +174,7 @@ void local_irq_restore(unsigned long en)

  
        __hard_irq_enable();
  }
  
        __hard_irq_enable();
  }


@@ -88813,7 +88983,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/irq.c powerpc.git/arch/po
  #endif /* CONFIG_PPC64 */
  
  int show_interrupts(struct seq_file *p, void *v)
  #endif /* CONFIG_PPC64 */
  
  int show_interrupts(struct seq_file *p, void *v)

-@@ -310,8 +311,21 @@
+@@ -310,8 +311,21 @@ void do_IRQ(struct pt_regs *regs)

                                handler = &__do_IRQ;
                        irqtp->task = curtp->task;
                        irqtp->flags = 0;
                                handler = &__do_IRQ;
                        irqtp->task = curtp->task;
                        irqtp->flags = 0;


@@ -88835,7 +89005,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/irq.c powerpc.git/arch/po
                        if (irqtp->flags)
                                set_bits(irqtp->flags, &curtp->flags);
                } else
                        if (irqtp->flags)
                                set_bits(irqtp->flags, &curtp->flags);
                } else

-@@ -357,7 +371,7 @@
+@@ -357,7 +371,7 @@ void irq_ctx_init(void)

                memset((void *)softirq_ctx[i], 0, THREAD_SIZE);
                tp = softirq_ctx[i];
                tp->cpu = i;
                memset((void *)softirq_ctx[i], 0, THREAD_SIZE);
                tp = softirq_ctx[i];
                tp->cpu = i;


@@ -88844,10 +89014,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/irq.c powerpc.git/arch/po
  
                memset((void *)hardirq_ctx[i], 0, THREAD_SIZE);
                tp = hardirq_ctx[i];
  
                memset((void *)hardirq_ctx[i], 0, THREAD_SIZE);
                tp = hardirq_ctx[i];

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/isa-bridge.c powerpc.git/arch/powerpc/kernel/isa-bridge.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/isa-bridge.c  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/isa-bridge.c       2008-04-19 16:40:52.000000000 +0200
-@@ -80,13 +80,13 @@
+Index: linux-2.6.25.1/arch/powerpc/kernel/isa-bridge.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/isa-bridge.c
++++ linux-2.6.25.1/arch/powerpc/kernel/isa-bridge.c
+@@ -80,13 +80,13 @@ static void __devinit pci_process_ISA_OF

         *                      (size depending on dev->n_addr_cells)
         *   cell 5:            the size of the range
         */
         *                      (size depending on dev->n_addr_cells)
         *   cell 5:            the size of the range
         */


@@ -88863,7 +89034,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/isa-bridge.c powerpc.git/
                goto inval_range;
  
        isa_addr = range->isa_addr.a_lo;
                goto inval_range;
  
        isa_addr = range->isa_addr.a_lo;

-@@ -99,7 +99,7 @@
+@@ -99,7 +99,7 @@ static void __devinit pci_process_ISA_OF

         */
        if ((pci_addr != 0) || (isa_addr != 0)) {
                printk(KERN_ERR "unexpected isa to pci mapping: %s\n",
         */
        if ((pci_addr != 0) || (isa_addr != 0)) {
                printk(KERN_ERR "unexpected isa to pci mapping: %s\n",


@@ -88872,10 +89043,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/isa-bridge.c powerpc.git/
                return;
        }
  
                return;
        }
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/lparcfg.c powerpc.git/arch/powerpc/kernel/lparcfg.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/lparcfg.c     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/lparcfg.c  2008-04-19 16:40:52.000000000 +0200
-@@ -226,7 +226,7 @@
+Index: linux-2.6.25.1/arch/powerpc/kernel/lparcfg.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/lparcfg.c
++++ linux-2.6.25.1/arch/powerpc/kernel/lparcfg.c
+@@ -226,7 +226,7 @@ static void parse_system_parameter_strin

        unsigned char *local_buffer = kmalloc(SPLPAR_MAXLENGTH, GFP_KERNEL);
        if (!local_buffer) {
                printk(KERN_ERR "%s %s kmalloc failure at line %d \n",
        unsigned char *local_buffer = kmalloc(SPLPAR_MAXLENGTH, GFP_KERNEL);
        if (!local_buffer) {
                printk(KERN_ERR "%s %s kmalloc failure at line %d \n",


@@ -88884,7 +89056,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/lparcfg.c powerpc.git/arc
                return;
        }
  
                return;
        }
  

-@@ -243,14 +243,14 @@
+@@ -243,14 +243,14 @@ static void parse_system_parameter_strin

        if (call_status != 0) {
                printk(KERN_INFO
                       "%s %s Error calling get-system-parameter (0x%x)\n",
        if (call_status != 0) {
                printk(KERN_INFO
                       "%s %s Error calling get-system-parameter (0x%x)\n",


@@ -88901,7 +89073,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/lparcfg.c powerpc.git/arc
                        kfree(local_buffer);
                        return;
                }
                        kfree(local_buffer);
                        return;
                }

-@@ -484,10 +484,10 @@
+@@ -484,10 +484,10 @@ static ssize_t lparcfg_write(struct file

        current_weight = (resource >> 5 * 8) & 0xFF;
  
        pr_debug("%s: current_entitled = %lu, current_weight = %u\n",
        current_weight = (resource >> 5 * 8) & 0xFF;
  
        pr_debug("%s: current_entitled = %lu, current_weight = %u\n",


@@ -88914,7 +89086,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/lparcfg.c powerpc.git/arc
  
        retval = plpar_hcall_norets(H_SET_PPP, *new_entitled_ptr,
                                    *new_weight_ptr);
  
        retval = plpar_hcall_norets(H_SET_PPP, *new_entitled_ptr,
                                    *new_weight_ptr);

-@@ -502,7 +502,7 @@
+@@ -502,7 +502,7 @@ static ssize_t lparcfg_write(struct file

                retval = -EINVAL;
        } else {
                printk(KERN_WARNING "%s: received unknown hv return code %ld",
                retval = -EINVAL;
        } else {
                printk(KERN_WARNING "%s: received unknown hv return code %ld",


@@ -88923,9 +89095,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/lparcfg.c powerpc.git/arc
                retval = -EIO;
        }
  
                retval = -EIO;
        }
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/machine_kexec.c powerpc.git/arch/powerpc/kernel/machine_kexec.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/machine_kexec.c       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/machine_kexec.c    2008-03-17 14:03:31.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/kernel/machine_kexec.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/machine_kexec.c
++++ linux-2.6.25.1/arch/powerpc/kernel/machine_kexec.c

 @@ -12,8 +12,9 @@
  #include <linux/kexec.h>
  #include <linux/reboot.h>
 @@ -12,8 +12,9 @@
  #include <linux/kexec.h>
  #include <linux/reboot.h>


@@ -88937,9 +89110,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/machine_kexec.c powerpc.g
  
  void machine_crash_shutdown(struct pt_regs *regs)
  {
  
  void machine_crash_shutdown(struct pt_regs *regs)
  {

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/paca.c powerpc.git/arch/powerpc/kernel/paca.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/paca.c        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/paca.c     2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/kernel/paca.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/paca.c
++++ linux-2.6.25.1/arch/powerpc/kernel/paca.c

 @@ -15,7 +15,6 @@
  #include <asm/ptrace.h>
  #include <asm/page.h>
 @@ -15,7 +15,6 @@
  #include <asm/ptrace.h>
  #include <asm/page.h>


@@ -88967,7 +89141,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/paca.c powerpc.git/arch/p
   */
  struct lppaca lppaca[] = {
        [0 ... (NR_CPUS-1)] = {
   */
  struct lppaca lppaca[] = {
        [0 ... (NR_CPUS-1)] = {

-@@ -66,32 +65,17 @@
+@@ -66,32 +65,17 @@ struct slb_shadow slb_shadow[] __cacheli

   * processors.  The processor VPD array needs one entry per physical
   * processor (not thread).
   */
   * processors.  The processor VPD array needs one entry per physical
   * processor (not thread).
   */


@@ -89004,9 +89178,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/paca.c powerpc.git/arch/p
  struct paca_struct paca[] = {
        PACA_INIT(0),
  #if NR_CPUS > 1
  struct paca_struct paca[] = {
        PACA_INIT(0),
  #if NR_CPUS > 1

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/ppc_ksyms.c powerpc.git/arch/powerpc/kernel/ppc_ksyms.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/ppc_ksyms.c   2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/ppc_ksyms.c        2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/kernel/ppc_ksyms.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/ppc_ksyms.c
++++ linux-2.6.25.1/arch/powerpc/kernel/ppc_ksyms.c

 @@ -45,10 +45,6 @@
  #include <asm/signal.h>
  #include <asm/dcr.h>
 @@ -45,10 +45,6 @@
  #include <asm/signal.h>
  #include <asm/dcr.h>


@@ -89018,7 +89193,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/ppc_ksyms.c powerpc.git/a
  #ifdef CONFIG_PPC32
  extern void transfer_to_handler(void);
  extern void do_IRQ(struct pt_regs *regs);
  #ifdef CONFIG_PPC32
  extern void transfer_to_handler(void);
  extern void do_IRQ(struct pt_regs *regs);

-@@ -58,7 +54,6 @@
+@@ -58,7 +54,6 @@ extern void program_check_exception(stru

  extern void single_step_exception(struct pt_regs *regs);
  extern int sys_sigreturn(struct pt_regs *regs);
  
  extern void single_step_exception(struct pt_regs *regs);
  extern int sys_sigreturn(struct pt_regs *regs);
  


@@ -89026,7 +89201,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/ppc_ksyms.c powerpc.git/a
  EXPORT_SYMBOL(clear_pages);
  EXPORT_SYMBOL(copy_page);
  EXPORT_SYMBOL(ISA_DMA_THRESHOLD);
  EXPORT_SYMBOL(clear_pages);
  EXPORT_SYMBOL(copy_page);
  EXPORT_SYMBOL(ISA_DMA_THRESHOLD);

-@@ -79,6 +74,7 @@
+@@ -79,6 +74,7 @@ EXPORT_SYMBOL(strncpy);

  EXPORT_SYMBOL(strcat);
  EXPORT_SYMBOL(strlen);
  EXPORT_SYMBOL(strcmp);
  EXPORT_SYMBOL(strcat);
  EXPORT_SYMBOL(strlen);
  EXPORT_SYMBOL(strcmp);


@@ -89034,15 +89209,16 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/ppc_ksyms.c powerpc.git/a
  
  EXPORT_SYMBOL(csum_partial);
  EXPORT_SYMBOL(csum_partial_copy_generic);
  
  EXPORT_SYMBOL(csum_partial);
  EXPORT_SYMBOL(csum_partial_copy_generic);

-@@ -192,3 +188,4 @@
+@@ -192,3 +188,4 @@ EXPORT_SYMBOL(intercept_table);

  EXPORT_SYMBOL(__mtdcr);
  EXPORT_SYMBOL(__mfdcr);
  #endif
 +EXPORT_SYMBOL(empty_zero_page);
  EXPORT_SYMBOL(__mtdcr);
  EXPORT_SYMBOL(__mfdcr);
  #endif
 +EXPORT_SYMBOL(empty_zero_page);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/process.c powerpc.git/arch/powerpc/kernel/process.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/process.c     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/process.c  2008-04-19 16:40:52.000000000 +0200
-@@ -868,11 +868,6 @@
+Index: linux-2.6.25.1/arch/powerpc/kernel/process.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/process.c
++++ linux-2.6.25.1/arch/powerpc/kernel/process.c
+@@ -868,11 +868,6 @@ int sys_execve(unsigned long a0, unsigne

        flush_spe_to_thread(current);
        error = do_execve(filename, (char __user * __user *) a1,
                          (char __user * __user *) a2, regs);
        flush_spe_to_thread(current);
        error = do_execve(filename, (char __user * __user *) a1,
                          (char __user * __user *) a2, regs);


@@ -89054,7 +89230,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/process.c powerpc.git/arc
        putname(filename);
  out:
        return error;
        putname(filename);
  out:
        return error;

-@@ -919,20 +914,6 @@
+@@ -919,20 +914,6 @@ int validate_sp(unsigned long sp, struct

        return valid_irq_stack(sp, p, nbytes);
  }
  
        return valid_irq_stack(sp, p, nbytes);
  }
  


@@ -89075,7 +89251,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/process.c powerpc.git/arc
  EXPORT_SYMBOL(validate_sp);
  
  unsigned long get_wchan(struct task_struct *p)
  EXPORT_SYMBOL(validate_sp);
  
  unsigned long get_wchan(struct task_struct *p)

-@@ -944,15 +925,15 @@
+@@ -944,15 +925,15 @@ unsigned long get_wchan(struct task_stru

                return 0;
  
        sp = p->thread.ksp;
                return 0;
  
        sp = p->thread.ksp;


@@ -89094,7 +89270,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/process.c powerpc.git/arc
                        if (!in_sched_functions(ip))
                                return ip;
                }
                        if (!in_sched_functions(ip))
                                return ip;
                }

-@@ -981,12 +962,12 @@
+@@ -981,12 +962,12 @@ void show_stack(struct task_struct *tsk,

        lr = 0;
        printk("Call Trace:\n");
        do {
        lr = 0;
        printk("Call Trace:\n");
        do {


@@ -89109,7 +89285,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/process.c powerpc.git/arc
                if (!firstframe || ip != lr) {
                        printk("["REG"] ["REG"] ", sp, ip);
                        print_symbol("%s", ip);
                if (!firstframe || ip != lr) {
                        printk("["REG"] ["REG"] ", sp, ip);
                        print_symbol("%s", ip);

-@@ -1000,8 +981,8 @@
+@@ -1000,8 +981,8 @@ void show_stack(struct task_struct *tsk,

                 * See if this is an exception frame.
                 * We look for the "regshere" marker in the current frame.
                 */
                 * See if this is an exception frame.
                 * We look for the "regshere" marker in the current frame.
                 */


@@ -89120,9 +89296,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/process.c powerpc.git/arc
                        struct pt_regs *regs = (struct pt_regs *)
                                (sp + STACK_FRAME_OVERHEAD);
                        printk("--- Exception: %lx", regs->trap);
                        struct pt_regs *regs = (struct pt_regs *)
                                (sp + STACK_FRAME_OVERHEAD);
                        printk("--- Exception: %lx", regs->trap);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/prom.c powerpc.git/arch/powerpc/kernel/prom.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/prom.c        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/prom.c     2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/kernel/prom.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/prom.c
++++ linux-2.6.25.1/arch/powerpc/kernel/prom.c

 @@ -31,10 +31,10 @@
  #include <linux/kexec.h>
  #include <linux/debugfs.h>
 @@ -31,10 +31,10 @@
  #include <linux/kexec.h>
  #include <linux/debugfs.h>


@@ -89143,7 +89320,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/prom.c powerpc.git/arch/p
  #include <asm/kexec.h>
  
  #ifdef DEBUG
  #include <asm/kexec.h>
  
  #ifdef DEBUG

-@@ -436,7 +437,7 @@
+@@ -436,7 +437,7 @@ early_param("mem", early_parse_mem);

   * The device tree may be allocated beyond our memory limit, or inside the
   * crash kernel region for kdump. If so, move it out of the way.
   */
   * The device tree may be allocated beyond our memory limit, or inside the
   * crash kernel region for kdump. If so, move it out of the way.
   */


@@ -89152,7 +89329,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/prom.c powerpc.git/arch/p
  {
        unsigned long start, size;
        void *p;
  {
        unsigned long start, size;
        void *p;

-@@ -1040,6 +1041,87 @@
+@@ -1040,6 +1041,87 @@ static void __init early_reserve_mem(voi

  #endif
  }
  
  #endif
  }
  


@@ -89240,7 +89417,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/prom.c powerpc.git/arch/p
  void __init early_init_devtree(void *params)
  {
        DBG(" -> early_init_devtree(%p)\n", params);
  void __init early_init_devtree(void *params)
  {
        DBG(" -> early_init_devtree(%p)\n", params);

-@@ -1052,6 +1134,11 @@
+@@ -1052,6 +1134,11 @@ void __init early_init_devtree(void *par

        of_scan_flat_dt(early_init_dt_scan_rtas, NULL);
  #endif
  
        of_scan_flat_dt(early_init_dt_scan_rtas, NULL);
  #endif
  


@@ -89252,7 +89429,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/prom.c powerpc.git/arch/p
        /* Retrieve various informations from the /chosen node of the
         * device-tree, including the platform type, initrd location and
         * size, TCE reserve, and more ...
        /* Retrieve various informations from the /chosen node of the
         * device-tree, including the platform type, initrd location and
         * size, TCE reserve, and more ...

-@@ -1072,6 +1159,7 @@
+@@ -1072,6 +1159,7 @@ void __init early_init_devtree(void *par

        reserve_kdump_trampoline();
        reserve_crashkernel();
        early_reserve_mem();
        reserve_kdump_trampoline();
        reserve_crashkernel();
        early_reserve_mem();


@@ -89260,7 +89437,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/prom.c powerpc.git/arch/p
  
        lmb_enforce_memory_limit(memory_limit);
        lmb_analyze();
  
        lmb_enforce_memory_limit(memory_limit);
        lmb_analyze();

-@@ -1244,12 +1332,14 @@
+@@ -1244,12 +1332,14 @@ EXPORT_SYMBOL(of_node_put);

   */
  void of_attach_node(struct device_node *np)
  {
   */
  void of_attach_node(struct device_node *np)
  {


@@ -89277,7 +89454,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/prom.c powerpc.git/arch/p
  }
  
  /*
  }
  
  /*

-@@ -1260,8 +1350,9 @@
+@@ -1260,8 +1350,9 @@ void of_attach_node(struct device_node *

  void of_detach_node(struct device_node *np)
  {
        struct device_node *parent;
  void of_detach_node(struct device_node *np)
  {
        struct device_node *parent;


@@ -89288,7 +89465,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/prom.c powerpc.git/arch/p
  
        parent = np->parent;
        if (!parent)
  
        parent = np->parent;
        if (!parent)

-@@ -1292,7 +1383,7 @@
+@@ -1292,7 +1383,7 @@ void of_detach_node(struct device_node *

        of_node_set_flag(np, OF_DETACHED);
  
  out_unlock:
        of_node_set_flag(np, OF_DETACHED);
  
  out_unlock:


@@ -89297,7 +89474,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/prom.c powerpc.git/arch/p
  }
  
  #ifdef CONFIG_PPC_PSERIES
  }
  
  #ifdef CONFIG_PPC_PSERIES

-@@ -1373,20 +1464,21 @@
+@@ -1373,20 +1464,21 @@ __initcall(prom_reconfig_setup);

  int prom_add_property(struct device_node* np, struct property* prop)
  {
        struct property **next;
  int prom_add_property(struct device_node* np, struct property* prop)
  {
        struct property **next;


@@ -89322,7 +89499,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/prom.c powerpc.git/arch/p
  
  #ifdef CONFIG_PROC_DEVICETREE
        /* try to add to proc as well if it was initialized */
  
  #ifdef CONFIG_PROC_DEVICETREE
        /* try to add to proc as well if it was initialized */

-@@ -1406,9 +1498,10 @@
+@@ -1406,9 +1498,10 @@ int prom_add_property(struct device_node

  int prom_remove_property(struct device_node *np, struct property *prop)
  {
        struct property **next;
  int prom_remove_property(struct device_node *np, struct property *prop)
  {
        struct property **next;


@@ -89334,7 +89511,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/prom.c powerpc.git/arch/p
        next = &np->properties;
        while (*next) {
                if (*next == prop) {
        next = &np->properties;
        while (*next) {
                if (*next == prop) {

-@@ -1421,7 +1514,7 @@
+@@ -1421,7 +1514,7 @@ int prom_remove_property(struct device_n

                }
                next = &(*next)->next;
        }
                }
                next = &(*next)->next;
        }


@@ -89343,7 +89520,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/prom.c powerpc.git/arch/p
  
        if (!found)
                return -ENODEV;
  
        if (!found)
                return -ENODEV;

-@@ -1447,9 +1540,10 @@
+@@ -1447,9 +1540,10 @@ int prom_update_property(struct device_n

                         struct property *oldprop)
  {
        struct property **next;
                         struct property *oldprop)
  {
        struct property **next;


@@ -89355,7 +89532,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/prom.c powerpc.git/arch/p
        next = &np->properties;
        while (*next) {
                if (*next == oldprop) {
        next = &np->properties;
        while (*next) {
                if (*next == oldprop) {

-@@ -1463,7 +1557,7 @@
+@@ -1463,7 +1557,7 @@ int prom_update_property(struct device_n

                }
                next = &(*next)->next;
        }
                }
                next = &(*next)->next;
        }


@@ -89364,10 +89541,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/prom.c powerpc.git/arch/p
  
        if (!found)
                return -ENODEV;
  
        if (!found)
                return -ENODEV;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/prom_init.c powerpc.git/arch/powerpc/kernel/prom_init.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/prom_init.c   2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/prom_init.c        2008-04-19 16:40:52.000000000 +0200
-@@ -2240,6 +2240,14 @@
+Index: linux-2.6.25.1/arch/powerpc/kernel/prom_init.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/prom_init.c
++++ linux-2.6.25.1/arch/powerpc/kernel/prom_init.c
+@@ -2240,6 +2240,14 @@ static void __init fixup_device_tree_efi

        if (rv != PROM_ERROR && (strcmp(prop, "chrp") == 0))
                prom_setprop(node, "/", "device_type", "efika", sizeof("efika"));
  
        if (rv != PROM_ERROR && (strcmp(prop, "chrp") == 0))
                prom_setprop(node, "/", "device_type", "efika", sizeof("efika"));
  


@@ -89382,9 +89560,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/prom_init.c powerpc.git/a
        /* Fixup bestcomm interrupts property */
        node = call_prom("finddevice", 1, 1, ADDR("/builtin/bestcomm"));
        if (PHANDLE_VALID(node)) {
        /* Fixup bestcomm interrupts property */
        node = call_prom("finddevice", 1, 1, ADDR("/builtin/bestcomm"));
        if (PHANDLE_VALID(node)) {

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/rtas.c powerpc.git/arch/powerpc/kernel/rtas.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/rtas.c        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/rtas.c     2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/kernel/rtas.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/rtas.c
++++ linux-2.6.25.1/arch/powerpc/kernel/rtas.c

 @@ -22,6 +22,7 @@
  #include <linux/smp.h>
  #include <linux/completion.h>
 @@ -22,6 +22,7 @@
  #include <linux/smp.h>
  #include <linux/completion.h>


@@ -89401,7 +89580,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/rtas.c powerpc.git/arch/p
  #include <asm/udbg.h>
  #include <asm/syscalls.h>
  #include <asm/smp.h>
  #include <asm/udbg.h>
  #include <asm/syscalls.h>
  #include <asm/smp.h>

-@@ -507,7 +507,7 @@
+@@ -507,7 +507,7 @@ int rtas_error_rc(int rtas_rc)

                        break;
                default:
                        printk(KERN_ERR "%s: unexpected RTAS error %d\n",
                        break;
                default:
                        printk(KERN_ERR "%s: unexpected RTAS error %d\n",


@@ -89410,10 +89589,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/rtas.c powerpc.git/arch/p
                        rc = -ERANGE;
                        break;
        }
                        rc = -ERANGE;
                        break;
        }

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/rtas_flash.c powerpc.git/arch/powerpc/kernel/rtas_flash.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/rtas_flash.c  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/rtas_flash.c       2008-04-19 16:40:52.000000000 +0200
-@@ -807,7 +807,7 @@
+Index: linux-2.6.25.1/arch/powerpc/kernel/rtas_flash.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/rtas_flash.c
++++ linux-2.6.25.1/arch/powerpc/kernel/rtas_flash.c
+@@ -807,7 +807,7 @@ int __init rtas_flash_init(void)

                                rtas_block_ctor);
        if (!flash_block_cache) {
                printk(KERN_ERR "%s: failed to create block cache\n",
                                rtas_block_ctor);
        if (!flash_block_cache) {
                printk(KERN_ERR "%s: failed to create block cache\n",


@@ -89422,10 +89602,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/rtas_flash.c powerpc.git/
                rc = -ENOMEM;
                goto cleanup;
        }
                rc = -ENOMEM;
                goto cleanup;
        }

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/rtas_pci.c powerpc.git/arch/powerpc/kernel/rtas_pci.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/rtas_pci.c    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/rtas_pci.c 2008-04-19 16:40:52.000000000 +0200
-@@ -56,21 +56,6 @@
+Index: linux-2.6.25.1/arch/powerpc/kernel/rtas_pci.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/rtas_pci.c
++++ linux-2.6.25.1/arch/powerpc/kernel/rtas_pci.c
+@@ -56,21 +56,6 @@ static inline int config_access_valid(st

        return 0;
  }
  
        return 0;
  }
  


@@ -89447,7 +89628,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/rtas_pci.c powerpc.git/ar
  int rtas_read_config(struct pci_dn *pdn, int where, int size, u32 *val)
  {
        int returnval = -1;
  int rtas_read_config(struct pci_dn *pdn, int where, int size, u32 *val)
  {
        int returnval = -1;

-@@ -117,7 +102,7 @@
+@@ -117,7 +102,7 @@ static int rtas_pci_read_config(struct p

        for (dn = busdn->child; dn; dn = dn->sibling) {
                struct pci_dn *pdn = PCI_DN(dn);
                if (pdn && pdn->devfn == devfn
        for (dn = busdn->child; dn; dn = dn->sibling) {
                struct pci_dn *pdn = PCI_DN(dn);
                if (pdn && pdn->devfn == devfn


@@ -89456,7 +89637,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/rtas_pci.c powerpc.git/ar
                        return rtas_read_config(pdn, where, size, val);
        }
  
                        return rtas_read_config(pdn, where, size, val);
        }
  

-@@ -164,7 +149,7 @@
+@@ -164,7 +149,7 @@ static int rtas_pci_write_config(struct 

        for (dn = busdn->child; dn; dn = dn->sibling) {
                struct pci_dn *pdn = PCI_DN(dn);
                if (pdn && pdn->devfn == devfn
        for (dn = busdn->child; dn; dn = dn->sibling) {
                struct pci_dn *pdn = PCI_DN(dn);
                if (pdn && pdn->devfn == devfn


@@ -89465,7 +89646,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/rtas_pci.c powerpc.git/ar
                        return rtas_write_config(pdn, where, size, val);
        }
        return PCIBIOS_DEVICE_NOT_FOUND;
                        return rtas_write_config(pdn, where, size, val);
        }
        return PCIBIOS_DEVICE_NOT_FOUND;

-@@ -326,7 +311,7 @@
+@@ -326,7 +311,7 @@ int pcibios_remove_root_bus(struct pci_c

  
        res = b->resource[0];
        if (!res->flags) {
  
        res = b->resource[0];
        if (!res->flags) {


@@ -89474,7 +89655,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/rtas_pci.c powerpc.git/ar
                                b->name);
                return 1;
        }
                                b->name);
                return 1;
        }

-@@ -334,13 +319,13 @@
+@@ -334,13 +319,13 @@ int pcibios_remove_root_bus(struct pci_c

        rc = pcibios_unmap_io_space(b);
        if (rc) {
                printk(KERN_ERR "%s: failed to unmap IO on bus %s\n",
        rc = pcibios_unmap_io_space(b);
        if (rc) {
                printk(KERN_ERR "%s: failed to unmap IO on bus %s\n",


@@ -89490,7 +89671,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/rtas_pci.c powerpc.git/ar
                return 1;
        }
  
                return 1;
        }
  

-@@ -348,13 +333,13 @@
+@@ -348,13 +333,13 @@ int pcibios_remove_root_bus(struct pci_c

                res = b->resource[i];
                if (!res->flags && i == 0) {
                        printk(KERN_ERR "%s: no MEM resource for PHB %s\n",
                res = b->resource[i];
                if (!res->flags && i == 0) {
                        printk(KERN_ERR "%s: no MEM resource for PHB %s\n",


@@ -89506,9 +89687,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/rtas_pci.c powerpc.git/ar
                        return 1;
                }
        }
                        return 1;
                }
        }

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/setup-common.c powerpc.git/arch/powerpc/kernel/setup-common.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/setup-common.c        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/setup-common.c     2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/kernel/setup-common.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/setup-common.c
++++ linux-2.6.25.1/arch/powerpc/kernel/setup-common.c

 @@ -34,6 +34,7 @@
  #include <linux/serial_8250.h>
  #include <linux/debugfs.h>
 @@ -34,6 +34,7 @@
  #include <linux/serial_8250.h>
  #include <linux/debugfs.h>


@@ -89525,7 +89707,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/setup-common.c powerpc.gi
  #include <asm/xmon.h>
  #include <asm/cputhreads.h>
  
  #include <asm/xmon.h>
  #include <asm/cputhreads.h>
  

-@@ -167,6 +167,8 @@
+@@ -167,6 +167,8 @@ static int show_cpuinfo(struct seq_file 

        unsigned short min;
  
        if (cpu_id == NR_CPUS) {
        unsigned short min;
  
        if (cpu_id == NR_CPUS) {


@@ -89534,7 +89716,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/setup-common.c powerpc.gi
  #if defined(CONFIG_SMP) && defined(CONFIG_PPC32)
                unsigned long bogosum = 0;
                int i;
  #if defined(CONFIG_SMP) && defined(CONFIG_PPC32)
                unsigned long bogosum = 0;
                int i;

-@@ -178,6 +180,13 @@
+@@ -178,6 +180,13 @@ static int show_cpuinfo(struct seq_file 

                seq_printf(m, "timebase\t: %lu\n", ppc_tb_freq);
                if (ppc_md.name)
                        seq_printf(m, "platform\t: %s\n", ppc_md.name);
                seq_printf(m, "timebase\t: %lu\n", ppc_tb_freq);
                if (ppc_md.name)
                        seq_printf(m, "platform\t: %s\n", ppc_md.name);


@@ -89548,10 +89730,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/setup-common.c powerpc.gi
                if (ppc_md.show_cpuinfo != NULL)
                        ppc_md.show_cpuinfo(m);
  
                if (ppc_md.show_cpuinfo != NULL)
                        ppc_md.show_cpuinfo(m);
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/setup_32.c powerpc.git/arch/powerpc/kernel/setup_32.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/setup_32.c    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/setup_32.c 2008-04-19 16:40:52.000000000 +0200
-@@ -172,6 +172,18 @@
+Index: linux-2.6.25.1/arch/powerpc/kernel/setup_32.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/setup_32.c
++++ linux-2.6.25.1/arch/powerpc/kernel/setup_32.c
+@@ -172,6 +172,18 @@ int __init ppc_setup_l2cr(char *str)

  }
  __setup("l2cr=", ppc_setup_l2cr);
  
  }
  __setup("l2cr=", ppc_setup_l2cr);
  


@@ -89570,7 +89753,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/setup_32.c powerpc.git/ar
  #ifdef CONFIG_GENERIC_NVRAM
  
  /* Generic nvram hooks used by drivers/char/gen_nvram.c */
  #ifdef CONFIG_GENERIC_NVRAM
  
  /* Generic nvram hooks used by drivers/char/gen_nvram.c */

-@@ -277,7 +289,7 @@
+@@ -277,7 +289,7 @@ void __init setup_arch(char **cmdline_p)

        if (ppc_md.panic)
                setup_panic();
  
        if (ppc_md.panic)
                setup_panic();
  


@@ -89579,9 +89762,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/setup_32.c powerpc.git/ar
        init_mm.end_code = (unsigned long) _etext;
        init_mm.end_data = (unsigned long) _edata;
        init_mm.brk = klimit;
        init_mm.end_code = (unsigned long) _etext;
        init_mm.end_data = (unsigned long) _edata;
        init_mm.brk = klimit;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/setup_64.c powerpc.git/arch/powerpc/kernel/setup_64.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/setup_64.c    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/setup_64.c 2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/kernel/setup_64.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/setup_64.c
++++ linux-2.6.25.1/arch/powerpc/kernel/setup_64.c

 @@ -33,6 +33,8 @@
  #include <linux/serial_8250.h>
  #include <linux/bootmem.h>
 @@ -33,6 +33,8 @@
  #include <linux/serial_8250.h>
  #include <linux/bootmem.h>


@@ -89599,7 +89783,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/setup_64.c powerpc.git/ar
  #include <asm/firmware.h>
  #include <asm/xmon.h>
  #include <asm/udbg.h>
  #include <asm/firmware.h>
  #include <asm/xmon.h>
  #include <asm/udbg.h>

-@@ -178,6 +179,9 @@
+@@ -178,6 +179,9 @@ void __init early_setup(unsigned long dt

        /* Enable early debugging if any specified (see udbg.h) */
        udbg_early_init();
  
        /* Enable early debugging if any specified (see udbg.h) */
        udbg_early_init();
  


@@ -89609,7 +89793,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/setup_64.c powerpc.git/ar
        DBG(" -> early_setup(), dt_ptr: 0x%lx\n", dt_ptr);
  
        /*
        DBG(" -> early_setup(), dt_ptr: 0x%lx\n", dt_ptr);
  
        /*

-@@ -510,7 +514,7 @@
+@@ -510,7 +514,7 @@ void __init setup_arch(char **cmdline_p)

        if (ppc_md.panic)
                setup_panic();
  
        if (ppc_md.panic)
                setup_panic();
  


@@ -89618,9 +89802,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/setup_64.c powerpc.git/ar
        init_mm.end_code = (unsigned long) _etext;
        init_mm.end_data = (unsigned long) _edata;
        init_mm.brk = klimit;
        init_mm.end_code = (unsigned long) _etext;
        init_mm.end_data = (unsigned long) _edata;
        init_mm.brk = klimit;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/stacktrace.c powerpc.git/arch/powerpc/kernel/stacktrace.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/stacktrace.c  1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/stacktrace.c       2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/kernel/stacktrace.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/kernel/stacktrace.c

 @@ -0,0 +1,47 @@
 +/*
 + * Stack trace utility
 @@ -0,0 +1,47 @@
 +/*
 + * Stack trace utility


@@ -89669,10 +89854,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/stacktrace.c powerpc.git/
 +              sp = newsp;
 +      }
 +}
 +              sp = newsp;
 +      }
 +}

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/sys_ppc32.c powerpc.git/arch/powerpc/kernel/sys_ppc32.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/sys_ppc32.c   2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/sys_ppc32.c        2008-04-19 16:40:52.000000000 +0200
-@@ -368,11 +368,6 @@
+Index: linux-2.6.25.1/arch/powerpc/kernel/sys_ppc32.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/sys_ppc32.c
++++ linux-2.6.25.1/arch/powerpc/kernel/sys_ppc32.c
+@@ -368,11 +368,6 @@ long compat_sys_execve(unsigned long a0,

  
        error = compat_do_execve(filename, compat_ptr(a1), compat_ptr(a2), regs);
  
  
        error = compat_do_execve(filename, compat_ptr(a1), compat_ptr(a2), regs);
  


@@ -89684,9 +89870,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/sys_ppc32.c powerpc.git/a
        putname(filename);
  
  out:
        putname(filename);
  
  out:

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/vdso.c powerpc.git/arch/powerpc/kernel/vdso.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/vdso.c        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/vdso.c     2008-03-17 14:03:31.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/kernel/vdso.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/vdso.c
++++ linux-2.6.25.1/arch/powerpc/kernel/vdso.c

 @@ -21,13 +21,14 @@
  #include <linux/elf.h>
  #include <linux/security.h>
 @@ -21,13 +21,14 @@
  #include <linux/elf.h>
  #include <linux/security.h>


@@ -89703,10 +89890,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/vdso.c powerpc.git/arch/p
  #include <asm/machdep.h>
  #include <asm/cputable.h>
  #include <asm/sections.h>
  #include <asm/machdep.h>
  #include <asm/cputable.h>
  #include <asm/sections.h>

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/vio.c powerpc.git/arch/powerpc/kernel/vio.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/vio.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/vio.c      2008-04-19 16:40:52.000000000 +0200
-@@ -139,7 +139,7 @@
+Index: linux-2.6.25.1/arch/powerpc/kernel/vio.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/vio.c
++++ linux-2.6.25.1/arch/powerpc/kernel/vio.c
+@@ -139,7 +139,7 @@ static int vio_bus_remove(struct device 

   */
  int vio_register_driver(struct vio_driver *viodrv)
  {
   */
  int vio_register_driver(struct vio_driver *viodrv)
  {


@@ -89715,7 +89903,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/vio.c powerpc.git/arch/po
                viodrv->driver.name);
  
        /* fill in 'struct driver' fields */
                viodrv->driver.name);
  
        /* fill in 'struct driver' fields */

-@@ -184,7 +184,7 @@
+@@ -184,7 +184,7 @@ struct vio_dev *vio_register_device_node

        /* we need the 'device_type' property, in order to match with drivers */
        if (of_node->type == NULL) {
                printk(KERN_WARNING "%s: node %s missing 'device_type'\n",
        /* we need the 'device_type' property, in order to match with drivers */
        if (of_node->type == NULL) {
                printk(KERN_WARNING "%s: node %s missing 'device_type'\n",


@@ -89724,7 +89912,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/vio.c powerpc.git/arch/po
                                of_node->name ? of_node->name : "<unknown>");
                return NULL;
        }
                                of_node->name ? of_node->name : "<unknown>");
                return NULL;
        }

-@@ -192,7 +192,7 @@
+@@ -192,7 +192,7 @@ struct vio_dev *vio_register_device_node

        unit_address = of_get_property(of_node, "reg", NULL);
        if (unit_address == NULL) {
                printk(KERN_WARNING "%s: node %s missing 'reg'\n",
        unit_address = of_get_property(of_node, "reg", NULL);
        if (unit_address == NULL) {
                printk(KERN_WARNING "%s: node %s missing 'reg'\n",


@@ -89733,7 +89921,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/vio.c powerpc.git/arch/po
                                of_node->name ? of_node->name : "<unknown>");
                return NULL;
        }
                                of_node->name ? of_node->name : "<unknown>");
                return NULL;
        }

-@@ -227,7 +227,7 @@
+@@ -227,7 +227,7 @@ struct vio_dev *vio_register_device_node

        /* register with generic device framework */
        if (device_register(&viodev->dev)) {
                printk(KERN_ERR "%s: failed to register device %s\n",
        /* register with generic device framework */
        if (device_register(&viodev->dev)) {
                printk(KERN_ERR "%s: failed to register device %s\n",


@@ -89742,7 +89930,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/vio.c powerpc.git/arch/po
                /* XXX free TCE table */
                kfree(viodev);
                return NULL;
                /* XXX free TCE table */
                kfree(viodev);
                return NULL;

-@@ -258,7 +258,7 @@
+@@ -258,7 +258,7 @@ static int __init vio_bus_init(void)

        err = device_register(&vio_bus_device.dev);
        if (err) {
                printk(KERN_WARNING "%s: device_register returned %i\n",
        err = device_register(&vio_bus_device.dev);
        if (err) {
                printk(KERN_WARNING "%s: device_register returned %i\n",


@@ -89751,9 +89939,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/vio.c powerpc.git/arch/po
                return err;
        }
  
                return err;
        }
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/vmlinux.lds.S powerpc.git/arch/powerpc/kernel/vmlinux.lds.S
---- linux-2.6.25-rc9/arch/powerpc/kernel/vmlinux.lds.S 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/vmlinux.lds.S      2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/kernel/vmlinux.lds.S
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/kernel/vmlinux.lds.S
++++ linux-2.6.25.1/arch/powerpc/kernel/vmlinux.lds.S

 @@ -1,11 +1,9 @@
  #ifdef CONFIG_PPC64
 -#include <asm/page.h>
 @@ -1,11 +1,9 @@
  #ifdef CONFIG_PPC64
 -#include <asm/page.h>


@@ -89767,7 +89956,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/vmlinux.lds.S powerpc.git
  #include <asm-generic/vmlinux.lds.h>
  #include <asm/cache.h>
  
  #include <asm-generic/vmlinux.lds.h>
  #include <asm/cache.h>
  

-@@ -33,7 +31,7 @@
+@@ -33,7 +31,7 @@ SECTIONS

   */
  
        /* Text and gots */
   */
  
        /* Text and gots */


@@ -89776,7 +89965,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/vmlinux.lds.S powerpc.git
                ALIGN_FUNCTION();
                *(.text.head)
                _text = .;
                ALIGN_FUNCTION();
                *(.text.head)
                _text = .;

-@@ -58,7 +56,7 @@
+@@ -58,7 +56,7 @@ SECTIONS

        RODATA
  
        /* Exception & bug tables */
        RODATA
  
        /* Exception & bug tables */


@@ -89785,7 +89974,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/vmlinux.lds.S powerpc.git
                __start___ex_table = .;
                *(__ex_table)
                __stop___ex_table = .;
                __start___ex_table = .;
                *(__ex_table)
                __stop___ex_table = .;

-@@ -74,7 +72,7 @@
+@@ -74,7 +72,7 @@ SECTIONS

        . = ALIGN(PAGE_SIZE);
        __init_begin = .;
  
        . = ALIGN(PAGE_SIZE);
        __init_begin = .;
  


@@ -89794,7 +89983,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/vmlinux.lds.S powerpc.git
                _sinittext = .;
                INIT_TEXT
                _einittext = .;
                _sinittext = .;
                INIT_TEXT
                _einittext = .;

-@@ -83,11 +81,11 @@
+@@ -83,11 +81,11 @@ SECTIONS

        /* .exit.text is discarded at runtime, not link time,
         * to deal with references from __bug_table
         */
        /* .exit.text is discarded at runtime, not link time,
         * to deal with references from __bug_table
         */


@@ -89808,7 +89997,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/vmlinux.lds.S powerpc.git
                INIT_DATA
                __vtop_table_begin = .;
                *(.vtop_fixup);
                INIT_DATA
                __vtop_table_begin = .;
                *(.vtop_fixup);

-@@ -103,19 +101,19 @@
+@@ -103,19 +101,19 @@ SECTIONS

        }
  
        . = ALIGN(16);
        }
  
        . = ALIGN(16);


@@ -89831,7 +90020,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/vmlinux.lds.S powerpc.git
                __con_initcall_start = .;
                *(.con_initcall.init)
                __con_initcall_end = .;
                __con_initcall_start = .;
                *(.con_initcall.init)
                __con_initcall_end = .;

-@@ -124,14 +122,14 @@
+@@ -124,14 +122,14 @@ SECTIONS

        SECURITY_INIT
  
        . = ALIGN(8);
        SECURITY_INIT
  
        . = ALIGN(8);


@@ -89848,7 +90037,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/vmlinux.lds.S powerpc.git
                __start___fw_ftr_fixup = .;
                *(__fw_ftr_fixup)
                __stop___fw_ftr_fixup = .;
                __start___fw_ftr_fixup = .;
                *(__fw_ftr_fixup)
                __stop___fw_ftr_fixup = .;

-@@ -139,14 +137,14 @@
+@@ -139,14 +137,14 @@ SECTIONS

  #endif
  #ifdef CONFIG_BLK_DEV_INITRD
        . = ALIGN(PAGE_SIZE);
  #endif
  #ifdef CONFIG_BLK_DEV_INITRD
        . = ALIGN(PAGE_SIZE);


@@ -89865,7 +90054,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/vmlinux.lds.S powerpc.git
                __per_cpu_start = .;
                *(.data.percpu)
                *(.data.percpu.shared_aligned)
                __per_cpu_start = .;
                *(.data.percpu)
                *(.data.percpu.shared_aligned)

-@@ -154,7 +152,7 @@
+@@ -154,7 +152,7 @@ SECTIONS

        }
  
        . = ALIGN(8);
        }
  
        . = ALIGN(8);


@@ -89874,7 +90063,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/vmlinux.lds.S powerpc.git
                __machine_desc_start = . ;
                *(.machine.desc)
                __machine_desc_end = . ;
                __machine_desc_start = . ;
                *(.machine.desc)
                __machine_desc_end = . ;

-@@ -172,25 +170,24 @@
+@@ -172,25 +170,24 @@ SECTIONS

        _sdata = .;
  
  #ifdef CONFIG_PPC32
        _sdata = .;
  
  #ifdef CONFIG_PPC32


@@ -89904,7 +90093,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/vmlinux.lds.S powerpc.git
                __toc_start = .;
                *(.got)
                *(.toc)
                __toc_start = .;
                *(.got)
                *(.toc)

-@@ -207,26 +204,26 @@
+@@ -207,26 +204,26 @@ SECTIONS

  #else
        . = ALIGN(16384);
  #endif
  #else
        . = ALIGN(16384);
  #endif


@@ -89936,7 +90125,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/vmlinux.lds.S powerpc.git
                __nosave_begin = .;
                *(.data.nosave)
                . = ALIGN(PAGE_SIZE);
                __nosave_begin = .;
                *(.data.nosave)
                . = ALIGN(PAGE_SIZE);

-@@ -237,7 +234,7 @@
+@@ -237,7 +234,7 @@ SECTIONS

   * And finally the bss
   */
  
   * And finally the bss
   */
  


@@ -89945,10 +90134,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/vmlinux.lds.S powerpc.git
                __bss_start = .;
                *(.sbss) *(.scommon)
                *(.dynbss)
                __bss_start = .;
                *(.sbss) *(.scommon)
                *(.dynbss)

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/lib/rheap.c powerpc.git/arch/powerpc/lib/rheap.c
---- linux-2.6.25-rc9/arch/powerpc/lib/rheap.c  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/lib/rheap.c       2008-04-19 16:40:52.000000000 +0200
-@@ -54,7 +54,7 @@
+Index: linux-2.6.25.1/arch/powerpc/lib/rheap.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/lib/rheap.c
++++ linux-2.6.25.1/arch/powerpc/lib/rheap.c
+@@ -54,7 +54,7 @@ static int grow(rh_info_t * info, int ma

  
        new_blocks = max_blocks - info->max_blocks;
  
  
        new_blocks = max_blocks - info->max_blocks;
  


@@ -89957,7 +90147,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/lib/rheap.c powerpc.git/arch/pow
        if (block == NULL)
                return -ENOMEM;
  
        if (block == NULL)
                return -ENOMEM;
  

-@@ -258,7 +258,7 @@
+@@ -258,7 +258,7 @@ rh_info_t *rh_create(unsigned int alignm

        if ((alignment & (alignment - 1)) != 0)
                return ERR_PTR(-EINVAL);
  
        if ((alignment & (alignment - 1)) != 0)
                return ERR_PTR(-EINVAL);
  


@@ -89966,10 +90156,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/lib/rheap.c powerpc.git/arch/pow
        if (info == NULL)
                return ERR_PTR(-ENOMEM);
  
        if (info == NULL)
                return ERR_PTR(-ENOMEM);
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/lib/string.S powerpc.git/arch/powerpc/lib/string.S
---- linux-2.6.25-rc9/arch/powerpc/lib/string.S 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/lib/string.S      2008-04-19 16:40:52.000000000 +0200
-@@ -75,6 +75,20 @@
+Index: linux-2.6.25.1/arch/powerpc/lib/string.S
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/lib/string.S
++++ linux-2.6.25.1/arch/powerpc/lib/string.S
+@@ -75,6 +75,20 @@ _GLOBAL(strcmp)

        beq     1b
        blr
  
        beq     1b
        blr
  


@@ -89990,10 +90181,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/lib/string.S powerpc.git/arch/po
  _GLOBAL(strlen)
        addi    r4,r3,-1
  1:    lbzu    r0,1(r4)
  _GLOBAL(strlen)
        addi    r4,r3,-1
  1:    lbzu    r0,1(r4)

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fabs.c powerpc.git/arch/powerpc/math-emu/fabs.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fabs.c      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fabs.c   2008-04-19 16:40:52.000000000 +0200
-@@ -9,7 +9,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/fabs.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/fabs.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/fabs.c
+@@ -9,7 +9,7 @@ fabs(u32 *frD, u32 *frB)

        frD[1] = frB[1];
  
  #ifdef DEBUG
        frD[1] = frB[1];
  
  #ifdef DEBUG


@@ -90002,10 +90194,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fabs.c powerpc.git/arch
        dump_double(frD);
        printk("\n");
  #endif
        dump_double(frD);
        printk("\n");
  #endif

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fadd.c powerpc.git/arch/powerpc/math-emu/fadd.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fadd.c      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fadd.c   2008-04-19 16:40:52.000000000 +0200
-@@ -14,7 +14,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/fadd.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/fadd.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/fadd.c
+@@ -14,7 +14,7 @@ fadd(void *frD, void *frA, void *frB)

        int ret = 0;
  
  #ifdef DEBUG
        int ret = 0;
  
  #ifdef DEBUG


@@ -90014,10 +90207,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fadd.c powerpc.git/arch
  #endif
  
        __FP_UNPACK_D(A, frA);
  #endif
  
        __FP_UNPACK_D(A, frA);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fadds.c powerpc.git/arch/powerpc/math-emu/fadds.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fadds.c     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fadds.c  2008-04-19 16:40:52.000000000 +0200
-@@ -15,7 +15,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/fadds.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/fadds.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/fadds.c
+@@ -15,7 +15,7 @@ fadds(void *frD, void *frA, void *frB)

        int ret = 0;
  
  #ifdef DEBUG
        int ret = 0;
  
  #ifdef DEBUG


@@ -90026,10 +90220,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fadds.c powerpc.git/arc
  #endif
  
        __FP_UNPACK_D(A, frA);
  #endif
  
        __FP_UNPACK_D(A, frA);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fcmpo.c powerpc.git/arch/powerpc/math-emu/fcmpo.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fcmpo.c     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fcmpo.c  2008-04-19 16:40:52.000000000 +0200
-@@ -15,7 +15,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/fcmpo.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/fcmpo.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/fcmpo.c
+@@ -15,7 +15,7 @@ fcmpo(u32 *ccr, int crfD, void *frA, voi

        int ret = 0;
  
  #ifdef DEBUG
        int ret = 0;
  
  #ifdef DEBUG


@@ -90038,10 +90233,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fcmpo.c powerpc.git/arc
  #endif
  
        __FP_UNPACK_D(A, frA);
  #endif
  
        __FP_UNPACK_D(A, frA);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fcmpu.c powerpc.git/arch/powerpc/math-emu/fcmpu.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fcmpu.c     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fcmpu.c  2008-04-19 16:40:52.000000000 +0200
-@@ -14,7 +14,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/fcmpu.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/fcmpu.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/fcmpu.c
+@@ -14,7 +14,7 @@ fcmpu(u32 *ccr, int crfD, void *frA, voi

        long cmp;
  
  #ifdef DEBUG
        long cmp;
  
  #ifdef DEBUG


@@ -90050,10 +90246,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fcmpu.c powerpc.git/arc
  #endif
  
        __FP_UNPACK_D(A, frA);
  #endif
  
        __FP_UNPACK_D(A, frA);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fctiw.c powerpc.git/arch/powerpc/math-emu/fctiw.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fctiw.c     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fctiw.c  2008-04-19 16:40:52.000000000 +0200
-@@ -16,7 +16,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/fctiw.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/fctiw.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/fctiw.c
+@@ -16,7 +16,7 @@ fctiw(u32 *frD, void *frB)

        frD[1] = r;
  
  #ifdef DEBUG
        frD[1] = r;
  
  #ifdef DEBUG


@@ -90062,10 +90259,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fctiw.c powerpc.git/arc
        dump_double(frD);
        printk("\n");
  #endif
        dump_double(frD);
        printk("\n");
  #endif

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fctiwz.c powerpc.git/arch/powerpc/math-emu/fctiwz.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fctiwz.c    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fctiwz.c 2008-04-19 16:40:52.000000000 +0200
-@@ -23,7 +23,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/fctiwz.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/fctiwz.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/fctiwz.c
+@@ -23,7 +23,7 @@ fctiwz(u32 *frD, void *frB)

        __FPU_FPSCR = fpscr;
  
  #ifdef DEBUG
        __FPU_FPSCR = fpscr;
  
  #ifdef DEBUG


@@ -90074,10 +90272,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fctiwz.c powerpc.git/ar
        dump_double(frD);
        printk("\n");
  #endif
        dump_double(frD);
        printk("\n");
  #endif

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fdiv.c powerpc.git/arch/powerpc/math-emu/fdiv.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fdiv.c      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fdiv.c   2008-04-19 16:40:52.000000000 +0200
-@@ -14,7 +14,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/fdiv.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/fdiv.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/fdiv.c
+@@ -14,7 +14,7 @@ fdiv(void *frD, void *frA, void *frB)

        int ret = 0;
  
  #ifdef DEBUG
        int ret = 0;
  
  #ifdef DEBUG


@@ -90086,7 +90285,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fdiv.c powerpc.git/arch
  #endif
  
        __FP_UNPACK_D(A, frA);
  #endif
  
        __FP_UNPACK_D(A, frA);

-@@ -28,13 +28,13 @@
+@@ -28,13 +28,13 @@ fdiv(void *frD, void *frA, void *frB)

        if (A_c == FP_CLS_ZERO && B_c == FP_CLS_ZERO) {
                ret |= EFLAG_VXZDZ;
  #ifdef DEBUG
        if (A_c == FP_CLS_ZERO && B_c == FP_CLS_ZERO) {
                ret |= EFLAG_VXZDZ;
  #ifdef DEBUG


@@ -90102,10 +90301,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fdiv.c powerpc.git/arch
  #endif
        }
  
  #endif
        }
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fdivs.c powerpc.git/arch/powerpc/math-emu/fdivs.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fdivs.c     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fdivs.c  2008-04-19 16:40:52.000000000 +0200
-@@ -15,7 +15,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/fdivs.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/fdivs.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/fdivs.c
+@@ -15,7 +15,7 @@ fdivs(void *frD, void *frA, void *frB)

        int ret = 0;
  
  #ifdef DEBUG
        int ret = 0;
  
  #ifdef DEBUG


@@ -90114,7 +90314,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fdivs.c powerpc.git/arc
  #endif
  
        __FP_UNPACK_D(A, frA);
  #endif
  
        __FP_UNPACK_D(A, frA);

-@@ -29,13 +29,13 @@
+@@ -29,13 +29,13 @@ fdivs(void *frD, void *frA, void *frB)

        if (A_c == FP_CLS_ZERO && B_c == FP_CLS_ZERO) {
                ret |= EFLAG_VXZDZ;
  #ifdef DEBUG
        if (A_c == FP_CLS_ZERO && B_c == FP_CLS_ZERO) {
                ret |= EFLAG_VXZDZ;
  #ifdef DEBUG


@@ -90130,10 +90330,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fdivs.c powerpc.git/arc
  #endif
        }
  
  #endif
        }
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fmadd.c powerpc.git/arch/powerpc/math-emu/fmadd.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fmadd.c     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fmadd.c  2008-04-19 16:40:52.000000000 +0200
-@@ -16,7 +16,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/fmadd.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/fmadd.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/fmadd.c
+@@ -16,7 +16,7 @@ fmadd(void *frD, void *frA, void *frB, v

        int ret = 0;
  
  #ifdef DEBUG
        int ret = 0;
  
  #ifdef DEBUG


@@ -90142,10 +90343,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fmadd.c powerpc.git/arc
  #endif
  
        __FP_UNPACK_D(A, frA);
  #endif
  
        __FP_UNPACK_D(A, frA);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fmadds.c powerpc.git/arch/powerpc/math-emu/fmadds.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fmadds.c    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fmadds.c 2008-04-19 16:40:52.000000000 +0200
-@@ -17,7 +17,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/fmadds.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/fmadds.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/fmadds.c
+@@ -17,7 +17,7 @@ fmadds(void *frD, void *frA, void *frB, 

        int ret = 0;
  
  #ifdef DEBUG
        int ret = 0;
  
  #ifdef DEBUG


@@ -90154,10 +90356,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fmadds.c powerpc.git/ar
  #endif
  
        __FP_UNPACK_D(A, frA);
  #endif
  
        __FP_UNPACK_D(A, frA);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fmr.c powerpc.git/arch/powerpc/math-emu/fmr.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fmr.c       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fmr.c    2008-04-19 16:40:52.000000000 +0200
-@@ -9,7 +9,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/fmr.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/fmr.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/fmr.c
+@@ -9,7 +9,7 @@ fmr(u32 *frD, u32 *frB)

        frD[1] = frB[1];
  
  #ifdef DEBUG
        frD[1] = frB[1];
  
  #ifdef DEBUG


@@ -90166,10 +90369,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fmr.c powerpc.git/arch/
        dump_double(frD);
        printk("\n");
  #endif
        dump_double(frD);
        printk("\n");
  #endif

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fmsub.c powerpc.git/arch/powerpc/math-emu/fmsub.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fmsub.c     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fmsub.c  2008-04-19 16:40:52.000000000 +0200
-@@ -16,7 +16,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/fmsub.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/fmsub.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/fmsub.c
+@@ -16,7 +16,7 @@ fmsub(void *frD, void *frA, void *frB, v

        int ret = 0;
  
  #ifdef DEBUG
        int ret = 0;
  
  #ifdef DEBUG


@@ -90178,10 +90382,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fmsub.c powerpc.git/arc
  #endif
  
        __FP_UNPACK_D(A, frA);
  #endif
  
        __FP_UNPACK_D(A, frA);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fmsubs.c powerpc.git/arch/powerpc/math-emu/fmsubs.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fmsubs.c    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fmsubs.c 2008-04-19 16:40:52.000000000 +0200
-@@ -17,7 +17,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/fmsubs.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/fmsubs.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/fmsubs.c
+@@ -17,7 +17,7 @@ fmsubs(void *frD, void *frA, void *frB, 

        int ret = 0;
  
  #ifdef DEBUG
        int ret = 0;
  
  #ifdef DEBUG


@@ -90190,10 +90395,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fmsubs.c powerpc.git/ar
  #endif
  
        __FP_UNPACK_D(A, frA);
  #endif
  
        __FP_UNPACK_D(A, frA);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fmul.c powerpc.git/arch/powerpc/math-emu/fmul.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fmul.c      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fmul.c   2008-04-19 16:40:52.000000000 +0200
-@@ -14,7 +14,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/fmul.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/fmul.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/fmul.c
+@@ -14,7 +14,7 @@ fmul(void *frD, void *frA, void *frB)

        int ret = 0;
  
  #ifdef DEBUG
        int ret = 0;
  
  #ifdef DEBUG


@@ -90202,10 +90408,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fmul.c powerpc.git/arch
  #endif
  
        __FP_UNPACK_D(A, frA);
  #endif
  
        __FP_UNPACK_D(A, frA);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fmuls.c powerpc.git/arch/powerpc/math-emu/fmuls.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fmuls.c     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fmuls.c  2008-04-19 16:40:52.000000000 +0200
-@@ -15,7 +15,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/fmuls.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/fmuls.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/fmuls.c
+@@ -15,7 +15,7 @@ fmuls(void *frD, void *frA, void *frB)

        int ret = 0;
  
  #ifdef DEBUG
        int ret = 0;
  
  #ifdef DEBUG


@@ -90214,10 +90421,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fmuls.c powerpc.git/arc
  #endif
  
        __FP_UNPACK_D(A, frA);
  #endif
  
        __FP_UNPACK_D(A, frA);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fnabs.c powerpc.git/arch/powerpc/math-emu/fnabs.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fnabs.c     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fnabs.c  2008-04-19 16:40:52.000000000 +0200
-@@ -9,7 +9,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/fnabs.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/fnabs.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/fnabs.c
+@@ -9,7 +9,7 @@ fnabs(u32 *frD, u32 *frB)

        frD[1] = frB[1];
  
  #ifdef DEBUG
        frD[1] = frB[1];
  
  #ifdef DEBUG


@@ -90226,10 +90434,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fnabs.c powerpc.git/arc
        dump_double(frD);
        printk("\n");
  #endif
        dump_double(frD);
        printk("\n");
  #endif

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fneg.c powerpc.git/arch/powerpc/math-emu/fneg.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fneg.c      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fneg.c   2008-04-19 16:40:52.000000000 +0200
-@@ -9,7 +9,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/fneg.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/fneg.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/fneg.c
+@@ -9,7 +9,7 @@ fneg(u32 *frD, u32 *frB)

        frD[1] = frB[1];
  
  #ifdef DEBUG
        frD[1] = frB[1];
  
  #ifdef DEBUG


@@ -90238,10 +90447,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fneg.c powerpc.git/arch
        dump_double(frD);
        printk("\n");
  #endif
        dump_double(frD);
        printk("\n");
  #endif

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fnmadd.c powerpc.git/arch/powerpc/math-emu/fnmadd.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fnmadd.c    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fnmadd.c 2008-04-19 16:40:52.000000000 +0200
-@@ -16,7 +16,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/fnmadd.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/fnmadd.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/fnmadd.c
+@@ -16,7 +16,7 @@ fnmadd(void *frD, void *frA, void *frB, 

        int ret = 0;
  
  #ifdef DEBUG
        int ret = 0;
  
  #ifdef DEBUG


@@ -90250,10 +90460,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fnmadd.c powerpc.git/ar
  #endif
  
        __FP_UNPACK_D(A, frA);
  #endif
  
        __FP_UNPACK_D(A, frA);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fnmadds.c powerpc.git/arch/powerpc/math-emu/fnmadds.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fnmadds.c   2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fnmadds.c        2008-04-19 16:40:52.000000000 +0200
-@@ -17,7 +17,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/fnmadds.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/fnmadds.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/fnmadds.c
+@@ -17,7 +17,7 @@ fnmadds(void *frD, void *frA, void *frB,

        int ret = 0;
  
  #ifdef DEBUG
        int ret = 0;
  
  #ifdef DEBUG


@@ -90262,10 +90473,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fnmadds.c powerpc.git/a
  #endif
  
        __FP_UNPACK_D(A, frA);
  #endif
  
        __FP_UNPACK_D(A, frA);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fnmsub.c powerpc.git/arch/powerpc/math-emu/fnmsub.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fnmsub.c    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fnmsub.c 2008-04-19 16:40:52.000000000 +0200
-@@ -16,7 +16,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/fnmsub.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/fnmsub.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/fnmsub.c
+@@ -16,7 +16,7 @@ fnmsub(void *frD, void *frA, void *frB, 

        int ret = 0;
  
  #ifdef DEBUG
        int ret = 0;
  
  #ifdef DEBUG


@@ -90274,10 +90486,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fnmsub.c powerpc.git/ar
  #endif
  
        __FP_UNPACK_D(A, frA);
  #endif
  
        __FP_UNPACK_D(A, frA);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fnmsubs.c powerpc.git/arch/powerpc/math-emu/fnmsubs.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fnmsubs.c   2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fnmsubs.c        2008-04-19 16:40:52.000000000 +0200
-@@ -17,7 +17,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/fnmsubs.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/fnmsubs.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/fnmsubs.c
+@@ -17,7 +17,7 @@ fnmsubs(void *frD, void *frA, void *frB,

        int ret = 0;
  
  #ifdef DEBUG
        int ret = 0;
  
  #ifdef DEBUG


@@ -90286,10 +90499,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fnmsubs.c powerpc.git/a
  #endif
  
        __FP_UNPACK_D(A, frA);
  #endif
  
        __FP_UNPACK_D(A, frA);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fres.c powerpc.git/arch/powerpc/math-emu/fres.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fres.c      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fres.c   2008-04-19 16:40:52.000000000 +0200
-@@ -6,7 +6,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/fres.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/fres.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/fres.c
+@@ -6,7 +6,7 @@ int

  fres(void *frD, void *frB)
  {
  #ifdef DEBUG
  fres(void *frD, void *frB)
  {
  #ifdef DEBUG


@@ -90298,10 +90512,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fres.c powerpc.git/arch
  #endif
        return -ENOSYS;
  }
  #endif
        return -ENOSYS;
  }

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/frsp.c powerpc.git/arch/powerpc/math-emu/frsp.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/frsp.c      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/frsp.c   2008-04-19 16:40:52.000000000 +0200
-@@ -12,7 +12,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/frsp.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/frsp.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/frsp.c
+@@ -12,7 +12,7 @@ frsp(void *frD, void *frB)

        FP_DECL_D(B);
  
  #ifdef DEBUG
        FP_DECL_D(B);
  
  #ifdef DEBUG


@@ -90310,10 +90525,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/frsp.c powerpc.git/arch
  #endif
  
        __FP_UNPACK_D(B, frB);
  #endif
  
        __FP_UNPACK_D(B, frB);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/frsqrte.c powerpc.git/arch/powerpc/math-emu/frsqrte.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/frsqrte.c   2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/frsqrte.c        2008-04-19 16:40:52.000000000 +0200
-@@ -6,7 +6,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/frsqrte.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/frsqrte.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/frsqrte.c
+@@ -6,7 +6,7 @@ int

  frsqrte(void *frD, void *frB)
  {
  #ifdef DEBUG
  frsqrte(void *frD, void *frB)
  {
  #ifdef DEBUG


@@ -90322,10 +90538,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/frsqrte.c powerpc.git/a
  #endif
        return 0;
  }
  #endif
        return 0;
  }

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fsel.c powerpc.git/arch/powerpc/math-emu/fsel.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fsel.c      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fsel.c   2008-04-19 16:40:52.000000000 +0200
-@@ -11,7 +11,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/fsel.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/fsel.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/fsel.c
+@@ -11,7 +11,7 @@ fsel(u32 *frD, void *frA, u32 *frB, u32 

        FP_DECL_D(A);
  
  #ifdef DEBUG
        FP_DECL_D(A);
  
  #ifdef DEBUG


@@ -90334,10 +90551,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fsel.c powerpc.git/arch
  #endif
  
        __FP_UNPACK_D(A, frA);
  #endif
  
        __FP_UNPACK_D(A, frA);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fsqrt.c powerpc.git/arch/powerpc/math-emu/fsqrt.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fsqrt.c     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fsqrt.c  2008-04-19 16:40:52.000000000 +0200
-@@ -13,7 +13,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/fsqrt.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/fsqrt.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/fsqrt.c
+@@ -13,7 +13,7 @@ fsqrt(void *frD, void *frB)

        int ret = 0;
  
  #ifdef DEBUG
        int ret = 0;
  
  #ifdef DEBUG


@@ -90346,10 +90564,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fsqrt.c powerpc.git/arc
  #endif
  
        __FP_UNPACK_D(B, frB);
  #endif
  
        __FP_UNPACK_D(B, frB);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fsqrts.c powerpc.git/arch/powerpc/math-emu/fsqrts.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fsqrts.c    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fsqrts.c 2008-04-19 16:40:52.000000000 +0200
-@@ -14,7 +14,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/fsqrts.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/fsqrts.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/fsqrts.c
+@@ -14,7 +14,7 @@ fsqrts(void *frD, void *frB)

        int ret = 0;
  
  #ifdef DEBUG
        int ret = 0;
  
  #ifdef DEBUG


@@ -90358,10 +90577,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fsqrts.c powerpc.git/ar
  #endif
  
        __FP_UNPACK_D(B, frB);
  #endif
  
        __FP_UNPACK_D(B, frB);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fsub.c powerpc.git/arch/powerpc/math-emu/fsub.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fsub.c      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fsub.c   2008-04-19 16:40:52.000000000 +0200
-@@ -14,7 +14,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/fsub.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/fsub.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/fsub.c
+@@ -14,7 +14,7 @@ fsub(void *frD, void *frA, void *frB)

        int ret = 0;
  
  #ifdef DEBUG
        int ret = 0;
  
  #ifdef DEBUG


@@ -90370,10 +90590,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fsub.c powerpc.git/arch
  #endif
  
        __FP_UNPACK_D(A, frA);
  #endif
  
        __FP_UNPACK_D(A, frA);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fsubs.c powerpc.git/arch/powerpc/math-emu/fsubs.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fsubs.c     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fsubs.c  2008-04-19 16:40:52.000000000 +0200
-@@ -15,7 +15,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/fsubs.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/fsubs.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/fsubs.c
+@@ -15,7 +15,7 @@ fsubs(void *frD, void *frA, void *frB)

        int ret = 0;
  
  #ifdef DEBUG
        int ret = 0;
  
  #ifdef DEBUG


@@ -90382,10 +90603,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fsubs.c powerpc.git/arc
  #endif
  
        __FP_UNPACK_D(A, frA);
  #endif
  
        __FP_UNPACK_D(A, frA);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/lfd.c powerpc.git/arch/powerpc/math-emu/lfd.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/lfd.c       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/lfd.c    2008-04-19 16:40:52.000000000 +0200
-@@ -11,7 +11,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/lfd.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/lfd.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/lfd.c
+@@ -11,7 +11,7 @@ lfd(void *frD, void *ea)

        if (copy_from_user(frD, ea, sizeof(double)))
                return -EFAULT;
  #ifdef DEBUG
        if (copy_from_user(frD, ea, sizeof(double)))
                return -EFAULT;
  #ifdef DEBUG


@@ -90394,10 +90616,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/lfd.c powerpc.git/arch/
        dump_double(frD);
        printk("\n");
  #endif
        dump_double(frD);
        printk("\n");
  #endif

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/lfs.c powerpc.git/arch/powerpc/math-emu/lfs.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/lfs.c       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/lfs.c    2008-04-19 16:40:52.000000000 +0200
-@@ -14,7 +14,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/lfs.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/lfs.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/lfs.c
+@@ -14,7 +14,7 @@ lfs(void *frD, void *ea)

        float f;
  
  #ifdef DEBUG
        float f;
  
  #ifdef DEBUG


@@ -90406,10 +90629,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/lfs.c powerpc.git/arch/
  #endif
  
        if (copy_from_user(&f, ea, sizeof(float)))
  #endif
  
        if (copy_from_user(&f, ea, sizeof(float)))

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/mcrfs.c powerpc.git/arch/powerpc/math-emu/mcrfs.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/mcrfs.c     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/mcrfs.c  2008-04-19 16:40:52.000000000 +0200
-@@ -10,7 +10,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/mcrfs.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/mcrfs.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/mcrfs.c
+@@ -10,7 +10,7 @@ mcrfs(u32 *ccr, u32 crfD, u32 crfS)

        u32 value, clear;
  
  #ifdef DEBUG
        u32 value, clear;
  
  #ifdef DEBUG


@@ -90418,7 +90642,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/mcrfs.c powerpc.git/arc
  #endif
  
        clear = 15 << ((7 - crfS) << 2);
  #endif
  
        clear = 15 << ((7 - crfS) << 2);

-@@ -24,7 +24,7 @@
+@@ -24,7 +24,7 @@ mcrfs(u32 *ccr, u32 crfD, u32 crfS)

        *ccr |= (value << ((7 - crfD) << 2));
  
  #ifdef DEBUG
        *ccr |= (value << ((7 - crfD) << 2));
  
  #ifdef DEBUG


@@ -90427,10 +90651,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/mcrfs.c powerpc.git/arc
  #endif
  
        return 0;
  #endif
  
        return 0;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/mffs.c powerpc.git/arch/powerpc/math-emu/mffs.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/mffs.c      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/mffs.c   2008-04-19 16:40:52.000000000 +0200
-@@ -10,7 +10,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/mffs.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/mffs.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/mffs.c
+@@ -10,7 +10,7 @@ mffs(u32 *frD)

        frD[1] = __FPU_FPSCR;
  
  #ifdef DEBUG
        frD[1] = __FPU_FPSCR;
  
  #ifdef DEBUG


@@ -90439,10 +90664,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/mffs.c powerpc.git/arch
  #endif
  
        return 0;
  #endif
  
        return 0;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/mtfsb0.c powerpc.git/arch/powerpc/math-emu/mtfsb0.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/mtfsb0.c    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/mtfsb0.c 2008-04-19 16:40:52.000000000 +0200
-@@ -11,7 +11,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/mtfsb0.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/mtfsb0.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/mtfsb0.c
+@@ -11,7 +11,7 @@ mtfsb0(int crbD)

                __FPU_FPSCR &= ~(1 << (31 - crbD));
  
  #ifdef DEBUG
                __FPU_FPSCR &= ~(1 << (31 - crbD));
  
  #ifdef DEBUG


@@ -90451,10 +90677,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/mtfsb0.c powerpc.git/ar
  #endif
  
        return 0;
  #endif
  
        return 0;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/mtfsb1.c powerpc.git/arch/powerpc/math-emu/mtfsb1.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/mtfsb1.c    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/mtfsb1.c 2008-04-19 16:40:52.000000000 +0200
-@@ -11,7 +11,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/mtfsb1.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/mtfsb1.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/mtfsb1.c
+@@ -11,7 +11,7 @@ mtfsb1(int crbD)

                __FPU_FPSCR |= (1 << (31 - crbD));
  
  #ifdef DEBUG
                __FPU_FPSCR |= (1 << (31 - crbD));
  
  #ifdef DEBUG


@@ -90463,10 +90690,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/mtfsb1.c powerpc.git/ar
  #endif
  
        return 0;
  #endif
  
        return 0;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/mtfsf.c powerpc.git/arch/powerpc/math-emu/mtfsf.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/mtfsf.c     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/mtfsf.c  2008-04-19 16:40:52.000000000 +0200
-@@ -38,7 +38,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/mtfsf.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/mtfsf.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/mtfsf.c
+@@ -38,7 +38,7 @@ mtfsf(unsigned int FM, u32 *frB)

        __FPU_FPSCR |= (frB[1] & mask);
  
  #ifdef DEBUG
        __FPU_FPSCR |= (frB[1] & mask);
  
  #ifdef DEBUG


@@ -90475,10 +90703,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/mtfsf.c powerpc.git/arc
  #endif
  
        return 0;
  #endif
  
        return 0;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/mtfsfi.c powerpc.git/arch/powerpc/math-emu/mtfsfi.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/mtfsfi.c    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/mtfsfi.c 2008-04-19 16:40:52.000000000 +0200
-@@ -16,7 +16,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/mtfsfi.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/mtfsfi.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/mtfsfi.c
+@@ -16,7 +16,7 @@ mtfsfi(unsigned int crfD, unsigned int I

        __FPU_FPSCR |= (IMM & 0xf) << ((7 - crfD) << 2);
  
  #ifdef DEBUG
        __FPU_FPSCR |= (IMM & 0xf) << ((7 - crfD) << 2);
  
  #ifdef DEBUG


@@ -90487,10 +90716,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/mtfsfi.c powerpc.git/ar
  #endif
  
        return 0;
  #endif
  
        return 0;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/stfd.c powerpc.git/arch/powerpc/math-emu/stfd.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/stfd.c      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/stfd.c   2008-04-19 16:40:52.000000000 +0200
-@@ -7,7 +7,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/stfd.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/stfd.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/stfd.c
+@@ -7,7 +7,7 @@ stfd(void *frS, void *ea)

  {
  #if 0
  #ifdef DEBUG
  {
  #if 0
  #ifdef DEBUG


@@ -90499,10 +90729,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/stfd.c powerpc.git/arch
        dump_double(frS);
        printk("\n");
  #endif
        dump_double(frS);
        printk("\n");
  #endif

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/stfiwx.c powerpc.git/arch/powerpc/math-emu/stfiwx.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/stfiwx.c    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/stfiwx.c 2008-04-19 16:40:52.000000000 +0200
-@@ -6,7 +6,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/stfiwx.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/stfiwx.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/stfiwx.c
+@@ -6,7 +6,7 @@ int

  stfiwx(u32 *frS, void *ea)
  {
  #ifdef DEBUG
  stfiwx(u32 *frS, void *ea)
  {
  #ifdef DEBUG


@@ -90511,10 +90742,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/stfiwx.c powerpc.git/ar
  #endif
  
        if (copy_to_user(ea, &frS[1], sizeof(frS[1])))
  #endif
  
        if (copy_to_user(ea, &frS[1], sizeof(frS[1])))

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/stfs.c powerpc.git/arch/powerpc/math-emu/stfs.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/stfs.c      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/stfs.c   2008-04-19 16:40:52.000000000 +0200
-@@ -15,7 +15,7 @@
+Index: linux-2.6.25.1/arch/powerpc/math-emu/stfs.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/math-emu/stfs.c
++++ linux-2.6.25.1/arch/powerpc/math-emu/stfs.c
+@@ -15,7 +15,7 @@ stfs(void *frS, void *ea)

        int err;
  
  #ifdef DEBUG
        int err;
  
  #ifdef DEBUG


@@ -90523,10 +90755,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/stfs.c powerpc.git/arch
  #endif
  
        __FP_UNPACK_D(A, frS);
  #endif
  
        __FP_UNPACK_D(A, frS);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/40x_mmu.c powerpc.git/arch/powerpc/mm/40x_mmu.c
---- linux-2.6.25-rc9/arch/powerpc/mm/40x_mmu.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/mm/40x_mmu.c      2008-04-19 16:40:52.000000000 +0200
-@@ -97,7 +97,7 @@
+Index: linux-2.6.25.1/arch/powerpc/mm/40x_mmu.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/mm/40x_mmu.c
++++ linux-2.6.25.1/arch/powerpc/mm/40x_mmu.c
+@@ -97,7 +97,7 @@ unsigned long __init mmu_mapin_ram(void)

        phys_addr_t p;
  
        v = KERNELBASE;
        phys_addr_t p;
  
        v = KERNELBASE;


@@ -90535,10 +90768,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/40x_mmu.c powerpc.git/arch/po
        s = total_lowmem;
  
        if (__map_without_ltlbs)
        s = total_lowmem;
  
        if (__map_without_ltlbs)

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/44x_mmu.c powerpc.git/arch/powerpc/mm/44x_mmu.c
---- linux-2.6.25-rc9/arch/powerpc/mm/44x_mmu.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/mm/44x_mmu.c      2008-04-19 16:40:52.000000000 +0200
-@@ -67,7 +67,7 @@
+Index: linux-2.6.25.1/arch/powerpc/mm/44x_mmu.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/mm/44x_mmu.c
++++ linux-2.6.25.1/arch/powerpc/mm/44x_mmu.c
+@@ -67,7 +67,7 @@ unsigned long __init mmu_mapin_ram(void)

  
        /* Pin in enough TLBs to cover any lowmem not covered by the
         * initial 256M mapping established in head_44x.S */
  
        /* Pin in enough TLBs to cover any lowmem not covered by the
         * initial 256M mapping established in head_44x.S */


@@ -90547,10 +90781,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/44x_mmu.c powerpc.git/arch/po
             addr += PPC_PIN_SIZE)
                ppc44x_pin_tlb(addr + PAGE_OFFSET, addr);
  
             addr += PPC_PIN_SIZE)
                ppc44x_pin_tlb(addr + PAGE_OFFSET, addr);
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/Makefile powerpc.git/arch/powerpc/mm/Makefile
---- linux-2.6.25-rc9/arch/powerpc/mm/Makefile  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/mm/Makefile       2008-03-17 14:03:31.000000000 +0100
-@@ -6,7 +6,7 @@
+Index: linux-2.6.25.1/arch/powerpc/mm/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/mm/Makefile
++++ linux-2.6.25.1/arch/powerpc/mm/Makefile
+@@ -6,7 +6,7 @@ ifeq ($(CONFIG_PPC64),y)

  EXTRA_CFLAGS  += -mno-minimal-toc
  endif
  
  EXTRA_CFLAGS  += -mno-minimal-toc
  endif
  


@@ -90559,9 +90794,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/Makefile powerpc.git/arch/pow
                                   init_$(CONFIG_WORD_SIZE).o \
                                   pgtable_$(CONFIG_WORD_SIZE).o \
                                   mmu_context_$(CONFIG_WORD_SIZE).o
                                   init_$(CONFIG_WORD_SIZE).o \
                                   pgtable_$(CONFIG_WORD_SIZE).o \
                                   mmu_context_$(CONFIG_WORD_SIZE).o

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/fsl_booke_mmu.c powerpc.git/arch/powerpc/mm/fsl_booke_mmu.c
---- linux-2.6.25-rc9/arch/powerpc/mm/fsl_booke_mmu.c   2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/mm/fsl_booke_mmu.c        2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/mm/fsl_booke_mmu.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/mm/fsl_booke_mmu.c
++++ linux-2.6.25.1/arch/powerpc/mm/fsl_booke_mmu.c

 @@ -49,18 +49,15 @@
  #include <asm/mmu.h>
  #include <asm/uaccess.h>
 @@ -49,18 +49,15 @@
  #include <asm/mmu.h>
  #include <asm/uaccess.h>


@@ -90583,7 +90819,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/fsl_booke_mmu.c powerpc.git/a
  
  #define NUM_TLBCAMS   (16)
  
  
  #define NUM_TLBCAMS   (16)
  

-@@ -165,15 +162,15 @@
+@@ -165,15 +162,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)
  {


@@ -90602,7 +90838,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/fsl_booke_mmu.c powerpc.git/a
        }
  }
  
        }
  }
  

-@@ -196,35 +193,32 @@
+@@ -196,35 +193,32 @@ unsigned long __init mmu_mapin_ram(void)

  void __init
  adjust_total_lowmem(void)
  {
  void __init
  adjust_total_lowmem(void)
  {


@@ -90654,7 +90890,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/fsl_booke_mmu.c powerpc.git/a
                ram -= __cam2;
        }
  
                ram -= __cam2;
        }
  

-@@ -232,6 +226,6 @@
+@@ -232,6 +226,6 @@ adjust_total_lowmem(void)

                        " CAM2=%ldMb residual: %ldMb\n",
                        __cam0 >> 20, __cam1 >> 20, __cam2 >> 20,
                        (total_lowmem - __cam0 - __cam1 - __cam2) >> 20);
                        " CAM2=%ldMb residual: %ldMb\n",
                        __cam0 >> 20, __cam1 >> 20, __cam2 >> 20,
                        (total_lowmem - __cam0 - __cam1 - __cam2) >> 20);


@@ -90663,9 +90899,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/fsl_booke_mmu.c powerpc.git/a
 +      __max_low_memory = __cam0 + __cam1 + __cam2;
 +      __initial_memory_limit_addr = memstart_addr + __max_low_memory;
  }
 +      __max_low_memory = __cam0 + __cam1 + __cam2;
 +      __initial_memory_limit_addr = memstart_addr + __max_low_memory;
  }

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/hash_utils_64.c powerpc.git/arch/powerpc/mm/hash_utils_64.c
---- linux-2.6.25-rc9/arch/powerpc/mm/hash_utils_64.c   2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/mm/hash_utils_64.c        2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/mm/hash_utils_64.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/mm/hash_utils_64.c
++++ linux-2.6.25.1/arch/powerpc/mm/hash_utils_64.c

 @@ -31,6 +31,7 @@
  #include <linux/cache.h>
  #include <linux/init.h>
 @@ -31,6 +31,7 @@
  #include <linux/cache.h>
  #include <linux/init.h>


@@ -90683,7 +90920,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/hash_utils_64.c powerpc.git/a
  #include <asm/abs_addr.h>
  #include <asm/tlbflush.h>
  #include <asm/io.h>
  #include <asm/abs_addr.h>
  #include <asm/tlbflush.h>
  #include <asm/io.h>

-@@ -191,6 +192,29 @@
+@@ -191,6 +192,29 @@ int htab_bolt_mapping(unsigned long vsta

        return ret < 0 ? ret : 0;
  }
  
        return ret < 0 ? ret : 0;
  }
  


@@ -90713,7 +90950,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/hash_utils_64.c powerpc.git/a
  static int __init htab_dt_scan_seg_sizes(unsigned long node,
                                         const char *uname, int depth,
                                         void *data)
  static int __init htab_dt_scan_seg_sizes(unsigned long node,
                                         const char *uname, int depth,
                                         void *data)

-@@ -434,6 +458,12 @@
+@@ -434,6 +458,12 @@ void create_section_mapping(unsigned lon

                        _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_COHERENT | PP_RWXX,
                        mmu_linear_psize, mmu_kernel_ssize));
  }
                        _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_COHERENT | PP_RWXX,
                        mmu_linear_psize, mmu_kernel_ssize));
  }


@@ -90726,9 +90963,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/hash_utils_64.c powerpc.git/a
  #endif /* CONFIG_MEMORY_HOTPLUG */
  
  static inline void make_bl(unsigned int *insn_addr, void *func)
  #endif /* CONFIG_MEMORY_HOTPLUG */
  
  static inline void make_bl(unsigned int *insn_addr, void *func)

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/init_32.c powerpc.git/arch/powerpc/mm/init_32.c
---- linux-2.6.25-rc9/arch/powerpc/mm/init_32.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/mm/init_32.c      2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/mm/init_32.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/mm/init_32.c
++++ linux-2.6.25.1/arch/powerpc/mm/init_32.c

 @@ -30,6 +30,7 @@
  #include <linux/highmem.h>
  #include <linux/initrd.h>
 @@ -30,6 +30,7 @@
  #include <linux/highmem.h>
  #include <linux/initrd.h>


@@ -90745,7 +90983,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/init_32.c powerpc.git/arch/po
  #include <asm/sections.h>
  
  #include "mmu_decl.h"
  #include <asm/sections.h>
  
  #include "mmu_decl.h"

-@@ -59,8 +59,8 @@
+@@ -59,8 +59,8 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_ga

  unsigned long total_memory;
  unsigned long total_lowmem;
  
  unsigned long total_memory;
  unsigned long total_lowmem;
  


@@ -90756,7 +90994,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/init_32.c powerpc.git/arch/po
  
  int boot_mapsize;
  #ifdef CONFIG_PPC_PMAC
  
  int boot_mapsize;
  #ifdef CONFIG_PPC_PMAC

-@@ -95,10 +95,10 @@
+@@ -95,10 +95,10 @@ int __map_without_ltlbs;

  unsigned long __max_low_memory = MAX_LOW_MEM;
  
  /*
  unsigned long __max_low_memory = MAX_LOW_MEM;
  
  /*


@@ -90769,7 +91007,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/init_32.c powerpc.git/arch/po
  
  /*
   * Check for command-line options that affect what MMU_init will do.
  
  /*
   * Check for command-line options that affect what MMU_init will do.

-@@ -131,10 +131,10 @@
+@@ -131,10 +131,10 @@ void __init MMU_init(void)

  
        /* 601 can only access 16MB at the moment */
        if (PVR_VER(mfspr(SPRN_PVR)) == 1)
  
        /* 601 can only access 16MB at the moment */
        if (PVR_VER(mfspr(SPRN_PVR)) == 1)


@@ -90782,7 +91020,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/init_32.c powerpc.git/arch/po
  
        /* parse args from command line */
        MMU_setup();
  
        /* parse args from command line */
        MMU_setup();

-@@ -145,8 +145,8 @@
+@@ -145,8 +145,8 @@ void __init MMU_init(void)

                printk(KERN_WARNING "Only using first contiguous memory region");
        }
  
                printk(KERN_WARNING "Only using first contiguous memory region");
        }
  


@@ -90793,7 +91031,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/init_32.c powerpc.git/arch/po
  
  #ifdef CONFIG_FSL_BOOKE
        /* Freescale Book-E parts expect lowmem to be mapped by fixed TLB
  
  #ifdef CONFIG_FSL_BOOKE
        /* Freescale Book-E parts expect lowmem to be mapped by fixed TLB

-@@ -157,9 +157,10 @@
+@@ -157,9 +157,10 @@ void __init MMU_init(void)

  
        if (total_lowmem > __max_low_memory) {
                total_lowmem = __max_low_memory;
  
        if (total_lowmem > __max_low_memory) {
                total_lowmem = __max_low_memory;


@@ -90805,7 +91043,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/init_32.c powerpc.git/arch/po
                lmb_analyze();
  #endif /* CONFIG_HIGHMEM */
        }
                lmb_analyze();
  #endif /* CONFIG_HIGHMEM */
        }

-@@ -184,8 +185,6 @@
+@@ -184,8 +185,6 @@ void __init MMU_init(void)

        /* Map in I/O resources */
        if (ppc_md.progress)
                ppc_md.progress("MMU:setio", 0x302);
        /* Map in I/O resources */
        if (ppc_md.progress)
                ppc_md.progress("MMU:setio", 0x302);


@@ -90814,7 +91052,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/init_32.c powerpc.git/arch/po
  
        /* Initialize the context management stuff */
        mmu_context_init();
  
        /* Initialize the context management stuff */
        mmu_context_init();

-@@ -208,7 +207,7 @@
+@@ -208,7 +207,7 @@ void __init *early_get_page(void)

                p = alloc_bootmem_pages(PAGE_SIZE);
        } else {
                p = __va(lmb_alloc_base(PAGE_SIZE, PAGE_SIZE,
                p = alloc_bootmem_pages(PAGE_SIZE);
        } else {
                p = __va(lmb_alloc_base(PAGE_SIZE, PAGE_SIZE,


@@ -90823,7 +91061,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/init_32.c powerpc.git/arch/po
        }
        return p;
  }
        }
        return p;
  }

-@@ -276,7 +275,7 @@
+@@ -276,7 +275,7 @@ static int __init setup_kcore(void)

  
                kcore_mem = kmalloc(sizeof(struct kcore_list), GFP_ATOMIC);
                if (!kcore_mem)
  
                kcore_mem = kmalloc(sizeof(struct kcore_list), GFP_ATOMIC);
                if (!kcore_mem)


@@ -90832,9 +91070,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/init_32.c powerpc.git/arch/po
  
                /* must stay under 32 bits */
                if ( 0xfffffffful - (unsigned long)__va(base) < size) {
  
                /* must stay under 32 bits */
                if ( 0xfffffffful - (unsigned long)__va(base) < size) {

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/init_64.c powerpc.git/arch/powerpc/mm/init_64.c
---- linux-2.6.25-rc9/arch/powerpc/mm/init_64.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/mm/init_64.c      2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/mm/init_64.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/mm/init_64.c
++++ linux-2.6.25.1/arch/powerpc/mm/init_64.c

 @@ -38,11 +38,11 @@
  #include <linux/nodemask.h>
  #include <linux/module.h>
 @@ -38,11 +38,11 @@
  #include <linux/nodemask.h>
  #include <linux/module.h>


@@ -90858,7 +91097,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/init_64.c powerpc.git/arch/po
  
  void free_initmem(void)
  {
  
  void free_initmem(void)
  {

-@@ -122,7 +121,7 @@
+@@ -122,7 +121,7 @@ static int __init setup_kcore(void)

                /* GFP_ATOMIC to avoid might_sleep warnings during boot */
                kcore_mem = kmalloc(sizeof(struct kcore_list), GFP_ATOMIC);
                if (!kcore_mem)
                /* GFP_ATOMIC to avoid might_sleep warnings during boot */
                kcore_mem = kmalloc(sizeof(struct kcore_list), GFP_ATOMIC);
                if (!kcore_mem)


@@ -90867,9 +91106,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/init_64.c powerpc.git/arch/po
  
                kclist_add(kcore_mem, __va(base), size);
        }
  
                kclist_add(kcore_mem, __va(base), size);
        }

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/lmb.c powerpc.git/arch/powerpc/mm/lmb.c
---- linux-2.6.25-rc9/arch/powerpc/mm/lmb.c     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/mm/lmb.c  1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/mm/lmb.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/mm/lmb.c
++++ /dev/null

 @@ -1,357 +0,0 @@
 -/*
 - * Procedures for maintaining information about logical memory blocks.
 @@ -1,357 +0,0 @@
 -/*
 - * Procedures for maintaining information about logical memory blocks.


@@ -91228,9 +91468,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/lmb.c powerpc.git/arch/powerp
 -      }
 -      return 0;
 -}
 -      }
 -      return 0;
 -}

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/mem.c powerpc.git/arch/powerpc/mm/mem.c
---- linux-2.6.25-rc9/arch/powerpc/mm/mem.c     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/mm/mem.c  2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/mm/mem.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/mm/mem.c
++++ linux-2.6.25.1/arch/powerpc/mm/mem.c

 @@ -31,6 +31,7 @@
  #include <linux/initrd.h>
  #include <linux/pagemap.h>
 @@ -31,6 +31,7 @@
  #include <linux/initrd.h>
  #include <linux/pagemap.h>


@@ -91247,7 +91488,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/mem.c powerpc.git/arch/powerp
  #include <asm/sections.h>
  #include <asm/vdso.h>
  
  #include <asm/sections.h>
  #include <asm/vdso.h>
  

-@@ -111,7 +111,7 @@
+@@ -111,7 +111,7 @@ int memory_add_physaddr_to_nid(u64 start

  }
  #endif
  
  }
  #endif
  


@@ -91256,7 +91497,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/mem.c powerpc.git/arch/powerp
  {
        struct pglist_data *pgdata;
        struct zone *zone;
  {
        struct pglist_data *pgdata;
        struct zone *zone;

-@@ -175,7 +175,6 @@
+@@ -175,7 +175,6 @@ void show_mem(void)

  
        printk("Mem-info:\n");
        show_free_areas();
  
        printk("Mem-info:\n");
        show_free_areas();


@@ -91264,7 +91505,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/mem.c powerpc.git/arch/powerp
        for_each_online_pgdat(pgdat) {
                unsigned long flags;
                pgdat_resize_lock(pgdat, &flags);
        for_each_online_pgdat(pgdat) {
                unsigned long flags;
                pgdat_resize_lock(pgdat, &flags);

-@@ -217,9 +216,11 @@
+@@ -217,9 +216,11 @@ void __init do_init_bootmem(void)

        unsigned long total_pages;
        int boot_mapsize;
  
        unsigned long total_pages;
        int boot_mapsize;
  


@@ -91277,7 +91518,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/mem.c powerpc.git/arch/powerp
  #endif
  
        /*
  #endif
  
        /*

-@@ -245,18 +246,18 @@
+@@ -245,18 +246,18 @@ void __init do_init_bootmem(void)

         * present.
         */
  #ifdef CONFIG_HIGHMEM
         * present.
         */
  #ifdef CONFIG_HIGHMEM


@@ -91300,7 +91541,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/mem.c powerpc.git/arch/powerp
                                      lmb.reserved.region[i].base;
                        reserve_bootmem(lmb.reserved.region[i].base,
                                        adjusted_size, BOOTMEM_DEFAULT);
                                      lmb.reserved.region[i].base;
                        reserve_bootmem(lmb.reserved.region[i].base,
                                        adjusted_size, BOOTMEM_DEFAULT);

-@@ -326,7 +327,7 @@
+@@ -326,7 +327,7 @@ void __init paging_init(void)

               (top_of_ram - total_ram) >> 20);
        memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
  #ifdef CONFIG_HIGHMEM
               (top_of_ram - total_ram) >> 20);
        memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
  #ifdef CONFIG_HIGHMEM


@@ -91309,7 +91550,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/mem.c powerpc.git/arch/powerp
        max_zone_pfns[ZONE_HIGHMEM] = top_of_ram >> PAGE_SHIFT;
  #else
        max_zone_pfns[ZONE_DMA] = top_of_ram >> PAGE_SHIFT;
        max_zone_pfns[ZONE_HIGHMEM] = top_of_ram >> PAGE_SHIFT;
  #else
        max_zone_pfns[ZONE_DMA] = top_of_ram >> PAGE_SHIFT;

-@@ -381,7 +382,7 @@
+@@ -381,7 +382,7 @@ void __init mem_init(void)

        {
                unsigned long pfn, highmem_mapnr;
  
        {
                unsigned long pfn, highmem_mapnr;
  


@@ -91318,10 +91559,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/mem.c powerpc.git/arch/powerp
                for (pfn = highmem_mapnr; pfn < max_mapnr; ++pfn) {
                        struct page *page = pfn_to_page(pfn);
                        if (lmb_is_reserved(pfn << PAGE_SHIFT))
                for (pfn = highmem_mapnr; pfn < max_mapnr; ++pfn) {
                        struct page *page = pfn_to_page(pfn);
                        if (lmb_is_reserved(pfn << PAGE_SHIFT))

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/mmu_decl.h powerpc.git/arch/powerpc/mm/mmu_decl.h
---- linux-2.6.25-rc9/arch/powerpc/mm/mmu_decl.h        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/mm/mmu_decl.h     2008-04-19 16:40:52.000000000 +0200
-@@ -48,9 +48,11 @@
+Index: linux-2.6.25.1/arch/powerpc/mm/mmu_decl.h
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/mm/mmu_decl.h
++++ linux-2.6.25.1/arch/powerpc/mm/mmu_decl.h
+@@ -48,9 +48,11 @@ extern unsigned int num_tlbcam_entries;

  
  extern unsigned long ioremap_bot;
  extern unsigned long __max_low_memory;
  
  extern unsigned long ioremap_bot;
  extern unsigned long __max_low_memory;


@@ -91334,9 +91576,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/mmu_decl.h powerpc.git/arch/p
  
  /* ...and now those things that may be slightly different between processor
   * architectures.  -- Dan
  
  /* ...and now those things that may be slightly different between processor
   * architectures.  -- Dan

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/numa.c powerpc.git/arch/powerpc/mm/numa.c
---- linux-2.6.25-rc9/arch/powerpc/mm/numa.c    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/mm/numa.c 2008-03-17 14:03:31.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/mm/numa.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/mm/numa.c
++++ linux-2.6.25.1/arch/powerpc/mm/numa.c

 @@ -17,8 +17,9 @@
  #include <linux/nodemask.h>
  #include <linux/cpu.h>
 @@ -17,8 +17,9 @@
  #include <linux/nodemask.h>
  #include <linux/cpu.h>


@@ -91348,10 +91591,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/numa.c powerpc.git/arch/power
  #include <asm/system.h>
  #include <asm/smp.h>
  
  #include <asm/system.h>
  #include <asm/smp.h>
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/pgtable_32.c powerpc.git/arch/powerpc/mm/pgtable_32.c
---- linux-2.6.25-rc9/arch/powerpc/mm/pgtable_32.c      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/mm/pgtable_32.c   2008-04-19 16:40:52.000000000 +0200
-@@ -281,12 +281,13 @@
+Index: linux-2.6.25.1/arch/powerpc/mm/pgtable_32.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/mm/pgtable_32.c
++++ linux-2.6.25.1/arch/powerpc/mm/pgtable_32.c
+@@ -281,12 +281,13 @@ int map_page(unsigned long va, phys_addr

   */
  void __init mapin_ram(void)
  {
   */
  void __init mapin_ram(void)
  {


@@ -91367,9 +91611,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/pgtable_32.c powerpc.git/arch
        for (; s < total_lowmem; s += PAGE_SIZE) {
                ktext = ((char *) v >= _stext && (char *) v < etext);
                f = ktext ?_PAGE_RAM_TEXT : _PAGE_RAM;
        for (; s < total_lowmem; s += PAGE_SIZE) {
                ktext = ((char *) v >= _stext && (char *) v < etext);
                f = ktext ?_PAGE_RAM_TEXT : _PAGE_RAM;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/ppc_mmu_32.c powerpc.git/arch/powerpc/mm/ppc_mmu_32.c
---- linux-2.6.25-rc9/arch/powerpc/mm/ppc_mmu_32.c      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/mm/ppc_mmu_32.c   2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/mm/ppc_mmu_32.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/mm/ppc_mmu_32.c
++++ linux-2.6.25.1/arch/powerpc/mm/ppc_mmu_32.c

 @@ -26,11 +26,11 @@
  #include <linux/mm.h>
  #include <linux/init.h>
 @@ -26,11 +26,11 @@
  #include <linux/mm.h>
  #include <linux/init.h>


@@ -91383,7 +91628,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/ppc_mmu_32.c powerpc.git/arch
  
  #include "mmu_decl.h"
  
  
  #include "mmu_decl.h"
  

-@@ -82,7 +82,6 @@
+@@ -82,7 +82,6 @@ unsigned long __init mmu_mapin_ram(void)

  #else
        unsigned long tot, bl, done;
        unsigned long max_size = (256<<20);
  #else
        unsigned long tot, bl, done;
        unsigned long max_size = (256<<20);


@@ -91391,7 +91636,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/ppc_mmu_32.c powerpc.git/arch
  
        if (__map_without_bats) {
                printk(KERN_DEBUG "RAM mapped without BATs\n");
  
        if (__map_without_bats) {
                printk(KERN_DEBUG "RAM mapped without BATs\n");

-@@ -93,19 +92,13 @@
+@@ -93,19 +92,13 @@ unsigned long __init mmu_mapin_ram(void)

  
        /* Make sure we don't map a block larger than the
           smallest alignment of the physical address. */
  
        /* Make sure we don't map a block larger than the
           smallest alignment of the physical address. */


@@ -91412,7 +91657,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/ppc_mmu_32.c powerpc.git/arch
        done = (unsigned long)bat_addrs[2].limit - KERNELBASE + 1;
        if ((done < tot) && !bat_addrs[3].limit) {
                /* use BAT3 to cover a bit more */
        done = (unsigned long)bat_addrs[2].limit - KERNELBASE + 1;
        if ((done < tot) && !bat_addrs[3].limit) {
                /* use BAT3 to cover a bit more */

-@@ -113,7 +106,7 @@
+@@ -113,7 +106,7 @@ unsigned long __init mmu_mapin_ram(void)

                for (bl = 128<<10; bl < max_size; bl <<= 1)
                        if (bl * 2 > tot)
                                break;
                for (bl = 128<<10; bl < max_size; bl <<= 1)
                        if (bl * 2 > tot)
                                break;


@@ -91421,7 +91666,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/ppc_mmu_32.c powerpc.git/arch
                done = (unsigned long)bat_addrs[3].limit - KERNELBASE + 1;
        }
  
                done = (unsigned long)bat_addrs[3].limit - KERNELBASE + 1;
        }
  

-@@ -240,7 +233,7 @@
+@@ -240,7 +233,7 @@ void __init MMU_init_hw(void)

         */
        if ( ppc_md.progress ) ppc_md.progress("hash:find piece", 0x322);
        Hash = __va(lmb_alloc_base(Hash_size, Hash_size,
         */
        if ( ppc_md.progress ) ppc_md.progress("hash:find piece", 0x322);
        Hash = __va(lmb_alloc_base(Hash_size, Hash_size,


@@ -91430,9 +91675,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/ppc_mmu_32.c powerpc.git/arch
        cacheable_memzero(Hash, Hash_size);
        _SDR1 = __pa(Hash) | SDR1_LOW_BITS;
  
        cacheable_memzero(Hash, Hash_size);
        _SDR1 = __pa(Hash) | SDR1_LOW_BITS;
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/stab.c powerpc.git/arch/powerpc/mm/stab.c
---- linux-2.6.25-rc9/arch/powerpc/mm/stab.c    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/mm/stab.c 2008-03-17 14:03:31.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/mm/stab.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/mm/stab.c
++++ linux-2.6.25.1/arch/powerpc/mm/stab.c

 @@ -12,12 +12,14 @@
   *      2 of the License, or (at your option) any later version.
   */
 @@ -12,12 +12,14 @@
   *      2 of the License, or (at your option) any later version.
   */


@@ -91449,10 +91695,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/stab.c powerpc.git/arch/power
  #include <asm/abs_addr.h>
  #include <asm/firmware.h>
  #include <asm/iseries/hv_call.h>
  #include <asm/abs_addr.h>
  #include <asm/firmware.h>
  #include <asm/iseries/hv_call.h>

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/oprofile/cell/spu_task_sync.c powerpc.git/arch/powerpc/oprofile/cell/spu_task_sync.c
---- linux-2.6.25-rc9/arch/powerpc/oprofile/cell/spu_task_sync.c        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/oprofile/cell/spu_task_sync.c     2008-04-19 16:40:52.000000000 +0200
-@@ -68,7 +68,7 @@
+Index: linux-2.6.25.1/arch/powerpc/oprofile/cell/spu_task_sync.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/oprofile/cell/spu_task_sync.c
++++ linux-2.6.25.1/arch/powerpc/oprofile/cell/spu_task_sync.c
+@@ -68,7 +68,7 @@ static struct cached_info *get_cached_in

        if (spu_num >= num_spu_nodes) {
                printk(KERN_ERR "SPU_PROF: "
                       "%s, line %d: Invalid index %d into spu info cache\n",
        if (spu_num >= num_spu_nodes) {
                printk(KERN_ERR "SPU_PROF: "
                       "%s, line %d: Invalid index %d into spu info cache\n",


@@ -91461,7 +91708,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/oprofile/cell/spu_task_sync.c po
                ret_info = NULL;
                goto out;
        }
                ret_info = NULL;
                goto out;
        }

-@@ -115,7 +115,7 @@
+@@ -115,7 +115,7 @@ prepare_cached_spu_info(struct spu *spu,

        if (!info) {
                printk(KERN_ERR "SPU_PROF: "
                       "%s, line %d: create vma_map failed\n",
        if (!info) {
                printk(KERN_ERR "SPU_PROF: "
                       "%s, line %d: create vma_map failed\n",


@@ -91470,7 +91717,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/oprofile/cell/spu_task_sync.c po
                retval = -ENOMEM;
                goto err_alloc;
        }
                retval = -ENOMEM;
                goto err_alloc;
        }

-@@ -123,7 +123,7 @@
+@@ -123,7 +123,7 @@ prepare_cached_spu_info(struct spu *spu,

        if (!new_map) {
                printk(KERN_ERR "SPU_PROF: "
                       "%s, line %d: create vma_map failed\n",
        if (!new_map) {
                printk(KERN_ERR "SPU_PROF: "
                       "%s, line %d: create vma_map failed\n",


@@ -91479,7 +91726,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/oprofile/cell/spu_task_sync.c po
                retval = -ENOMEM;
                goto err_alloc;
        }
                retval = -ENOMEM;
                goto err_alloc;
        }

-@@ -171,7 +171,7 @@
+@@ -171,7 +171,7 @@ static int release_cached_info(int spu_i

                        printk(KERN_ERR "SPU_PROF: "
                                "%s, line %d: "
                                "Invalid index %d into spu info cache\n",
                        printk(KERN_ERR "SPU_PROF: "
                                "%s, line %d: "
                                "Invalid index %d into spu info cache\n",


@@ -91488,7 +91735,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/oprofile/cell/spu_task_sync.c po
                        goto out;
                }
                end = spu_index + 1;
                        goto out;
                }
                end = spu_index + 1;

-@@ -273,7 +273,7 @@
+@@ -273,7 +273,7 @@ fail_no_image_cookie:

  
        printk(KERN_ERR "SPU_PROF: "
                "%s, line %d: Cannot find dcookie for SPU binary\n",
  
        printk(KERN_ERR "SPU_PROF: "
                "%s, line %d: Cannot find dcookie for SPU binary\n",


@@ -91497,7 +91744,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/oprofile/cell/spu_task_sync.c po
        goto out;
  }
  
        goto out;
  }
  

-@@ -467,7 +467,7 @@
+@@ -467,7 +467,7 @@ int spu_sync_stop(void)

        if (ret) {
                printk(KERN_ERR "SPU_PROF: "
                        "%s, line %d: spu_switch_event_unregister returned %d\n",
        if (ret) {
                printk(KERN_ERR "SPU_PROF: "
                        "%s, line %d: spu_switch_event_unregister returned %d\n",


@@ -91506,10 +91753,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/oprofile/cell/spu_task_sync.c po
                goto out;
        }
  
                goto out;
        }
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/oprofile/cell/vma_map.c powerpc.git/arch/powerpc/oprofile/cell/vma_map.c
---- linux-2.6.25-rc9/arch/powerpc/oprofile/cell/vma_map.c      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/oprofile/cell/vma_map.c   2008-04-19 16:40:52.000000000 +0200
-@@ -72,7 +72,7 @@
+Index: linux-2.6.25.1/arch/powerpc/oprofile/cell/vma_map.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/oprofile/cell/vma_map.c
++++ linux-2.6.25.1/arch/powerpc/oprofile/cell/vma_map.c
+@@ -72,7 +72,7 @@ vma_map_add(struct vma_to_fileoffset_map

                kzalloc(sizeof(struct vma_to_fileoffset_map), GFP_KERNEL);
        if (!new) {
                printk(KERN_ERR "SPU_PROF: %s, line %d: malloc failed\n",
                kzalloc(sizeof(struct vma_to_fileoffset_map), GFP_KERNEL);
        if (!new) {
                printk(KERN_ERR "SPU_PROF: %s, line %d: malloc failed\n",


@@ -91518,7 +91766,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/oprofile/cell/vma_map.c powerpc.
                vma_map_free(map);
                return NULL;
        }
                vma_map_free(map);
                return NULL;
        }

-@@ -134,19 +134,19 @@
+@@ -134,19 +134,19 @@ struct vma_to_fileoffset_map *create_vma

        if (memcmp(ehdr.e_ident, expected, EI_PAD) != 0) {
                printk(KERN_ERR "SPU_PROF: "
                       "%s, line %d: Unexpected e_ident parsing SPU ELF\n",
        if (memcmp(ehdr.e_ident, expected, EI_PAD) != 0) {
                printk(KERN_ERR "SPU_PROF: "
                       "%s, line %d: Unexpected e_ident parsing SPU ELF\n",


@@ -91541,7 +91789,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/oprofile/cell/vma_map.c powerpc.
                goto fail;
        }
        phdr_start = spu_elf_start + ehdr.e_phoff;
                goto fail;
        }
        phdr_start = spu_elf_start + ehdr.e_phoff;

-@@ -232,7 +232,7 @@
+@@ -232,7 +232,7 @@ struct vma_to_fileoffset_map *create_vma

        if (overlay_tbl_offset < 0) {
                printk(KERN_ERR "SPU_PROF: "
                       "%s, line %d: Error finding SPU overlay table\n",
        if (overlay_tbl_offset < 0) {
                printk(KERN_ERR "SPU_PROF: "
                       "%s, line %d: Error finding SPU overlay table\n",


@@ -91550,10 +91798,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/oprofile/cell/vma_map.c powerpc.
                goto fail;
        }
        ovly_table = spu_elf_start + overlay_tbl_offset;
                goto fail;
        }
        ovly_table = spu_elf_start + overlay_tbl_offset;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/oprofile/op_model_cell.c powerpc.git/arch/powerpc/oprofile/op_model_cell.c
---- linux-2.6.25-rc9/arch/powerpc/oprofile/op_model_cell.c     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/oprofile/op_model_cell.c  2008-04-19 16:40:52.000000000 +0200
-@@ -216,7 +216,7 @@
+Index: linux-2.6.25.1/arch/powerpc/oprofile/op_model_cell.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/oprofile/op_model_cell.c
++++ linux-2.6.25.1/arch/powerpc/oprofile/op_model_cell.c
+@@ -216,7 +216,7 @@ static void pm_rtas_reset_signals(u32 no

                 * failure to stop OProfile.
                 */
                printk(KERN_WARNING "%s: rtas returned: %d\n",
                 * failure to stop OProfile.
                 */
                printk(KERN_WARNING "%s: rtas returned: %d\n",


@@ -91562,7 +91811,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/oprofile/op_model_cell.c powerpc
  }
  
  static int pm_rtas_activate_signals(u32 node, u32 count)
  }
  
  static int pm_rtas_activate_signals(u32 node, u32 count)

-@@ -255,7 +255,7 @@
+@@ -255,7 +255,7 @@ static int pm_rtas_activate_signals(u32 

  
                if (unlikely(ret)) {
                        printk(KERN_WARNING "%s: rtas returned: %d\n",
  
                if (unlikely(ret)) {
                        printk(KERN_WARNING "%s: rtas returned: %d\n",


@@ -91571,7 +91820,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/oprofile/op_model_cell.c powerpc
                        return -EIO;
                }
        }
                        return -EIO;
                }
        }

-@@ -560,7 +560,7 @@
+@@ -560,7 +560,7 @@ static int cell_reg_setup(struct op_coun

                if (unlikely(spu_rtas_token == RTAS_UNKNOWN_SERVICE)) {
                        printk(KERN_ERR
                               "%s: rtas token ibm,cbe-spu-perftools unknown\n",
                if (unlikely(spu_rtas_token == RTAS_UNKNOWN_SERVICE)) {
                        printk(KERN_ERR
                               "%s: rtas token ibm,cbe-spu-perftools unknown\n",


@@ -91580,7 +91829,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/oprofile/op_model_cell.c powerpc
                        return -EIO;
                }
        }
                        return -EIO;
                }
        }

-@@ -576,7 +576,7 @@
+@@ -576,7 +576,7 @@ static int cell_reg_setup(struct op_coun

        if (unlikely(pm_rtas_token == RTAS_UNKNOWN_SERVICE)) {
                printk(KERN_ERR
                       "%s: rtas token ibm,cbe-perftools unknown\n",
        if (unlikely(pm_rtas_token == RTAS_UNKNOWN_SERVICE)) {
                printk(KERN_ERR
                       "%s: rtas token ibm,cbe-perftools unknown\n",


@@ -91589,7 +91838,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/oprofile/op_model_cell.c powerpc
                return -EIO;
        }
  
                return -EIO;
        }
  

-@@ -853,7 +853,7 @@
+@@ -853,7 +853,7 @@ static int pm_rtas_activate_spu_profilin

  
        if (unlikely(ret)) {
                printk(KERN_WARNING "%s: rtas returned: %d\n",
  
        if (unlikely(ret)) {
                printk(KERN_WARNING "%s: rtas returned: %d\n",


@@ -91598,7 +91847,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/oprofile/op_model_cell.c powerpc
                return -EIO;
        }
  
                return -EIO;
        }
  

-@@ -949,7 +949,7 @@
+@@ -949,7 +949,7 @@ static int cell_global_start_spu(struct 

                if (unlikely(ret != 0)) {
                        printk(KERN_ERR
                               "%s: rtas call ibm,cbe-spu-perftools failed, return = %d\n",
                if (unlikely(ret != 0)) {
                        printk(KERN_ERR
                               "%s: rtas call ibm,cbe-spu-perftools failed, return = %d\n",


@@ -91607,7 +91856,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/oprofile/op_model_cell.c powerpc
                        rtas_error = -EIO;
                        goto out;
                }
                        rtas_error = -EIO;
                        goto out;
                }

-@@ -1061,7 +1061,7 @@
+@@ -1061,7 +1061,7 @@ static void cell_global_stop_spu(void)

                if (unlikely(rtn_value != 0)) {
                        printk(KERN_ERR
                               "%s: rtas call ibm,cbe-spu-perftools failed, return = %d\n",
                if (unlikely(rtn_value != 0)) {
                        printk(KERN_ERR
                               "%s: rtas call ibm,cbe-spu-perftools failed, return = %d\n",


@@ -91616,9 +91865,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/oprofile/op_model_cell.c powerpc
                }
  
                /* Deactivate the signals */
                }
  
                /* Deactivate the signals */

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/40x/ep405.c powerpc.git/arch/powerpc/platforms/40x/ep405.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/40x/ep405.c        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/40x/ep405.c     2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/40x/ep405.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/40x/ep405.c
++++ linux-2.6.25.1/arch/powerpc/platforms/40x/ep405.c

 @@ -29,6 +29,7 @@
  #include <asm/time.h>
  #include <asm/uic.h>
 @@ -29,6 +29,7 @@
  #include <asm/time.h>
  #include <asm/uic.h>


@@ -91627,16 +91877,17 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/40x/ep405.c powerpc.gi
  
  static struct device_node *bcsr_node;
  static void __iomem *bcsr_regs;
  
  static struct device_node *bcsr_node;
  static void __iomem *bcsr_regs;

-@@ -119,5 +120,6 @@
+@@ -119,5 +120,6 @@ define_machine(ep405) {

        .progress               = udbg_progress,
        .init_IRQ               = uic_init_tree,
        .get_irq                = uic_get_irq,
 +      .restart                = ppc4xx_reset_system,
        .calibrate_decr         = generic_calibrate_decr,
  };
        .progress               = udbg_progress,
        .init_IRQ               = uic_init_tree,
        .get_irq                = uic_get_irq,
 +      .restart                = ppc4xx_reset_system,
        .calibrate_decr         = generic_calibrate_decr,
  };

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/40x/kilauea.c powerpc.git/arch/powerpc/platforms/40x/kilauea.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/40x/kilauea.c      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/40x/kilauea.c   2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/40x/kilauea.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/40x/kilauea.c
++++ linux-2.6.25.1/arch/powerpc/platforms/40x/kilauea.c

 @@ -1,7 +1,7 @@
  /*
   * Kilauea board specific routines
 @@ -1,7 +1,7 @@
  /*
   * Kilauea board specific routines


@@ -91654,16 +91905,17 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/40x/kilauea.c powerpc.
  
  static __initdata struct of_device_id kilauea_of_bus[] = {
        { .compatible = "ibm,plb4", },
  
  static __initdata struct of_device_id kilauea_of_bus[] = {
        { .compatible = "ibm,plb4", },

-@@ -54,5 +55,6 @@
+@@ -54,5 +55,6 @@ define_machine(kilauea) {

        .progress                       = udbg_progress,
        .init_IRQ                       = uic_init_tree,
        .get_irq                        = uic_get_irq,
 +      .restart                        = ppc4xx_reset_system,
        .calibrate_decr                 = generic_calibrate_decr,
  };
        .progress                       = udbg_progress,
        .init_IRQ                       = uic_init_tree,
        .get_irq                        = uic_get_irq,
 +      .restart                        = ppc4xx_reset_system,
        .calibrate_decr                 = generic_calibrate_decr,
  };

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/40x/makalu.c powerpc.git/arch/powerpc/platforms/40x/makalu.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/40x/makalu.c       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/40x/makalu.c    2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/40x/makalu.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/40x/makalu.c
++++ linux-2.6.25.1/arch/powerpc/platforms/40x/makalu.c

 @@ -20,6 +20,7 @@
  #include <asm/time.h>
  #include <asm/uic.h>
 @@ -20,6 +20,7 @@
  #include <asm/time.h>
  #include <asm/uic.h>


@@ -91672,16 +91924,17 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/40x/makalu.c powerpc.g
  
  static __initdata struct of_device_id makalu_of_bus[] = {
        { .compatible = "ibm,plb4", },
  
  static __initdata struct of_device_id makalu_of_bus[] = {
        { .compatible = "ibm,plb4", },

-@@ -54,5 +55,6 @@
+@@ -54,5 +55,6 @@ define_machine(makalu) {

        .progress                       = udbg_progress,
        .init_IRQ                       = uic_init_tree,
        .get_irq                        = uic_get_irq,
 +      .restart                        = ppc4xx_reset_system,
        .calibrate_decr                 = generic_calibrate_decr,
  };
        .progress                       = udbg_progress,
        .init_IRQ                       = uic_init_tree,
        .get_irq                        = uic_get_irq,
 +      .restart                        = ppc4xx_reset_system,
        .calibrate_decr                 = generic_calibrate_decr,
  };

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/40x/virtex.c powerpc.git/arch/powerpc/platforms/40x/virtex.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/40x/virtex.c       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/40x/virtex.c    2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/40x/virtex.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/40x/virtex.c
++++ linux-2.6.25.1/arch/powerpc/platforms/40x/virtex.c

 @@ -14,6 +14,7 @@
  #include <asm/prom.h>
  #include <asm/time.h>
 @@ -14,6 +14,7 @@
  #include <asm/prom.h>
  #include <asm/time.h>


@@ -91690,16 +91943,17 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/40x/virtex.c powerpc.g
  
  static struct of_device_id xilinx_of_bus_ids[] __initdata = {
        { .compatible = "xlnx,plb-v46-1.00.a", },
  
  static struct of_device_id xilinx_of_bus_ids[] __initdata = {
        { .compatible = "xlnx,plb-v46-1.00.a", },

-@@ -48,5 +49,6 @@
+@@ -48,5 +49,6 @@ define_machine(virtex) {

        .probe                  = virtex_probe,
        .init_IRQ               = xilinx_intc_init_tree,
        .get_irq                = xilinx_intc_get_irq,
 +      .restart                = ppc4xx_reset_system,
        .calibrate_decr         = generic_calibrate_decr,
  };
        .probe                  = virtex_probe,
        .init_IRQ               = xilinx_intc_init_tree,
        .get_irq                = xilinx_intc_get_irq,
 +      .restart                = ppc4xx_reset_system,
        .calibrate_decr         = generic_calibrate_decr,
  };

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/40x/walnut.c powerpc.git/arch/powerpc/platforms/40x/walnut.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/40x/walnut.c       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/40x/walnut.c    2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/40x/walnut.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/40x/walnut.c
++++ linux-2.6.25.1/arch/powerpc/platforms/40x/walnut.c

 @@ -26,6 +26,7 @@
  #include <asm/time.h>
  #include <asm/uic.h>
 @@ -26,6 +26,7 @@
  #include <asm/time.h>
  #include <asm/uic.h>


@@ -91708,7 +91962,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/40x/walnut.c powerpc.g
  
  static __initdata struct of_device_id walnut_of_bus[] = {
        { .compatible = "ibm,plb3", },
  
  static __initdata struct of_device_id walnut_of_bus[] = {
        { .compatible = "ibm,plb3", },

-@@ -61,5 +62,6 @@
+@@ -61,5 +62,6 @@ define_machine(walnut) {

        .progress               = udbg_progress,
        .init_IRQ               = uic_init_tree,
        .get_irq                = uic_get_irq,
        .progress               = udbg_progress,
        .init_IRQ               = uic_init_tree,
        .get_irq                = uic_get_irq,


@@ -91716,9 +91970,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/40x/walnut.c powerpc.g
 +      .restart                = ppc4xx_reset_system,
 +      .calibrate_decr         = generic_calibrate_decr,
  };
 +      .restart                = ppc4xx_reset_system,
 +      .calibrate_decr         = generic_calibrate_decr,
  };

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/44x.h powerpc.git/arch/powerpc/platforms/44x/44x.h
---- linux-2.6.25-rc9/arch/powerpc/platforms/44x/44x.h  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/44x/44x.h       2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/44x/44x.h
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/44x/44x.h
++++ linux-2.6.25.1/arch/powerpc/platforms/44x/44x.h

 @@ -3,6 +3,5 @@
  
  extern u8 as1_readb(volatile u8 __iomem  *addr);
 @@ -3,6 +3,5 @@
  
  extern u8 as1_readb(volatile u8 __iomem  *addr);


@@ -91726,10 +91981,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/44x.h powerpc.git/
 -extern void ppc44x_reset_system(char *cmd);
  
  #endif /* __POWERPC_PLATFORMS_44X_44X_H */
 -extern void ppc44x_reset_system(char *cmd);
  
  #endif /* __POWERPC_PLATFORMS_44X_44X_H */

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/Kconfig powerpc.git/arch/powerpc/platforms/44x/Kconfig
---- linux-2.6.25-rc9/arch/powerpc/platforms/44x/Kconfig        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/44x/Kconfig     2008-04-19 16:40:52.000000000 +0200
-@@ -67,6 +67,25 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/44x/Kconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/44x/Kconfig
++++ linux-2.6.25.1/arch/powerpc/platforms/44x/Kconfig
+@@ -67,6 +67,25 @@ config WARP

          See http://www.pikatechnologies.com/ and follow the "PIKA for Computer
          Telephony Developers" link for more information.
  
          See http://www.pikatechnologies.com/ and follow the "PIKA for Computer
          Telephony Developers" link for more information.
  


@@ -91755,7 +92011,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/Kconfig powerpc.gi
  #config LUAN
  #     bool "Luan"
  #     depends on 44x
  #config LUAN
  #     bool "Luan"
  #     depends on 44x

-@@ -122,6 +141,14 @@
+@@ -122,6 +141,14 @@ config 440SPe

        bool
        select IBM_NEW_EMAC_EMAC4
  
        bool
        select IBM_NEW_EMAC_EMAC4
  


@@ -91770,9 +92026,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/Kconfig powerpc.gi
  # 44x errata/workaround config symbols, selected by the CPU models above
  config IBM440EP_ERR42
        bool
  # 44x errata/workaround config symbols, selected by the CPU models above
  config IBM440EP_ERR42
        bool

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/Makefile powerpc.git/arch/powerpc/platforms/44x/Makefile
---- linux-2.6.25-rc9/arch/powerpc/platforms/44x/Makefile       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/44x/Makefile    2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/44x/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/44x/Makefile
++++ linux-2.6.25.1/arch/powerpc/platforms/44x/Makefile

 @@ -1,9 +1,11 @@
 -obj-$(CONFIG_44x)     := misc_44x.o
 +obj-$(CONFIG_44x)     := misc_44x.o idle.o
 @@ -1,9 +1,11 @@
 -obj-$(CONFIG_44x)     := misc_44x.o
 +obj-$(CONFIG_44x)     := misc_44x.o idle.o


@@ -91786,9 +92043,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/Makefile powerpc.g
  obj-$(CONFIG_WARP)    += warp.o
  obj-$(CONFIG_WARP)    += warp-nand.o
 +obj-$(CONFIG_CANYONLANDS) += canyonlands.o
  obj-$(CONFIG_WARP)    += warp.o
  obj-$(CONFIG_WARP)    += warp-nand.o
 +obj-$(CONFIG_CANYONLANDS) += canyonlands.o

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/bamboo.c powerpc.git/arch/powerpc/platforms/44x/bamboo.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/44x/bamboo.c       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/44x/bamboo.c    2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/44x/bamboo.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/44x/bamboo.c
++++ linux-2.6.25.1/arch/powerpc/platforms/44x/bamboo.c

 @@ -22,8 +22,7 @@
  #include <asm/time.h>
  #include <asm/uic.h>
 @@ -22,8 +22,7 @@
  #include <asm/time.h>
  #include <asm/uic.h>


@@ -91799,7 +92057,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/bamboo.c powerpc.g
  
  static __initdata struct of_device_id bamboo_of_bus[] = {
        { .compatible = "ibm,plb4", },
  
  static __initdata struct of_device_id bamboo_of_bus[] = {
        { .compatible = "ibm,plb4", },

-@@ -53,11 +52,11 @@
+@@ -53,11 +52,11 @@ static int __init bamboo_probe(void)

  }
  
  define_machine(bamboo) {
  }
  
  define_machine(bamboo) {


@@ -91817,9 +92075,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/bamboo.c powerpc.g
 +      .restart                = ppc4xx_reset_system,
        .calibrate_decr         = generic_calibrate_decr,
  };
 +      .restart                = ppc4xx_reset_system,
        .calibrate_decr         = generic_calibrate_decr,
  };

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/canyonlands.c powerpc.git/arch/powerpc/platforms/44x/canyonlands.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/44x/canyonlands.c  1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/44x/canyonlands.c       2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/44x/canyonlands.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/platforms/44x/canyonlands.c

 @@ -0,0 +1,63 @@
 +/*
 + * Canyonlands board specific routines
 @@ -0,0 +1,63 @@
 +/*
 + * Canyonlands board specific routines


@@ -91884,9 +92143,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/canyonlands.c powe
 +      .restart                        = ppc4xx_reset_system,
 +      .calibrate_decr                 = generic_calibrate_decr,
 +};
 +      .restart                        = ppc4xx_reset_system,
 +      .calibrate_decr                 = generic_calibrate_decr,
 +};

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/ebony.c powerpc.git/arch/powerpc/platforms/44x/ebony.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/44x/ebony.c        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/44x/ebony.c     2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/44x/ebony.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/44x/ebony.c
++++ linux-2.6.25.1/arch/powerpc/platforms/44x/ebony.c

 @@ -26,8 +26,7 @@
  #include <asm/time.h>
  #include <asm/uic.h>
 @@ -26,8 +26,7 @@
  #include <asm/time.h>
  #include <asm/uic.h>


@@ -91897,7 +92157,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/ebony.c powerpc.gi
  
  static __initdata struct of_device_id ebony_of_bus[] = {
        { .compatible = "ibm,plb4", },
  
  static __initdata struct of_device_id ebony_of_bus[] = {
        { .compatible = "ibm,plb4", },

-@@ -66,6 +65,6 @@
+@@ -66,6 +65,6 @@ define_machine(ebony) {

        .progress               = udbg_progress,
        .init_IRQ               = uic_init_tree,
        .get_irq                = uic_get_irq,
        .progress               = udbg_progress,
        .init_IRQ               = uic_init_tree,
        .get_irq                = uic_get_irq,


@@ -91905,9 +92165,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/ebony.c powerpc.gi
 +      .restart                = ppc4xx_reset_system,
        .calibrate_decr         = generic_calibrate_decr,
  };
 +      .restart                = ppc4xx_reset_system,
        .calibrate_decr         = generic_calibrate_decr,
  };

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/idle.c powerpc.git/arch/powerpc/platforms/44x/idle.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/44x/idle.c 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/44x/idle.c      2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/44x/idle.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/platforms/44x/idle.c

 @@ -0,0 +1,67 @@
 +/*
 + * Copyright 2008 IBM Corp. 
 @@ -0,0 +1,67 @@
 +/*
 + * Copyright 2008 IBM Corp. 


@@ -91976,9 +92237,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/idle.c powerpc.git
 +}
 +
 +early_param("idle", idle_param);
 +}
 +
 +early_param("idle", idle_param);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/katmai.c powerpc.git/arch/powerpc/platforms/44x/katmai.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/44x/katmai.c       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/44x/katmai.c    2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/44x/katmai.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/44x/katmai.c
++++ linux-2.6.25.1/arch/powerpc/platforms/44x/katmai.c

 @@ -22,8 +22,7 @@
  #include <asm/time.h>
  #include <asm/uic.h>
 @@ -22,8 +22,7 @@
  #include <asm/time.h>
  #include <asm/uic.h>


@@ -91989,7 +92251,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/katmai.c powerpc.g
  
  static __initdata struct of_device_id katmai_of_bus[] = {
        { .compatible = "ibm,plb4", },
  
  static __initdata struct of_device_id katmai_of_bus[] = {
        { .compatible = "ibm,plb4", },

-@@ -58,6 +57,6 @@
+@@ -58,6 +57,6 @@ define_machine(katmai) {

        .progress                       = udbg_progress,
        .init_IRQ                       = uic_init_tree,
        .get_irq                        = uic_get_irq,
        .progress                       = udbg_progress,
        .init_IRQ                       = uic_init_tree,
        .get_irq                        = uic_get_irq,


@@ -91997,10 +92259,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/katmai.c powerpc.g
 +      .restart                        = ppc4xx_reset_system,
        .calibrate_decr                 = generic_calibrate_decr,
  };
 +      .restart                        = ppc4xx_reset_system,
        .calibrate_decr                 = generic_calibrate_decr,
  };

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/misc_44x.S powerpc.git/arch/powerpc/platforms/44x/misc_44x.S
---- linux-2.6.25-rc9/arch/powerpc/platforms/44x/misc_44x.S     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/44x/misc_44x.S  2008-04-19 16:40:52.000000000 +0200
-@@ -44,14 +44,3 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/44x/misc_44x.S
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/44x/misc_44x.S
++++ linux-2.6.25.1/arch/powerpc/platforms/44x/misc_44x.S
+@@ -44,14 +44,3 @@ _GLOBAL(as1_writeb)

        sync
        isync
        blr
        sync
        isync
        blr


@@ -92015,9 +92278,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/misc_44x.S powerpc
 -      oris    r13,r13,DBCR0_RST_SYSTEM@h
 -      mtspr   SPRN_DBCR0,r13
 -      b       .                       /* Just in case the reset doesn't work */
 -      oris    r13,r13,DBCR0_RST_SYSTEM@h
 -      mtspr   SPRN_DBCR0,r13
 -      b       .                       /* Just in case the reset doesn't work */

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/rainier.c powerpc.git/arch/powerpc/platforms/44x/rainier.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/44x/rainier.c      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/44x/rainier.c   2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/44x/rainier.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/44x/rainier.c
++++ linux-2.6.25.1/arch/powerpc/platforms/44x/rainier.c

 @@ -22,7 +22,7 @@
  #include <asm/time.h>
  #include <asm/uic.h>
 @@ -22,7 +22,7 @@
  #include <asm/time.h>
  #include <asm/uic.h>


@@ -92027,7 +92291,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/rainier.c powerpc.
  
  static __initdata struct of_device_id rainier_of_bus[] = {
        { .compatible = "ibm,plb4", },
  
  static __initdata struct of_device_id rainier_of_bus[] = {
        { .compatible = "ibm,plb4", },

-@@ -57,6 +57,6 @@
+@@ -57,6 +57,6 @@ define_machine(rainier) {

        .progress                       = udbg_progress,
        .init_IRQ                       = uic_init_tree,
        .get_irq                        = uic_get_irq,
        .progress                       = udbg_progress,
        .init_IRQ                       = uic_init_tree,
        .get_irq                        = uic_get_irq,


@@ -92035,9 +92299,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/rainier.c powerpc.
 +      .restart                        = ppc4xx_reset_system,
        .calibrate_decr                 = generic_calibrate_decr,
  };
 +      .restart                        = ppc4xx_reset_system,
        .calibrate_decr                 = generic_calibrate_decr,
  };

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/sequoia.c powerpc.git/arch/powerpc/platforms/44x/sequoia.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/44x/sequoia.c      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/44x/sequoia.c   2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/44x/sequoia.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/44x/sequoia.c
++++ linux-2.6.25.1/arch/powerpc/platforms/44x/sequoia.c

 @@ -23,7 +23,7 @@
  #include <asm/uic.h>
  #include <asm/pci-bridge.h>
 @@ -23,7 +23,7 @@
  #include <asm/uic.h>
  #include <asm/pci-bridge.h>


@@ -92047,7 +92312,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/sequoia.c powerpc.
  
  static __initdata struct of_device_id sequoia_of_bus[] = {
        { .compatible = "ibm,plb4", },
  
  static __initdata struct of_device_id sequoia_of_bus[] = {
        { .compatible = "ibm,plb4", },

-@@ -58,6 +58,6 @@
+@@ -58,6 +58,6 @@ define_machine(sequoia) {

        .progress                       = udbg_progress,
        .init_IRQ                       = uic_init_tree,
        .get_irq                        = uic_get_irq,
        .progress                       = udbg_progress,
        .init_IRQ                       = uic_init_tree,
        .get_irq                        = uic_get_irq,


@@ -92055,9 +92320,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/sequoia.c powerpc.
 +      .restart                        = ppc4xx_reset_system,
        .calibrate_decr                 = generic_calibrate_decr,
  };
 +      .restart                        = ppc4xx_reset_system,
        .calibrate_decr                 = generic_calibrate_decr,
  };

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/taishan.c powerpc.git/arch/powerpc/platforms/44x/taishan.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/44x/taishan.c      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/44x/taishan.c   2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/44x/taishan.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/44x/taishan.c
++++ linux-2.6.25.1/arch/powerpc/platforms/44x/taishan.c

 @@ -29,8 +29,7 @@
  #include <asm/time.h>
  #include <asm/uic.h>
 @@ -29,8 +29,7 @@
  #include <asm/time.h>
  #include <asm/uic.h>


@@ -92068,7 +92334,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/taishan.c powerpc.
  
  static __initdata struct of_device_id taishan_of_bus[] = {
        { .compatible = "ibm,plb4", },
  
  static __initdata struct of_device_id taishan_of_bus[] = {
        { .compatible = "ibm,plb4", },

-@@ -68,6 +67,6 @@
+@@ -68,6 +67,6 @@ define_machine(taishan) {

        .progress               = udbg_progress,
        .init_IRQ               = uic_init_tree,
        .get_irq                = uic_get_irq,
        .progress               = udbg_progress,
        .init_IRQ               = uic_init_tree,
        .get_irq                = uic_get_irq,


@@ -92076,9 +92342,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/taishan.c powerpc.
 +      .restart                = ppc4xx_reset_system,
        .calibrate_decr         = generic_calibrate_decr,
  };
 +      .restart                = ppc4xx_reset_system,
        .calibrate_decr         = generic_calibrate_decr,
  };

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/warp-nand.c powerpc.git/arch/powerpc/platforms/44x/warp-nand.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/44x/warp-nand.c    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/44x/warp-nand.c 2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/44x/warp-nand.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/44x/warp-nand.c
++++ linux-2.6.25.1/arch/powerpc/platforms/44x/warp-nand.c

 @@ -11,6 +11,7 @@
  #include <linux/mtd/partitions.h>
  #include <linux/mtd/nand.h>
 @@ -11,6 +11,7 @@
  #include <linux/mtd/partitions.h>
  #include <linux/mtd/nand.h>


@@ -92087,7 +92354,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/warp-nand.c powerp
  
  #ifdef CONFIG_MTD_NAND_NDFC
  
  
  #ifdef CONFIG_MTD_NAND_NDFC
  

-@@ -100,6 +101,6 @@
+@@ -100,6 +101,6 @@ static int warp_setup_nand_flash(void)

  
        return 0;
  }
  
        return 0;
  }


@@ -92095,9 +92362,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/warp-nand.c powerp
 +machine_device_initcall(warp, warp_setup_nand_flash);
  
  #endif
 +machine_device_initcall(warp, warp_setup_nand_flash);
  
  #endif

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/warp.c powerpc.git/arch/powerpc/platforms/44x/warp.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/44x/warp.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/44x/warp.c      2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/44x/warp.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/44x/warp.c
++++ linux-2.6.25.1/arch/powerpc/platforms/44x/warp.c

 @@ -18,9 +18,7 @@
  #include <asm/udbg.h>
  #include <asm/time.h>
 @@ -18,9 +18,7 @@
  #include <asm/udbg.h>
  #include <asm/time.h>


@@ -92109,7 +92377,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/warp.c powerpc.git
  
  static __initdata struct of_device_id warp_of_bus[] = {
        { .compatible = "ibm,plb4", },
  
  static __initdata struct of_device_id warp_of_bus[] = {
        { .compatible = "ibm,plb4", },

-@@ -49,7 +47,7 @@
+@@ -49,7 +47,7 @@ define_machine(warp) {

        .progress       = udbg_progress,
        .init_IRQ       = uic_init_tree,
        .get_irq        = uic_get_irq,
        .progress       = udbg_progress,
        .init_IRQ       = uic_init_tree,
        .get_irq        = uic_get_irq,


@@ -92118,10 +92386,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/warp.c powerpc.git
        .calibrate_decr = generic_calibrate_decr,
  };
  
        .calibrate_decr = generic_calibrate_decr,
  };
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/52xx/lite5200.c powerpc.git/arch/powerpc/platforms/52xx/lite5200.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/52xx/lite5200.c    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/52xx/lite5200.c 2008-04-19 16:40:52.000000000 +0200
-@@ -63,7 +63,7 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/52xx/lite5200.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/52xx/lite5200.c
++++ linux-2.6.25.1/arch/powerpc/platforms/52xx/lite5200.c
+@@ -63,7 +63,7 @@ lite5200_fix_clock_config(void)

        of_node_put(np);
        if (!cdm) {
                printk(KERN_ERR "%s() failed; expect abnormal behaviour\n",
        of_node_put(np);
        if (!cdm) {
                printk(KERN_ERR "%s() failed; expect abnormal behaviour\n",


@@ -92130,7 +92399,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/52xx/lite5200.c powerp
                return;
        }
  
                return;
        }
  

-@@ -98,7 +98,7 @@
+@@ -98,7 +98,7 @@ lite5200_fix_port_config(void)

        of_node_put(np);
        if (!gpio) {
                printk(KERN_ERR "%s() failed. expect abnormal behavior\n",
        of_node_put(np);
        if (!gpio) {
                printk(KERN_ERR "%s() failed. expect abnormal behavior\n",


@@ -92139,10 +92408,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/52xx/lite5200.c powerp
                return;
        }
  
                return;
        }
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/82xx/Kconfig powerpc.git/arch/powerpc/platforms/82xx/Kconfig
---- linux-2.6.25-rc9/arch/powerpc/platforms/82xx/Kconfig       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/82xx/Kconfig    2008-04-19 16:40:52.000000000 +0200
-@@ -11,7 +11,6 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/82xx/Kconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/82xx/Kconfig
++++ linux-2.6.25.1/arch/powerpc/platforms/82xx/Kconfig
+@@ -11,7 +11,6 @@ config MPC8272_ADS

        select 8260
        select FSL_SOC
        select PQ2_ADS_PCI_PIC if PCI
        select 8260
        select FSL_SOC
        select PQ2_ADS_PCI_PIC if PCI


@@ -92150,7 +92420,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/82xx/Kconfig powerpc.g
        help
          This option enables support for the MPC8272 ADS board
  
        help
          This option enables support for the MPC8272 ADS board
  

-@@ -22,7 +21,6 @@
+@@ -22,7 +21,6 @@ config PQ2FADS

        select 8260
        select FSL_SOC
        select PQ2_ADS_PCI_PIC if PCI
        select 8260
        select FSL_SOC
        select PQ2_ADS_PCI_PIC if PCI


@@ -92158,7 +92428,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/82xx/Kconfig powerpc.g
        help
          This option enables support for the PQ2FADS board
  
        help
          This option enables support for the PQ2FADS board
  

-@@ -31,7 +29,6 @@
+@@ -31,7 +29,6 @@ config EP8248E

        select 8272
        select 8260
        select FSL_SOC
        select 8272
        select 8260
        select FSL_SOC


@@ -92166,10 +92436,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/82xx/Kconfig powerpc.g
        select MDIO_BITBANG
        help
          This enables support for the Embedded Planet EP8248E board.
        select MDIO_BITBANG
        help
          This enables support for the Embedded Planet EP8248E board.

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/83xx/mpc837x_rdb.c powerpc.git/arch/powerpc/platforms/83xx/mpc837x_rdb.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/83xx/mpc837x_rdb.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/83xx/mpc837x_rdb.c      2008-04-19 16:40:52.000000000 +0200
-@@ -46,6 +46,7 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/83xx/mpc837x_rdb.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/83xx/mpc837x_rdb.c
++++ linux-2.6.25.1/arch/powerpc/platforms/83xx/mpc837x_rdb.c
+@@ -46,6 +46,7 @@ static void __init mpc837x_rdb_setup_arc

  static struct of_device_id mpc837x_ids[] = {
        { .type = "soc", },
        { .compatible = "soc", },
  static struct of_device_id mpc837x_ids[] = {
        { .type = "soc", },
        { .compatible = "soc", },


@@ -92177,9 +92448,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/83xx/mpc837x_rdb.c pow
        {},
  };
  
        {},
  };
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/83xx/mpc83xx.h powerpc.git/arch/powerpc/platforms/83xx/mpc83xx.h
---- linux-2.6.25-rc9/arch/powerpc/platforms/83xx/mpc83xx.h     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/83xx/mpc83xx.h  2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/83xx/mpc83xx.h
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/83xx/mpc83xx.h
++++ linux-2.6.25.1/arch/powerpc/platforms/83xx/mpc83xx.h

 @@ -16,6 +16,7 @@
  #define MPC83XX_SCCR_USB_DRCM_10   0x00200000
  #define MPC8315_SCCR_USB_MASK      0x00c00000
 @@ -16,6 +16,7 @@
  #define MPC83XX_SCCR_USB_DRCM_10   0x00200000
  #define MPC8315_SCCR_USB_MASK      0x00c00000


@@ -92196,10 +92468,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/83xx/mpc83xx.h powerpc
  #define CONTROL_REFSEL_48MHZ       0x00000080
  #define CONTROL_PHY_CLK_SEL_ULPI   0x00000400
  #define CONTROL_OTG_PORT           0x00000020
  #define CONTROL_REFSEL_48MHZ       0x00000080
  #define CONTROL_PHY_CLK_SEL_ULPI   0x00000400
  #define CONTROL_OTG_PORT           0x00000020

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/83xx/usb.c powerpc.git/arch/powerpc/platforms/83xx/usb.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/83xx/usb.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/83xx/usb.c      2008-04-19 16:40:52.000000000 +0200
-@@ -129,7 +129,7 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/83xx/usb.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/83xx/usb.c
++++ linux-2.6.25.1/arch/powerpc/platforms/83xx/usb.c
+@@ -129,7 +129,7 @@ int mpc831x_usb_cfg(void)

        if (immr_node && of_device_is_compatible(immr_node, "fsl,mpc8315-immr"))
                clrsetbits_be32(immap + MPC83XX_SCCR_OFFS,
                                MPC8315_SCCR_USB_MASK,
        if (immr_node && of_device_is_compatible(immr_node, "fsl,mpc8315-immr"))
                clrsetbits_be32(immap + MPC83XX_SCCR_OFFS,
                                MPC8315_SCCR_USB_MASK,


@@ -92208,7 +92481,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/83xx/usb.c powerpc.git
        else
                clrsetbits_be32(immap + MPC83XX_SCCR_OFFS,
                                MPC83XX_SCCR_USB_MASK,
        else
                clrsetbits_be32(immap + MPC83XX_SCCR_OFFS,
                                MPC83XX_SCCR_USB_MASK,

-@@ -164,9 +164,15 @@
+@@ -164,9 +164,15 @@ int mpc831x_usb_cfg(void)

        /* Using on-chip PHY */
        if (prop && (!strcmp(prop, "utmi_wide") ||
                     !strcmp(prop, "utmi"))) {
        /* Using on-chip PHY */
        if (prop && (!strcmp(prop, "utmi_wide") ||
                     !strcmp(prop, "utmi"))) {


@@ -92226,10 +92499,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/83xx/usb.c powerpc.git
        /* Using external UPLI PHY */
        } else if (prop && !strcmp(prop, "ulpi")) {
                /* Set PHY_CLK_SEL to ULPI */
        /* Using external UPLI PHY */
        } else if (prop && !strcmp(prop, "ulpi")) {
                /* Set PHY_CLK_SEL to ULPI */

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/85xx/Kconfig powerpc.git/arch/powerpc/platforms/85xx/Kconfig
---- linux-2.6.25-rc9/arch/powerpc/platforms/85xx/Kconfig       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/85xx/Kconfig    2008-04-19 16:40:52.000000000 +0200
-@@ -19,7 +19,6 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/85xx/Kconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/85xx/Kconfig
++++ linux-2.6.25.1/arch/powerpc/platforms/85xx/Kconfig
+@@ -19,7 +19,6 @@ config MPC8540_ADS

  config MPC8560_ADS
        bool "Freescale MPC8560 ADS"
        select DEFAULT_UIMAGE
  config MPC8560_ADS
        bool "Freescale MPC8560 ADS"
        select DEFAULT_UIMAGE


@@ -92237,7 +92511,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/85xx/Kconfig powerpc.g
        select CPM2
        help
          This option enables support for the MPC 8560 ADS board
        select CPM2
        help
          This option enables support for the MPC 8560 ADS board

-@@ -46,6 +45,12 @@
+@@ -46,6 +45,12 @@ config MPC85xx_DS

        help
          This option enables support for the MPC85xx DS (MPC8544 DS) board
  
        help
          This option enables support for the MPC85xx DS (MPC8544 DS) board
  


@@ -92250,7 +92524,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/85xx/Kconfig powerpc.g
  config STX_GP3
        bool "Silicon Turnkey Express GP3"
        help
  config STX_GP3
        bool "Silicon Turnkey Express GP3"
        help

-@@ -53,14 +58,12 @@
+@@ -53,14 +58,12 @@ config STX_GP3

          board.
        select CPM2
        select DEFAULT_UIMAGE
          board.
        select CPM2
        select DEFAULT_UIMAGE


@@ -92265,7 +92539,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/85xx/Kconfig powerpc.g
        select TQM85xx
  
  config TQM8541
        select TQM85xx
  
  config TQM8541

-@@ -68,7 +71,6 @@
+@@ -68,7 +71,6 @@ config TQM8541

        help
          This option enables support for the TQ Components TQM8541 board.
        select DEFAULT_UIMAGE
        help
          This option enables support for the TQ Components TQM8541 board.
        select DEFAULT_UIMAGE


@@ -92273,7 +92547,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/85xx/Kconfig powerpc.g
        select TQM85xx
        select CPM2
  
        select TQM85xx
        select CPM2
  

-@@ -77,7 +79,6 @@
+@@ -77,7 +79,6 @@ config TQM8555

        help
          This option enables support for the TQ Components TQM8555 board.
        select DEFAULT_UIMAGE
        help
          This option enables support for the TQ Components TQM8555 board.
        select DEFAULT_UIMAGE


@@ -92281,7 +92555,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/85xx/Kconfig powerpc.g
        select TQM85xx
        select CPM2
  
        select TQM85xx
        select CPM2
  

-@@ -86,7 +87,6 @@
+@@ -86,7 +87,6 @@ config TQM8560

        help
          This option enables support for the TQ Components TQM8560 board.
        select DEFAULT_UIMAGE
        help
          This option enables support for the TQ Components TQM8560 board.
        select DEFAULT_UIMAGE


@@ -92289,7 +92563,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/85xx/Kconfig powerpc.g
        select TQM85xx
        select CPM2
  
        select TQM85xx
        select CPM2
  

-@@ -99,7 +99,6 @@
+@@ -99,7 +99,6 @@ config SBC8548

  config SBC8560
        bool "Wind River SBC8560"
        select DEFAULT_UIMAGE
  config SBC8560
        bool "Wind River SBC8560"
        select DEFAULT_UIMAGE


@@ -92297,17 +92571,19 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/85xx/Kconfig powerpc.g
        help
          This option enables support for the Wind River SBC8560 board
  
        help
          This option enables support for the Wind River SBC8560 board
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/85xx/Makefile powerpc.git/arch/powerpc/platforms/85xx/Makefile
---- linux-2.6.25-rc9/arch/powerpc/platforms/85xx/Makefile      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/85xx/Makefile   2008-04-19 16:40:52.000000000 +0200
-@@ -10,3 +10,4 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/85xx/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/85xx/Makefile
++++ linux-2.6.25.1/arch/powerpc/platforms/85xx/Makefile
+@@ -10,3 +10,4 @@ obj-$(CONFIG_STX_GP3)          += stx_gp3.o

  obj-$(CONFIG_TQM85xx)   += tqm85xx.o
  obj-$(CONFIG_SBC8560)     += sbc8560.o
  obj-$(CONFIG_SBC8548)     += sbc8548.o
 +obj-$(CONFIG_KSI8560)   += ksi8560.o
  obj-$(CONFIG_TQM85xx)   += tqm85xx.o
  obj-$(CONFIG_SBC8560)     += sbc8560.o
  obj-$(CONFIG_SBC8548)     += sbc8548.o
 +obj-$(CONFIG_KSI8560)   += ksi8560.o

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/85xx/ksi8560.c powerpc.git/arch/powerpc/platforms/85xx/ksi8560.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/85xx/ksi8560.c     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/85xx/ksi8560.c  2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/85xx/ksi8560.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/platforms/85xx/ksi8560.c

 @@ -0,0 +1,257 @@
 +/*
 + * Board setup routines for the Emerson KSI8560
 @@ -0,0 +1,257 @@
 +/*
 + * Board setup routines for the Emerson KSI8560


@@ -92566,10 +92842,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/85xx/ksi8560.c powerpc
 +      .restart                = machine_restart,
 +      .calibrate_decr         = generic_calibrate_decr,
 +};
 +      .restart                = machine_restart,
 +      .calibrate_decr         = generic_calibrate_decr,
 +};

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/85xx/mpc85xx_ads.c powerpc.git/arch/powerpc/platforms/85xx/mpc85xx_ads.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/85xx/mpc85xx_ads.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/85xx/mpc85xx_ads.c      2008-04-19 16:40:52.000000000 +0200
-@@ -165,7 +165,7 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/85xx/mpc85xx_ads.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/85xx/mpc85xx_ads.c
++++ linux-2.6.25.1/arch/powerpc/platforms/85xx/mpc85xx_ads.c
+@@ -165,7 +165,7 @@ static void __init init_ioports(void)

        int i;
  
        for (i = 0; i < ARRAY_SIZE(mpc8560_ads_pins); i++) {
        int i;
  
        for (i = 0; i < ARRAY_SIZE(mpc8560_ads_pins); i++) {


@@ -92578,9 +92855,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/85xx/mpc85xx_ads.c pow
                cpm2_set_pin(pin->port, pin->pin, pin->flags);
        }
  
                cpm2_set_pin(pin->port, pin->pin, pin->flags);
        }
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/85xx/mpc85xx_ds.c powerpc.git/arch/powerpc/platforms/85xx/mpc85xx_ds.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/85xx/mpc85xx_ds.c  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/85xx/mpc85xx_ds.c       2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/85xx/mpc85xx_ds.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/85xx/mpc85xx_ds.c
++++ linux-2.6.25.1/arch/powerpc/platforms/85xx/mpc85xx_ds.c

 @@ -19,6 +19,7 @@
  #include <linux/delay.h>
  #include <linux/seq_file.h>
 @@ -19,6 +19,7 @@
  #include <linux/delay.h>
  #include <linux/seq_file.h>


@@ -92598,7 +92876,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/85xx/mpc85xx_ds.c powe
  #else
  #define DBG(fmt, args...)
  #endif
  #else
  #define DBG(fmt, args...)
  #endif

-@@ -183,6 +184,18 @@
+@@ -183,6 +184,18 @@ static int __init mpc8544_ds_probe(void)

        }
  }
  
        }
  }
  


@@ -92617,10 +92895,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/85xx/mpc85xx_ds.c powe
  /*
   * Called very early, device-tree isn't unflattened
   */
  /*
   * Called very early, device-tree isn't unflattened
   */

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/86xx/Kconfig powerpc.git/arch/powerpc/platforms/86xx/Kconfig
---- linux-2.6.25-rc9/arch/powerpc/platforms/86xx/Kconfig       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/86xx/Kconfig    2008-04-19 16:40:52.000000000 +0200
-@@ -11,6 +11,12 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/86xx/Kconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/86xx/Kconfig
++++ linux-2.6.25.1/arch/powerpc/platforms/86xx/Kconfig
+@@ -11,6 +11,12 @@ config MPC8641_HPCN

        help
          This option enables support for the MPC8641 HPCN board.
  
        help
          This option enables support for the MPC8641 HPCN board.
  


@@ -92633,7 +92912,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/86xx/Kconfig powerpc.g
  config MPC8610_HPCD
        bool "Freescale MPC8610 HPCD"
        select DEFAULT_UIMAGE
  config MPC8610_HPCD
        bool "Freescale MPC8610 HPCD"
        select DEFAULT_UIMAGE

-@@ -24,7 +30,7 @@
+@@ -24,7 +30,7 @@ config MPC8641

        select FSL_PCI if PCI
        select PPC_UDBG_16550
        select MPIC
        select FSL_PCI if PCI
        select PPC_UDBG_16550
        select MPIC


@@ -92642,19 +92921,21 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/86xx/Kconfig powerpc.g
  
  config MPC8610
        bool
  
  config MPC8610
        bool

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/86xx/Makefile powerpc.git/arch/powerpc/platforms/86xx/Makefile
---- linux-2.6.25-rc9/arch/powerpc/platforms/86xx/Makefile      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/86xx/Makefile   2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/86xx/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/86xx/Makefile
++++ linux-2.6.25.1/arch/powerpc/platforms/86xx/Makefile

 @@ -4,4 +4,5 @@
  
  obj-$(CONFIG_SMP)             += mpc86xx_smp.o
  obj-$(CONFIG_MPC8641_HPCN)    += mpc86xx_hpcn.o
 +obj-$(CONFIG_SBC8641D)                += sbc8641d.o
  obj-$(CONFIG_MPC8610_HPCD)    += mpc8610_hpcd.o
 @@ -4,4 +4,5 @@
  
  obj-$(CONFIG_SMP)             += mpc86xx_smp.o
  obj-$(CONFIG_MPC8641_HPCN)    += mpc86xx_hpcn.o
 +obj-$(CONFIG_SBC8641D)                += sbc8641d.o
  obj-$(CONFIG_MPC8610_HPCD)    += mpc8610_hpcd.o

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/86xx/mpc8610_hpcd.c powerpc.git/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/86xx/mpc8610_hpcd.c        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/86xx/mpc8610_hpcd.c     2008-04-19 16:40:52.000000000 +0200
-@@ -52,7 +52,7 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
++++ linux-2.6.25.1/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
+@@ -52,7 +52,7 @@ static int __init mpc8610_declare_of_pla

  }
  machine_device_initcall(mpc86xx_hpcd, mpc8610_declare_of_platform_devices);
  
  }
  machine_device_initcall(mpc86xx_hpcd, mpc8610_declare_of_platform_devices);
  


@@ -92663,7 +92944,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/86xx/mpc8610_hpcd.c po
  mpc86xx_hpcd_init_irq(void)
  {
        struct mpic *mpic1;
  mpc86xx_hpcd_init_irq(void)
  {
        struct mpic *mpic1;

-@@ -200,7 +200,7 @@
+@@ -200,7 +200,7 @@ static int __init mpc86xx_hpcd_probe(voi

        return 0;
  }
  
        return 0;
  }
  


@@ -92672,10 +92953,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/86xx/mpc8610_hpcd.c po
  mpc86xx_time_init(void)
  {
        unsigned int temp;
  mpc86xx_time_init(void)
  {
        unsigned int temp;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c powerpc.git/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c     2008-04-19 16:40:52.000000000 +0200
-@@ -55,7 +55,7 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
++++ linux-2.6.25.1/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+@@ -55,7 +55,7 @@ static void mpc86xx_8259_cascade(unsigne

  }
  #endif        /* CONFIG_PCI */
  
  }
  #endif        /* CONFIG_PCI */
  


@@ -92684,7 +92966,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c po
  mpc86xx_hpcn_init_irq(void)
  {
        struct mpic *mpic1;
  mpc86xx_hpcn_init_irq(void)
  {
        struct mpic *mpic1;

-@@ -162,7 +162,7 @@
+@@ -162,7 +162,7 @@ mpc86xx_hpcn_setup_arch(void)

  }
  
  
  }
  
  


@@ -92693,7 +92975,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c po
  mpc86xx_hpcn_show_cpuinfo(struct seq_file *m)
  {
        struct device_node *root;
  mpc86xx_hpcn_show_cpuinfo(struct seq_file *m)
  {
        struct device_node *root;

-@@ -190,13 +190,19 @@
+@@ -190,13 +190,19 @@ static int __init mpc86xx_hpcn_probe(voi

  {
        unsigned long root = of_get_flat_dt_root();
  
  {
        unsigned long root = of_get_flat_dt_root();
  


@@ -92715,9 +92997,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c po
  mpc86xx_time_init(void)
  {
        unsigned int temp;
  mpc86xx_time_init(void)
  {
        unsigned int temp;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/86xx/sbc8641d.c powerpc.git/arch/powerpc/platforms/86xx/sbc8641d.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/86xx/sbc8641d.c    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/86xx/sbc8641d.c 2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/86xx/sbc8641d.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/platforms/86xx/sbc8641d.c

 @@ -0,0 +1,164 @@
 +/*
 + * SBC8641D board specific routines
 @@ -0,0 +1,164 @@
 +/*
 + * SBC8641D board specific routines


@@ -92883,10 +93166,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/86xx/sbc8641d.c powerp
 +      .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
 +#endif
 +};
 +      .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
 +#endif
 +};

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/8xx/Kconfig powerpc.git/arch/powerpc/platforms/8xx/Kconfig
---- linux-2.6.25-rc9/arch/powerpc/platforms/8xx/Kconfig        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/8xx/Kconfig     2008-04-19 16:40:52.000000000 +0200
-@@ -18,7 +18,6 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/8xx/Kconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/8xx/Kconfig
++++ linux-2.6.25.1/arch/powerpc/platforms/8xx/Kconfig
+@@ -18,7 +18,6 @@ config MPC8XXFADS

  config MPC86XADS
        bool "MPC86XADS"
        select CPM1
  config MPC86XADS
        bool "MPC86XADS"
        select CPM1


@@ -92894,7 +93178,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/8xx/Kconfig powerpc.gi
        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

-@@ -27,7 +26,6 @@
+@@ -27,7 +26,6 @@ config MPC86XADS

  config MPC885ADS
        bool "MPC885ADS"
        select CPM1
  config MPC885ADS
        bool "MPC885ADS"
        select CPM1


@@ -92902,7 +93186,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/8xx/Kconfig powerpc.gi
        help
          Freescale Semiconductor MPC885 Application Development System (ADS).
          Also known as DUET.
        help
          Freescale Semiconductor MPC885 Application Development System (ADS).
          Also known as DUET.

-@@ -37,7 +35,6 @@
+@@ -37,7 +35,6 @@ config MPC885ADS

  config PPC_EP88XC
        bool "Embedded Planet EP88xC (a.k.a. CWH-PPC-885XN-VE)"
        select CPM1
  config PPC_EP88XC
        bool "Embedded Planet EP88xC (a.k.a. CWH-PPC-885XN-VE)"
        select CPM1


@@ -92910,7 +93194,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/8xx/Kconfig powerpc.gi
        help
          This enables support for the Embedded Planet EP88xC board.
  
        help
          This enables support for the Embedded Planet EP88xC board.
  

-@@ -47,7 +44,6 @@
+@@ -47,7 +44,6 @@ config PPC_EP88XC

  config PPC_ADDER875
        bool "Analogue & Micro Adder 875"
        select CPM1
  config PPC_ADDER875
        bool "Analogue & Micro Adder 875"
        select CPM1


@@ -92918,10 +93202,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/8xx/Kconfig powerpc.gi
        select REDBOOT
        help
          This enables support for the Analogue & Micro Adder 875
        select REDBOOT
        help
          This enables support for the Analogue & Micro Adder 875

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/8xx/m8xx_setup.c powerpc.git/arch/powerpc/platforms/8xx/m8xx_setup.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/8xx/m8xx_setup.c   2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/8xx/m8xx_setup.c        2008-03-17 14:03:31.000000000 +0100
-@@ -111,17 +111,12 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/8xx/m8xx_setup.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/8xx/m8xx_setup.c
++++ linux-2.6.25.1/arch/powerpc/platforms/8xx/m8xx_setup.c
+@@ -111,17 +111,12 @@ void __init mpc8xx_calibrate_decr(void)

  
        /* Processor frequency is MHz.
         */
  
        /* Processor frequency is MHz.
         */


@@ -92940,10 +93225,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/8xx/m8xx_setup.c power
        printk("Decrementer Frequency = 0x%lx\n", ppc_tb_freq);
  
        /* Perform some more timer/timebase initialization.  This used
        printk("Decrementer Frequency = 0x%lx\n", ppc_tb_freq);
  
        /* Perform some more timer/timebase initialization.  This used

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/Kconfig powerpc.git/arch/powerpc/platforms/Kconfig
---- linux-2.6.25-rc9/arch/powerpc/platforms/Kconfig    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/Kconfig 2008-04-19 16:40:52.000000000 +0200
-@@ -290,13 +290,7 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/Kconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/Kconfig
++++ linux-2.6.25.1/arch/powerpc/platforms/Kconfig
+@@ -290,13 +290,7 @@ config CPM2

  config PPC_CPM_NEW_BINDING
        bool
        depends on CPM1 || CPM2
  config PPC_CPM_NEW_BINDING
        bool
        depends on CPM1 || CPM2


@@ -92958,10 +93244,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/Kconfig powerpc.git/ar
  
  config AXON_RAM
        tristate "Axon DDR2 memory device driver"
  
  config AXON_RAM
        tristate "Axon DDR2 memory device driver"

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/Kconfig.cputype powerpc.git/arch/powerpc/platforms/Kconfig.cputype
---- linux-2.6.25-rc9/arch/powerpc/platforms/Kconfig.cputype    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/Kconfig.cputype 2008-04-19 16:40:52.000000000 +0200
-@@ -41,11 +41,13 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/Kconfig.cputype
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/Kconfig.cputype
++++ linux-2.6.25.1/arch/powerpc/platforms/Kconfig.cputype
+@@ -41,11 +41,13 @@ config 40x

        bool "AMCC 40x"
        select PPC_DCR_NATIVE
        select PPC_UDBG_16550
        bool "AMCC 40x"
        select PPC_DCR_NATIVE
        select PPC_UDBG_16550


@@ -92975,9 +93262,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/Kconfig.cputype powerp
  
  config E200
        bool "Freescale e200"
  
  config E200
        bool "Freescale e200"

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/iommu.c powerpc.git/arch/powerpc/platforms/cell/iommu.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/cell/iommu.c       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/cell/iommu.c    2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/cell/iommu.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/cell/iommu.c
++++ linux-2.6.25.1/arch/powerpc/platforms/cell/iommu.c

 @@ -28,13 +28,13 @@
  #include <linux/notifier.h>
  #include <linux/of.h>
 @@ -28,13 +28,13 @@
  #include <linux/notifier.h>
  #include <linux/of.h>


@@ -92993,7 +93281,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/iommu.c powerpc.g
  #include <asm/firmware.h>
  #include <asm/cell-regs.h>
  
  #include <asm/firmware.h>
  #include <asm/cell-regs.h>
  

-@@ -316,7 +316,7 @@
+@@ -316,7 +316,7 @@ static void cell_iommu_setup_stab(struct

        segments = max(dbase + dsize, fbase + fsize) >> IO_SEGMENT_SHIFT;
  
        pr_debug("%s: iommu[%d]: segments: %lu\n",
        segments = max(dbase + dsize, fbase + fsize) >> IO_SEGMENT_SHIFT;
  
        pr_debug("%s: iommu[%d]: segments: %lu\n",


@@ -93002,7 +93290,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/iommu.c powerpc.g
  
        /* set up the segment table */
        stab_size = segments * sizeof(unsigned long);
  
        /* set up the segment table */
        stab_size = segments * sizeof(unsigned long);

-@@ -343,7 +343,7 @@
+@@ -343,7 +343,7 @@ static unsigned long *cell_iommu_alloc_p

                                (1 << 12) / sizeof(unsigned long));
  
        ptab_size = segments * pages_per_segment * sizeof(unsigned long);
                                (1 << 12) / sizeof(unsigned long));
  
        ptab_size = segments * pages_per_segment * sizeof(unsigned long);


@@ -93011,7 +93299,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/iommu.c powerpc.g
                        iommu->nid, ptab_size, get_order(ptab_size));
        page = alloc_pages_node(iommu->nid, GFP_KERNEL, get_order(ptab_size));
        BUG_ON(!page);
                        iommu->nid, ptab_size, get_order(ptab_size));
        page = alloc_pages_node(iommu->nid, GFP_KERNEL, get_order(ptab_size));
        BUG_ON(!page);

-@@ -355,7 +355,7 @@
+@@ -355,7 +355,7 @@ static unsigned long *cell_iommu_alloc_p

        n_pte_pages = (pages_per_segment * sizeof(unsigned long)) >> 12;
  
        pr_debug("%s: iommu[%d]: stab at %p, ptab at %p, n_pte_pages: %lu\n",
        n_pte_pages = (pages_per_segment * sizeof(unsigned long)) >> 12;
  
        pr_debug("%s: iommu[%d]: stab at %p, ptab at %p, n_pte_pages: %lu\n",


@@ -93020,7 +93308,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/iommu.c powerpc.g
                        n_pte_pages);
  
        /* initialise the STEs */
                        n_pte_pages);
  
        /* initialise the STEs */

-@@ -394,7 +394,7 @@
+@@ -394,7 +394,7 @@ static void cell_iommu_enable_hardware(s

  
        if (cell_iommu_find_ioc(iommu->nid, &xlate_base))
                panic("%s: missing IOC register mappings for node %d\n",
  
        if (cell_iommu_find_ioc(iommu->nid, &xlate_base))
                panic("%s: missing IOC register mappings for node %d\n",


@@ -93029,10 +93317,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/iommu.c powerpc.g
  
        iommu->xlate_regs = ioremap(xlate_base, IOC_Reg_Size);
        iommu->cmd_regs = iommu->xlate_regs + IOC_IOCmd_Offset;
  
        iommu->xlate_regs = ioremap(xlate_base, IOC_Reg_Size);
        iommu->cmd_regs = iommu->xlate_regs + IOC_IOCmd_Offset;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/pervasive.c powerpc.git/arch/powerpc/platforms/cell/pervasive.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/cell/pervasive.c   2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/cell/pervasive.c        2008-04-19 16:40:52.000000000 +0200
-@@ -65,7 +65,7 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/cell/pervasive.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/cell/pervasive.c
++++ linux-2.6.25.1/arch/powerpc/platforms/cell/pervasive.c
+@@ -65,7 +65,7 @@ static void cbe_power_save(void)

                break;
        default:
                printk(KERN_WARNING "%s: unknown configuration\n",
                break;
        default:
                printk(KERN_WARNING "%s: unknown configuration\n",


@@ -93041,10 +93330,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/pervasive.c power
                break;
        }
        mtspr(SPRN_TSC_CELL, thread_switch_control);
                break;
        }
        mtspr(SPRN_TSC_CELL, thread_switch_control);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/ras.c powerpc.git/arch/powerpc/platforms/cell/ras.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/cell/ras.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/cell/ras.c      2008-04-19 16:40:52.000000000 +0200
-@@ -132,7 +132,7 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/cell/ras.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/cell/ras.c
++++ linux-2.6.25.1/arch/powerpc/platforms/cell/ras.c
+@@ -132,7 +132,7 @@ static int __init cbe_ptcal_enable_on_no

                                (unsigned int)(addr >> 32),
                                (unsigned int)(addr & 0xffffffff))) {
                printk(KERN_ERR "%s: error enabling PTCAL on node %d!\n",
                                (unsigned int)(addr >> 32),
                                (unsigned int)(addr & 0xffffffff))) {
                printk(KERN_ERR "%s: error enabling PTCAL on node %d!\n",


@@ -93053,7 +93343,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/ras.c powerpc.git
                goto out_free_pages;
        }
  
                goto out_free_pages;
        }
  

-@@ -162,7 +162,7 @@
+@@ -162,7 +162,7 @@ static int __init cbe_ptcal_enable(void)

        if (!size)
                return -ENODEV;
  
        if (!size)
                return -ENODEV;
  


@@ -93062,7 +93352,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/ras.c powerpc.git
        order = get_order(*size);
        of_node_put(np);
  
        order = get_order(*size);
        of_node_put(np);
  

-@@ -180,7 +180,7 @@
+@@ -180,7 +180,7 @@ static int __init cbe_ptcal_enable(void)

                const u32 *nid = of_get_property(np, "node-id", NULL);
                if (!nid) {
                        printk(KERN_ERR "%s: node %s is missing node-id?\n",
                const u32 *nid = of_get_property(np, "node-id", NULL);
                if (!nid) {
                        printk(KERN_ERR "%s: node %s is missing node-id?\n",


@@ -93071,7 +93361,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/ras.c powerpc.git
                        continue;
                }
                cbe_ptcal_enable_on_node(*nid, order);
                        continue;
                }
                cbe_ptcal_enable_on_node(*nid, order);

-@@ -195,13 +195,13 @@
+@@ -195,13 +195,13 @@ static int cbe_ptcal_disable(void)

        struct ptcal_area *area, *tmp;
        int ret = 0;
  
        struct ptcal_area *area, *tmp;
        int ret = 0;
  


@@ -93087,10 +93377,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/ras.c powerpc.git
                                        area->nid);
                        ret = -EIO;
                        continue;
                                        area->nid);
                        ret = -EIO;
                        continue;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spu_base.c powerpc.git/arch/powerpc/platforms/cell/spu_base.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/cell/spu_base.c    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/cell/spu_base.c 2008-04-19 16:40:52.000000000 +0200
-@@ -165,7 +165,7 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/cell/spu_base.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/cell/spu_base.c
++++ linux-2.6.25.1/arch/powerpc/platforms/cell/spu_base.c
+@@ -165,7 +165,7 @@ static int __spu_trap_data_seg(struct sp

        struct spu_slb slb;
        int psize;
  
        struct spu_slb slb;
        int psize;
  


@@ -93099,7 +93390,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spu_base.c powerp
  
        slb.esid = (ea & ESID_MASK) | SLB_ESID_V;
  
  
        slb.esid = (ea & ESID_MASK) | SLB_ESID_V;
  

-@@ -215,7 +215,7 @@
+@@ -215,7 +215,7 @@ static int __spu_trap_data_seg(struct sp

  extern int hash_page(unsigned long ea, unsigned long access, unsigned long trap); //XXX
  static int __spu_trap_data_map(struct spu *spu, unsigned long ea, u64 dsisr)
  {
  extern int hash_page(unsigned long ea, unsigned long access, unsigned long trap); //XXX
  static int __spu_trap_data_map(struct spu *spu, unsigned long ea, u64 dsisr)
  {


@@ -93108,7 +93399,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spu_base.c powerp
  
        /* Handle kernel space hash faults immediately.
           User hash faults need to be deferred to process context. */
  
        /* Handle kernel space hash faults immediately.
           User hash faults need to be deferred to process context. */

-@@ -351,7 +351,7 @@
+@@ -351,7 +351,7 @@ spu_irq_class_1(int irq, void *data)

                __spu_trap_data_seg(spu, dar);
  
        spin_unlock(&spu->register_lock);
                __spu_trap_data_seg(spu, dar);
  
        spin_unlock(&spu->register_lock);


@@ -93117,7 +93408,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spu_base.c powerp
                        dar, dsisr);
  
        if (stat & CLASS1_STORAGE_FAULT_INTR)
                        dar, dsisr);
  
        if (stat & CLASS1_STORAGE_FAULT_INTR)

-@@ -726,7 +726,7 @@
+@@ -726,7 +726,7 @@ static int __init init_spu_base(void)

  
        if (ret < 0) {
                printk(KERN_WARNING "%s: Error initializing spus\n",
  
        if (ret < 0) {
                printk(KERN_WARNING "%s: Error initializing spus\n",


@@ -93126,10 +93417,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spu_base.c powerp
                goto out_unregister_sysdev_class;
        }
  
                goto out_unregister_sysdev_class;
        }
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spu_callbacks.c powerpc.git/arch/powerpc/platforms/cell/spu_callbacks.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/cell/spu_callbacks.c       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/cell/spu_callbacks.c    2008-04-19 16:40:52.000000000 +0200
-@@ -54,7 +54,7 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/cell/spu_callbacks.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/cell/spu_callbacks.c
++++ linux-2.6.25.1/arch/powerpc/platforms/cell/spu_callbacks.c
+@@ -54,7 +54,7 @@ long spu_sys_callback(struct spu_syscall

        long (*syscall)(u64 a1, u64 a2, u64 a3, u64 a4, u64 a5, u64 a6);
  
        if (s->nr_ret >= ARRAY_SIZE(spu_syscall_table)) {
        long (*syscall)(u64 a1, u64 a2, u64 a3, u64 a4, u64 a5, u64 a6);
  
        if (s->nr_ret >= ARRAY_SIZE(spu_syscall_table)) {


@@ -93138,10 +93430,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spu_callbacks.c p
                return -ENOSYS;
        }
  
                return -ENOSYS;
        }
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spu_manage.c powerpc.git/arch/powerpc/platforms/cell/spu_manage.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/cell/spu_manage.c  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/cell/spu_manage.c       2008-04-19 16:40:52.000000000 +0200
-@@ -92,7 +92,7 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/cell/spu_manage.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/cell/spu_manage.c
++++ linux-2.6.25.1/arch/powerpc/platforms/cell/spu_manage.c
+@@ -92,7 +92,7 @@ static int __init spu_map_interrupts_old

  
        tmp = of_get_property(np->parent->parent, "node-id", NULL);
        if (!tmp) {
  
        tmp = of_get_property(np->parent->parent, "node-id", NULL);
        if (!tmp) {


@@ -93150,7 +93443,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spu_manage.c powe
                nid = spu->node;
        } else
                nid = tmp[0];
                nid = spu->node;
        } else
                nid = tmp[0];

-@@ -296,7 +296,7 @@
+@@ -296,7 +296,7 @@ static int __init of_enumerate_spus(int 

                ret = fn(node);
                if (ret) {
                        printk(KERN_WARNING "%s: Error initializing %s\n",
                ret = fn(node);
                if (ret) {
                        printk(KERN_WARNING "%s: Error initializing %s\n",


@@ -93159,7 +93452,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spu_manage.c powe
                        break;
                }
                n++;
                        break;
                }
                n++;

-@@ -327,7 +327,7 @@
+@@ -327,7 +327,7 @@ static int __init of_create_spu(struct s

                if (!legacy_map) {
                        legacy_map = 1;
                        printk(KERN_WARNING "%s: Legacy device tree found, "
                if (!legacy_map) {
                        legacy_map = 1;
                        printk(KERN_WARNING "%s: Legacy device tree found, "


@@ -93168,7 +93461,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spu_manage.c powe
                }
                ret = spu_map_device_old(spu);
                if (ret) {
                }
                ret = spu_map_device_old(spu);
                if (ret) {

-@@ -342,7 +342,7 @@
+@@ -342,7 +342,7 @@ static int __init of_create_spu(struct s

                if (!legacy_irq) {
                        legacy_irq = 1;
                        printk(KERN_WARNING "%s: Legacy device tree found, "
                if (!legacy_irq) {
                        legacy_irq = 1;
                        printk(KERN_WARNING "%s: Legacy device tree found, "


@@ -93177,10 +93470,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spu_manage.c powe
                }
                ret = spu_map_interrupts_old(spu, spe);
                if (ret) {
                }
                ret = spu_map_interrupts_old(spu, spe);
                if (ret) {

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spufs/coredump.c powerpc.git/arch/powerpc/platforms/cell/spufs/coredump.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/cell/spufs/coredump.c      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/coredump.c   2008-04-19 16:40:52.000000000 +0200
-@@ -133,8 +133,6 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/cell/spufs/coredump.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/cell/spufs/coredump.c
++++ linux-2.6.25.1/arch/powerpc/platforms/cell/spufs/coredump.c
+@@ -133,8 +133,6 @@ static struct spu_context *coredump_next

                if (ctx->flags & SPU_CREATE_NOSCHED)
                        continue;
  
                if (ctx->flags & SPU_CREATE_NOSCHED)
                        continue;
  


@@ -93189,7 +93483,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spufs/coredump.c
                break;
        }
  
                break;
        }
  

-@@ -157,6 +155,9 @@
+@@ -157,6 +155,9 @@ int spufs_coredump_extra_notes_size(void

                        break;
  
                size += rc;
                        break;
  
                size += rc;


@@ -93199,7 +93493,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spufs/coredump.c
        }
  
        return size;
        }
  
        return size;

-@@ -239,6 +240,9 @@
+@@ -239,6 +240,9 @@ int spufs_coredump_extra_notes_write(str

                }
  
                spu_release_saved(ctx);
                }
  
                spu_release_saved(ctx);


@@ -93209,10 +93503,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spufs/coredump.c
        }
  
        return 0;
        }
  
        return 0;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spufs/file.c powerpc.git/arch/powerpc/platforms/cell/spufs/file.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/cell/spufs/file.c  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/file.c       2008-04-19 16:40:52.000000000 +0200
-@@ -1337,7 +1337,7 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/cell/spufs/file.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/cell/spufs/file.c
++++ linux-2.6.25.1/arch/powerpc/platforms/cell/spufs/file.c
+@@ -1337,7 +1337,7 @@ static u64 spufs_signal1_type_get(struct

        return ctx->ops->signal1_type_get(ctx);
  }
  DEFINE_SPUFS_ATTRIBUTE(spufs_signal1_type, spufs_signal1_type_get,
        return ctx->ops->signal1_type_get(ctx);
  }
  DEFINE_SPUFS_ATTRIBUTE(spufs_signal1_type, spufs_signal1_type_get,


@@ -93221,7 +93516,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spufs/file.c powe
  
  
  static int spufs_signal2_type_set(void *data, u64 val)
  
  
  static int spufs_signal2_type_set(void *data, u64 val)

-@@ -1359,7 +1359,7 @@
+@@ -1359,7 +1359,7 @@ static u64 spufs_signal2_type_get(struct

        return ctx->ops->signal2_type_get(ctx);
  }
  DEFINE_SPUFS_ATTRIBUTE(spufs_signal2_type, spufs_signal2_type_get,
        return ctx->ops->signal2_type_get(ctx);
  }
  DEFINE_SPUFS_ATTRIBUTE(spufs_signal2_type, spufs_signal2_type_get,


@@ -93230,7 +93525,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spufs/file.c powe
  
  #if SPUFS_MMAP_4K
  static unsigned long spufs_mss_mmap_nopfn(struct vm_area_struct *vma,
  
  #if SPUFS_MMAP_4K
  static unsigned long spufs_mss_mmap_nopfn(struct vm_area_struct *vma,

-@@ -1556,7 +1556,7 @@
+@@ -1556,7 +1556,7 @@ void spufs_mfc_callback(struct spu *spu)

  
        wake_up_all(&ctx->mfc_wq);
  
  
        wake_up_all(&ctx->mfc_wq);
  


@@ -93239,7 +93534,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spufs/file.c powe
        if (ctx->mfc_fasync) {
                u32 free_elements, tagstatus;
                unsigned int mask;
        if (ctx->mfc_fasync) {
                u32 free_elements, tagstatus;
                unsigned int mask;

-@@ -1790,7 +1790,7 @@
+@@ -1790,7 +1790,7 @@ static unsigned int spufs_mfc_poll(struc

        if (tagstatus & ctx->tagwait)
                mask |= POLLIN | POLLRDNORM;
  
        if (tagstatus & ctx->tagwait)
                mask |= POLLIN | POLLRDNORM;
  


@@ -93248,10 +93543,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spufs/file.c powe
                free_elements, tagstatus, ctx->tagwait);
  
        return mask;
                free_elements, tagstatus, ctx->tagwait);
  
        return mask;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spufs/run.c powerpc.git/arch/powerpc/platforms/cell/spufs/run.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/cell/spufs/run.c   2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/run.c        2008-04-19 16:40:52.000000000 +0200
-@@ -98,7 +98,7 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/cell/spufs/run.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/cell/spufs/run.c
++++ linux-2.6.25.1/arch/powerpc/platforms/cell/spufs/run.c
+@@ -98,7 +98,7 @@ static int spu_setup_isolated(struct spu

                        != MFC_CNTL_PURGE_DMA_COMPLETE) {
                if (time_after(jiffies, timeout)) {
                        printk(KERN_ERR "%s: timeout flushing MFC DMA queue\n",
                        != MFC_CNTL_PURGE_DMA_COMPLETE) {
                if (time_after(jiffies, timeout)) {
                        printk(KERN_ERR "%s: timeout flushing MFC DMA queue\n",


@@ -93260,7 +93556,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spufs/run.c power
                        ret = -EIO;
                        goto out;
                }
                        ret = -EIO;
                        goto out;
                }

-@@ -124,7 +124,7 @@
+@@ -124,7 +124,7 @@ static int spu_setup_isolated(struct spu

                                status_loading) {
                if (time_after(jiffies, timeout)) {
                        printk(KERN_ERR "%s: timeout waiting for loader\n",
                                status_loading) {
                if (time_after(jiffies, timeout)) {
                        printk(KERN_ERR "%s: timeout waiting for loader\n",


@@ -93269,7 +93565,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spufs/run.c power
                        ret = -EIO;
                        goto out_drop_priv;
                }
                        ret = -EIO;
                        goto out_drop_priv;
                }

-@@ -134,7 +134,7 @@
+@@ -134,7 +134,7 @@ static int spu_setup_isolated(struct spu

        if (!(status & SPU_STATUS_RUNNING)) {
                /* If isolated LOAD has failed: run SPU, we will get a stop-and
                 * signal later. */
        if (!(status & SPU_STATUS_RUNNING)) {
                /* If isolated LOAD has failed: run SPU, we will get a stop-and
                 * signal later. */


@@ -93278,7 +93574,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spufs/run.c power
                ctx->ops->runcntl_write(ctx, SPU_RUNCNTL_RUNNABLE);
                ret = -EACCES;
                goto out_drop_priv;
                ctx->ops->runcntl_write(ctx, SPU_RUNCNTL_RUNNABLE);
                ret = -EACCES;
                goto out_drop_priv;

-@@ -142,7 +142,7 @@
+@@ -142,7 +142,7 @@ static int spu_setup_isolated(struct spu

  
        if (!(status & SPU_STATUS_ISOLATED_STATE)) {
                /* This isn't allowed by the CBEA, but check anyway */
  
        if (!(status & SPU_STATUS_ISOLATED_STATE)) {
                /* This isn't allowed by the CBEA, but check anyway */


@@ -93287,7 +93583,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spufs/run.c power
                ctx->ops->runcntl_write(ctx, SPU_RUNCNTL_STOP);
                ret = -EINVAL;
                goto out_drop_priv;
                ctx->ops->runcntl_write(ctx, SPU_RUNCNTL_STOP);
                ret = -EINVAL;
                goto out_drop_priv;

-@@ -282,7 +282,7 @@
+@@ -282,7 +282,7 @@ static int spu_handle_restartsys(struct 

                break;
        default:
                printk(KERN_WARNING "%s: unexpected return code %ld\n",
                break;
        default:
                printk(KERN_WARNING "%s: unexpected return code %ld\n",


@@ -93296,7 +93592,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spufs/run.c power
                ret = 0;
        }
        return ret;
                ret = 0;
        }
        return ret;

-@@ -323,6 +323,10 @@
+@@ -323,6 +323,10 @@ static int spu_process_callback(struct s

                        return -EINTR;
        }
  
                        return -EINTR;
        }
  


@@ -93307,10 +93603,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spufs/run.c power
        /* write result, jump over indirect pointer */
        memcpy_toio(ls + ls_pointer, &spu_ret, sizeof(spu_ret));
        ctx->ops->npc_write(ctx, npc);
        /* write result, jump over indirect pointer */
        memcpy_toio(ls + ls_pointer, &spu_ret, sizeof(spu_ret));
        ctx->ops->npc_write(ctx, npc);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spufs/switch.c powerpc.git/arch/powerpc/platforms/cell/spufs/switch.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/cell/spufs/switch.c        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/switch.c     2008-04-19 16:40:52.000000000 +0200
-@@ -1815,6 +1815,7 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/cell/spufs/switch.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/cell/spufs/switch.c
++++ linux-2.6.25.1/arch/powerpc/platforms/cell/spufs/switch.c
+@@ -1815,6 +1815,7 @@ static void save_csa(struct spu_state *p

        save_mfc_csr_ato(prev, spu);    /* Step 24. */
        save_mfc_tclass_id(prev, spu);  /* Step 25. */
        set_mfc_tclass_id(prev, spu);   /* Step 26. */
        save_mfc_csr_ato(prev, spu);    /* Step 24. */
        save_mfc_tclass_id(prev, spu);  /* Step 25. */
        set_mfc_tclass_id(prev, spu);   /* Step 26. */


@@ -93318,7 +93615,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spufs/switch.c po
        purge_mfc_queue(prev, spu);     /* Step 27. */
        wait_purge_complete(prev, spu); /* Step 28. */
        setup_mfc_sr1(prev, spu);       /* Step 30. */
        purge_mfc_queue(prev, spu);     /* Step 27. */
        wait_purge_complete(prev, spu); /* Step 28. */
        setup_mfc_sr1(prev, spu);       /* Step 30. */

-@@ -1831,7 +1832,6 @@
+@@ -1831,7 +1832,6 @@ static void save_csa(struct spu_state *p

        save_ppuint_mb(prev, spu);      /* Step 41. */
        save_ch_part1(prev, spu);       /* Step 42. */
        save_spu_mb(prev, spu);         /* Step 43. */
        save_ppuint_mb(prev, spu);      /* Step 41. */
        save_ch_part1(prev, spu);       /* Step 42. */
        save_spu_mb(prev, spu);         /* Step 43. */


@@ -93326,10 +93623,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spufs/switch.c po
        reset_ch(prev, spu);            /* Step 45. */
  }
  
        reset_ch(prev, spu);            /* Step 45. */
  }
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/beat.c powerpc.git/arch/powerpc/platforms/celleb/beat.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/celleb/beat.c      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/celleb/beat.c   2008-04-19 16:40:52.000000000 +0200
-@@ -48,6 +48,7 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/celleb/beat.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/celleb/beat.c
++++ linux-2.6.25.1/arch/powerpc/platforms/celleb/beat.c
+@@ -48,6 +48,7 @@ void beat_power_off(void)

  }
  
  u64 beat_halt_code = 0x1000000000000000UL;
  }
  
  u64 beat_halt_code = 0x1000000000000000UL;


@@ -93337,7 +93635,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/beat.c powerpc.
  
  void beat_halt(void)
  {
  
  void beat_halt(void)
  {

-@@ -94,9 +95,8 @@
+@@ -94,9 +95,8 @@ ssize_t beat_nvram_read(char *buf, size_

                len = count;
                if (len > BEAT_NVRW_CNT)
                        len = BEAT_NVRW_CNT;
                len = count;
                if (len > BEAT_NVRW_CNT)
                        len = BEAT_NVRW_CNT;


@@ -93348,7 +93646,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/beat.c powerpc.
  
                p += len;
                i += len;
  
                p += len;
                i += len;

-@@ -121,9 +121,8 @@
+@@ -121,9 +121,8 @@ ssize_t beat_nvram_write(char *buf, size

                len = count;
                if (len > BEAT_NVRW_CNT)
                        len = BEAT_NVRW_CNT;
                len = count;
                if (len > BEAT_NVRW_CNT)
                        len = BEAT_NVRW_CNT;


@@ -93359,7 +93657,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/beat.c powerpc.
  
                p += len;
                i += len;
  
                p += len;
                i += len;

-@@ -149,13 +148,14 @@
+@@ -149,13 +148,14 @@ int64_t beat_get_term_char(u64 vterm, u6

        u64 db[2];
        s64 ret;
  
        u64 db[2];
        s64 ret;
  


@@ -93375,7 +93673,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/beat.c powerpc.
  
  int64_t beat_put_term_char(u64 vterm, u64 len, u64 t1, u64 t2)
  {
  
  int64_t beat_put_term_char(u64 vterm, u64 len, u64 t1, u64 t2)
  {

-@@ -163,8 +163,9 @@
+@@ -163,8 +163,9 @@ int64_t beat_put_term_char(u64 vterm, u6

  
        db[0] = t1;
        db[1] = t2;
  
        db[0] = t1;
        db[1] = t2;


@@ -93386,7 +93684,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/beat.c powerpc.
  
  void beat_power_save(void)
  {
  
  void beat_power_save(void)
  {

-@@ -261,7 +262,3 @@
+@@ -261,7 +262,3 @@ static int __init beat_event_init(void)

  }
  
  device_initcall(beat_event_init);
  }
  
  device_initcall(beat_event_init);


@@ -93394,9 +93692,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/beat.c powerpc.
 -EXPORT_SYMBOL(beat_get_term_char);
 -EXPORT_SYMBOL(beat_put_term_char);
 -EXPORT_SYMBOL(beat_halt_code);
 -EXPORT_SYMBOL(beat_get_term_char);
 -EXPORT_SYMBOL(beat_put_term_char);
 -EXPORT_SYMBOL(beat_halt_code);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/beat.h powerpc.git/arch/powerpc/platforms/celleb/beat.h
---- linux-2.6.25-rc9/arch/powerpc/platforms/celleb/beat.h      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/celleb/beat.h   2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/celleb/beat.h
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/celleb/beat.h
++++ linux-2.6.25.1/arch/powerpc/platforms/celleb/beat.h

 @@ -21,8 +21,8 @@
  #ifndef _CELLEB_BEAT_H
  #define _CELLEB_BEAT_H
 @@ -21,8 +21,8 @@
  #ifndef _CELLEB_BEAT_H
  #define _CELLEB_BEAT_H


@@ -93408,10 +93707,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/beat.h powerpc.
  int64_t beat_repository_encode(int, const char *, uint64_t[4]);
  void beat_restart(char *);
  void beat_power_off(void);
  int64_t beat_repository_encode(int, const char *, uint64_t[4]);
  void beat_restart(char *);
  void beat_power_off(void);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/beat_wrapper.h powerpc.git/arch/powerpc/platforms/celleb/beat_wrapper.h
---- linux-2.6.25-rc9/arch/powerpc/platforms/celleb/beat_wrapper.h      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/celleb/beat_wrapper.h   2008-04-19 16:40:52.000000000 +0200
-@@ -197,7 +197,8 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/celleb/beat_wrapper.h
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/celleb/beat_wrapper.h
++++ linux-2.6.25.1/arch/powerpc/platforms/celleb/beat_wrapper.h
+@@ -197,7 +197,8 @@ static inline s64 beat_put_characters_to

        u64 b[2];
  
        memcpy(b, buffer, len);
        u64 b[2];
  
        memcpy(b, buffer, len);


@@ -93421,9 +93721,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/beat_wrapper.h
  }
  
  static inline s64 beat_get_spe_privileged_state_1_registers(
  }
  
  static inline s64 beat_get_spe_privileged_state_1_registers(

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/htab.c powerpc.git/arch/powerpc/platforms/celleb/htab.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/celleb/htab.c      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/celleb/htab.c   2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/celleb/htab.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/celleb/htab.c
++++ linux-2.6.25.1/arch/powerpc/platforms/celleb/htab.c

 @@ -35,9 +35,9 @@
  #include "beat_wrapper.h"
  
 @@ -35,9 +35,9 @@
  #include "beat_wrapper.h"
  


@@ -93436,7 +93737,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/htab.c powerpc.
  #endif
  
  static DEFINE_SPINLOCK(beat_htab_lock);
  #endif
  
  static DEFINE_SPINLOCK(beat_htab_lock);

-@@ -116,7 +116,8 @@
+@@ -116,7 +116,8 @@ static long beat_lpar_hpte_insert(unsign

                hpte_r &= ~_PAGE_COHERENT;
  
        spin_lock(&beat_htab_lock);
                hpte_r &= ~_PAGE_COHERENT;
  
        spin_lock(&beat_htab_lock);


@@ -93446,10 +93747,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/htab.c powerpc.
                if (!(vflags & HPTE_V_BOLTED))
                        DBG_LOW(" full\n");
                spin_unlock(&beat_htab_lock);
                if (!(vflags & HPTE_V_BOLTED))
                        DBG_LOW(" full\n");
                spin_unlock(&beat_htab_lock);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/interrupt.c powerpc.git/arch/powerpc/platforms/celleb/interrupt.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/celleb/interrupt.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/celleb/interrupt.c      2008-04-19 16:40:52.000000000 +0200
-@@ -34,7 +34,7 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/celleb/interrupt.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/celleb/interrupt.c
++++ linux-2.6.25.1/arch/powerpc/platforms/celleb/interrupt.c
+@@ -34,7 +34,7 @@ static DEFINE_SPINLOCK(beatic_irq_mask_l

  static uint64_t       beatic_irq_mask_enable[(MAX_IRQS+255)/64];
  static uint64_t       beatic_irq_mask_ack[(MAX_IRQS+255)/64];
  
  static uint64_t       beatic_irq_mask_enable[(MAX_IRQS+255)/64];
  static uint64_t       beatic_irq_mask_ack[(MAX_IRQS+255)/64];
  


@@ -93458,7 +93760,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/interrupt.c pow
  
  /*
   * In this implementation, "virq" == "IRQ plug number",
  
  /*
   * In this implementation, "virq" == "IRQ plug number",

-@@ -49,13 +49,13 @@
+@@ -49,13 +49,13 @@ static inline void beatic_update_irq_mas

  
        off = (irq_plug / 256) * 4;
        masks[0] = beatic_irq_mask_enable[off + 0]
  
        off = (irq_plug / 256) * 4;
        masks[0] = beatic_irq_mask_enable[off + 0]


@@ -93476,7 +93778,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/interrupt.c pow
        if (beat_set_interrupt_mask(irq_plug&~255UL,
                masks[0], masks[1], masks[2], masks[3]) != 0)
                panic("Failed to set mask IRQ!");
        if (beat_set_interrupt_mask(irq_plug&~255UL,
                masks[0], masks[1], masks[2], masks[3]) != 0)
                panic("Failed to set mask IRQ!");

-@@ -96,7 +96,8 @@
+@@ -96,7 +96,8 @@ static void beatic_end_irq(unsigned int 

        s64 err;
        unsigned long flags;
  
        s64 err;
        unsigned long flags;
  


@@ -93486,7 +93788,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/interrupt.c pow
                if ((err & 0xFFFFFFFF) != 0xFFFFFFF5) /* -11: wrong state */
                        panic("Failed to downcount IRQ! Error = %16lx", err);
  
                if ((err & 0xFFFFFFFF) != 0xFFFFFFF5) /* -11: wrong state */
                        panic("Failed to downcount IRQ! Error = %16lx", err);
  

-@@ -138,7 +139,8 @@
+@@ -138,7 +139,8 @@ static int beatic_pic_host_map(struct ir

        struct irq_desc *desc = get_irq_desc(virq);
        int64_t err;
  
        struct irq_desc *desc = get_irq_desc(virq);
        int64_t err;
  


@@ -93496,7 +93798,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/interrupt.c pow
                return -EIO;
  
        desc->status |= IRQ_LEVEL;
                return -EIO;
  
        desc->status |= IRQ_LEVEL;

-@@ -202,22 +204,22 @@
+@@ -202,22 +204,22 @@ static inline unsigned int beatic_get_ir

                beat_detect_pending_interrupts(i, pending);
                __asm__ ("cntlzd %0,%1":"=r"(ub):
                        "r"(pending[0] & beatic_irq_mask_enable[i/64+0]
                beat_detect_pending_interrupts(i, pending);
                __asm__ ("cntlzd %0,%1":"=r"(ub):
                        "r"(pending[0] & beatic_irq_mask_enable[i/64+0]


@@ -93523,7 +93825,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/interrupt.c pow
                if (ub != 64)
                        return i + ub + 192;
        }
                if (ub != 64)
                        return i + ub + 192;
        }

-@@ -250,7 +252,7 @@
+@@ -250,7 +252,7 @@ void __init beatic_init_IRQ(void)

  
        /* Allocate an irq host */
        beatic_host = irq_alloc_host(NULL, IRQ_HOST_MAP_NOMAP, 0,
  
        /* Allocate an irq host */
        beatic_host = irq_alloc_host(NULL, IRQ_HOST_MAP_NOMAP, 0,


@@ -93532,10 +93834,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/interrupt.c pow
                                         0);
        BUG_ON(beatic_host == NULL);
        irq_set_default_host(beatic_host);
                                         0);
        BUG_ON(beatic_host == NULL);
        irq_set_default_host(beatic_host);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/scc_epci.c powerpc.git/arch/powerpc/platforms/celleb/scc_epci.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/celleb/scc_epci.c  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/celleb/scc_epci.c       2008-04-19 16:40:52.000000000 +0200
-@@ -161,9 +161,9 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/celleb/scc_epci.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/celleb/scc_epci.c
++++ linux-2.6.25.1/arch/powerpc/platforms/celleb/scc_epci.c
+@@ -161,9 +161,9 @@ static PCI_IO_ADDR celleb_epci_make_conf

        if (bus != hose->bus)
                addr = celleb_epci_get_epci_cfg(hose) +
                       (((bus->number & 0xff) << 16)
        if (bus != hose->bus)
                addr = celleb_epci_get_epci_cfg(hose) +
                       (((bus->number & 0xff) << 16)


@@ -93548,7 +93851,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/scc_epci.c powe
        else
                addr = celleb_epci_get_epci_cfg(hose) +
                       (((devfn & 0xff) << 8) | (where & 0xff));
        else
                addr = celleb_epci_get_epci_cfg(hose) +
                       (((devfn & 0xff) << 8) | (where & 0xff));

-@@ -174,7 +174,7 @@
+@@ -174,7 +174,7 @@ static PCI_IO_ADDR celleb_epci_make_conf

  }
  
  static int celleb_epci_read_config(struct pci_bus *bus,
  }
  
  static int celleb_epci_read_config(struct pci_bus *bus,


@@ -93557,9 +93860,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/scc_epci.c powe
  {
        PCI_IO_ADDR epci_base;
        PCI_IO_ADDR addr;
  {
        PCI_IO_ADDR epci_base;
        PCI_IO_ADDR addr;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/scc_sio.c powerpc.git/arch/powerpc/platforms/celleb/scc_sio.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/celleb/scc_sio.c   2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/celleb/scc_sio.c        2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/celleb/scc_sio.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/celleb/scc_sio.c
++++ linux-2.6.25.1/arch/powerpc/platforms/celleb/scc_sio.c

 @@ -28,7 +28,7 @@
  
  /* sio irq0=0xb00010022 irq0=0xb00010023 irq2=0xb00010024
 @@ -28,7 +28,7 @@
  
  /* sio irq0=0xb00010022 irq0=0xb00010023 irq2=0xb00010024


@@ -93569,7 +93873,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/scc_sio.c power
  
  static struct {
        uint32_t offset;
  
  static struct {
        uint32_t offset;

-@@ -84,7 +84,7 @@
+@@ -84,7 +84,7 @@ static int __init txx9_serial_config(cha

        int     i;
  
        for (;;) {
        int     i;
  
        for (;;) {


@@ -93578,10 +93882,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/scc_sio.c power
                default:
                        return 0;
                case 2:
                default:
                        return 0;
                case 2:

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/spu_priv1.c powerpc.git/arch/powerpc/platforms/celleb/spu_priv1.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/celleb/spu_priv1.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/celleb/spu_priv1.c      2008-04-19 16:40:52.000000000 +0200
-@@ -183,8 +183,7 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/celleb/spu_priv1.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/celleb/spu_priv1.c
++++ linux-2.6.25.1/arch/powerpc/platforms/celleb/spu_priv1.c
+@@ -183,8 +183,7 @@ static u64 resource_allocation_enable_ge

        return enable;
  }
  
        return enable;
  }
  


@@ -93591,10 +93896,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/spu_priv1.c pow
        .int_mask_and = int_mask_and,
        .int_mask_or = int_mask_or,
        .int_mask_set = int_mask_set,
        .int_mask_and = int_mask_and,
        .int_mask_or = int_mask_or,
        .int_mask_set = int_mask_set,

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/udbg_beat.c powerpc.git/arch/powerpc/platforms/celleb/udbg_beat.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/celleb/udbg_beat.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/celleb/udbg_beat.c      2008-04-19 16:40:52.000000000 +0200
-@@ -54,7 +54,8 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/celleb/udbg_beat.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/celleb/udbg_beat.c
++++ linux-2.6.25.1/arch/powerpc/platforms/celleb/udbg_beat.c
+@@ -54,7 +54,8 @@ static int udbg_getc_poll_beat(void)

        if (inbuflen == 0) {
                /* get some more chars. */
                inbuflen = 0;
        if (inbuflen == 0) {
                /* get some more chars. */
                inbuflen = 0;


@@ -93604,7 +93910,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/udbg_beat.c pow
                if (rc != 0)
                        inbuflen = 0;   /* otherwise inbuflen is garbage */
        }
                if (rc != 0)
                        inbuflen = 0;   /* otherwise inbuflen is garbage */
        }

-@@ -78,7 +79,7 @@
+@@ -78,7 +79,7 @@ static int udbg_getc_beat(void)

                if (ch == -1) {
                        /* This shouldn't be needed...but... */
                        volatile unsigned long delay;
                if (ch == -1) {
                        /* This shouldn't be needed...but... */
                        volatile unsigned long delay;


@@ -93613,10 +93919,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/udbg_beat.c pow
                                ;
                } else {
                        return ch;
                                ;
                } else {
                        return ch;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c powerpc.git/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c      2008-04-19 16:40:52.000000000 +0200
-@@ -117,11 +117,11 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
++++ linux-2.6.25.1/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
+@@ -117,11 +117,11 @@ static void __init mpc7448_hpc2_init_IRQ

        }
  
        if (mpic_paddr == 0) {
        }
  
        if (mpic_paddr == 0) {


@@ -93630,7 +93937,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/embedded6xx/mpc7448_hp
            (u32) mpic_paddr);
  
        mpic = mpic_alloc(tsi_pic, mpic_paddr,
            (u32) mpic_paddr);
  
        mpic = mpic_alloc(tsi_pic, mpic_paddr,

-@@ -140,17 +140,17 @@
+@@ -140,17 +140,17 @@ static void __init mpc7448_hpc2_init_IRQ

  #ifdef CONFIG_PCI
        tsi_pci = of_find_node_by_type(NULL, "pci");
        if (tsi_pci == NULL) {
  #ifdef CONFIG_PCI
        tsi_pci = of_find_node_by_type(NULL, "pci");
        if (tsi_pci == NULL) {


@@ -93651,10 +93958,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/embedded6xx/mpc7448_hp
            (u32) cascade_pci_irq);
        tsi108_pci_int_init(cascade_node);
        set_irq_data(cascade_pci_irq, mpic);
            (u32) cascade_pci_irq);
        tsi108_pci_int_init(cascade_node);
        set_irq_data(cascade_pci_irq, mpic);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/embedded6xx/prpmc2800.c powerpc.git/arch/powerpc/platforms/embedded6xx/prpmc2800.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/embedded6xx/prpmc2800.c    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/embedded6xx/prpmc2800.c 2008-04-19 16:40:52.000000000 +0200
-@@ -49,13 +49,13 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/embedded6xx/prpmc2800.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/embedded6xx/prpmc2800.c
++++ linux-2.6.25.1/arch/powerpc/platforms/embedded6xx/prpmc2800.c
+@@ -49,13 +49,13 @@ static void __init prpmc2800_setup_arch(

         * ioremap mpp and gpp registers in case they are later
         * needed by prpmc2800_reset_board().
         */
         * ioremap mpp and gpp registers in case they are later
         * needed by prpmc2800_reset_board().
         */


@@ -93670,9 +93978,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/embedded6xx/prpmc2800.
        reg = of_get_property(np, "reg", NULL);
        paddr = of_translate_address(np, reg);
        of_node_put(np);
        reg = of_get_property(np, "reg", NULL);
        paddr = of_translate_address(np, reg);
        of_node_put(np);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/iseries/exception.S powerpc.git/arch/powerpc/platforms/iseries/exception.S
---- linux-2.6.25-rc9/arch/powerpc/platforms/iseries/exception.S        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/iseries/exception.S     2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/iseries/exception.S
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/iseries/exception.S
++++ linux-2.6.25.1/arch/powerpc/platforms/iseries/exception.S

 @@ -38,11 +38,19 @@
  
        .globl system_reset_iSeries
 @@ -38,11 +38,19 @@
  
        .globl system_reset_iSeries


@@ -93695,19 +94004,21 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/iseries/exception.S po
        cmpwi   0,r24,0                 /* Are we processor 0? */
        bne     1f
        b       .__start_initialization_iSeries /* Start up the first processor */
        cmpwi   0,r24,0                 /* Are we processor 0? */
        bne     1f
        b       .__start_initialization_iSeries /* Start up the first processor */

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/iseries/ipl_parms.h powerpc.git/arch/powerpc/platforms/iseries/ipl_parms.h
---- linux-2.6.25-rc9/arch/powerpc/platforms/iseries/ipl_parms.h        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/iseries/ipl_parms.h     2008-04-19 16:40:52.000000000 +0200
-@@ -65,6 +65,4 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/iseries/ipl_parms.h
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/iseries/ipl_parms.h
++++ linux-2.6.25.1/arch/powerpc/platforms/iseries/ipl_parms.h
+@@ -65,6 +65,4 @@ struct ItIplParmsReal {

        u64     xRsvd13;                // Reserved                     x38-x3F
  };
  
 -extern struct ItIplParmsReal  xItIplParmsReal;
 -
  #endif /* _ISERIES_IPL_PARMS_H */
        u64     xRsvd13;                // Reserved                     x38-x3F
  };
  
 -extern struct ItIplParmsReal  xItIplParmsReal;
 -
  #endif /* _ISERIES_IPL_PARMS_H */

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/iseries/lpardata.c powerpc.git/arch/powerpc/platforms/iseries/lpardata.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/iseries/lpardata.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/iseries/lpardata.c      2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/iseries/lpardata.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/iseries/lpardata.c
++++ linux-2.6.25.1/arch/powerpc/platforms/iseries/lpardata.c

 @@ -14,10 +14,10 @@
  #include <asm/ptrace.h>
  #include <asm/abs_addr.h>
 @@ -14,10 +14,10 @@
  #include <asm/ptrace.h>
  #include <asm/abs_addr.h>


@@ -93729,7 +94040,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/iseries/lpardata.c pow
        .xDesc = 0xc8a5d9c4,    /* "HvRD" ebcdic */
        .xSize = sizeof(struct HvReleaseData),
        .xVpdAreasPtrOffset = offsetof(struct naca_struct, xItVpdAreas),
        .xDesc = 0xc8a5d9c4,    /* "HvRD" ebcdic */
        .xSize = sizeof(struct HvReleaseData),
        .xVpdAreasPtrOffset = offsetof(struct naca_struct, xItVpdAreas),

-@@ -61,6 +61,63 @@
+@@ -61,6 +61,63 @@ struct naca_struct naca = {

        .xRamDiskSize = 0,
  };
  
        .xRamDiskSize = 0,
  };
  


@@ -93793,7 +94104,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/iseries/lpardata.c pow
  extern void system_reset_iSeries(void);
  extern void machine_check_iSeries(void);
  extern void data_access_iSeries(void);
  extern void system_reset_iSeries(void);
  extern void machine_check_iSeries(void);
  extern void data_access_iSeries(void);

-@@ -129,7 +186,7 @@
+@@ -129,7 +186,7 @@ struct ItLpNaca itLpNaca = {

  };
  
  /* May be filled in by the hypervisor so cannot end up in the BSS */
  };
  
  /* May be filled in by the hypervisor so cannot end up in the BSS */


@@ -93802,7 +94113,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/iseries/lpardata.c pow
  
  /* May be filled in by the hypervisor so cannot end up in the BSS */
  struct ItExtVpdPanel xItExtVpdPanel __attribute__((__section__(".data")));
  
  /* May be filled in by the hypervisor so cannot end up in the BSS */
  struct ItExtVpdPanel xItExtVpdPanel __attribute__((__section__(".data")));

-@@ -152,13 +209,54 @@
+@@ -152,13 +209,54 @@ u64    xMsVpd[3400] __attribute__((__sec

  
  /* Space for Recovery Log Buffer */
  /* May be filled in by the hypervisor so cannot end up in the BSS */
  
  /* Space for Recovery Log Buffer */
  /* May be filled in by the hypervisor so cannot end up in the BSS */


@@ -93859,7 +94170,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/iseries/lpardata.c pow
  /* The LparMap data is now located at offset 0x6000 in head.S
   * It was put there so that the HvReleaseData could address it
   * with a 32-bit offset as required by the iSeries hypervisor
  /* The LparMap data is now located at offset 0x6000 in head.S
   * It was put there so that the HvReleaseData could address it
   * with a 32-bit offset as required by the iSeries hypervisor

-@@ -167,7 +265,7 @@
+@@ -167,7 +265,7 @@ struct SpCommArea xSpCommArea = {

   * the Naca via the HvReleaseData area.  The HvReleaseData has the
   * offset into the Naca of the pointer to the ItVpdAreas.
   */
   * the Naca via the HvReleaseData area.  The HvReleaseData has the
   * offset into the Naca of the pointer to the ItVpdAreas.
   */


@@ -93868,7 +94179,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/iseries/lpardata.c pow
        .xSlicDesc = 0xc9a3e5c1,                /* "ItVA" */
        .xSlicSize = sizeof(struct ItVpdAreas),
        .xSlicVpdEntries = ItVpdMaxEntries,     /* # VPD array entries */
        .xSlicDesc = 0xc9a3e5c1,                /* "ItVA" */
        .xSlicSize = sizeof(struct ItVpdAreas),
        .xSlicVpdEntries = ItVpdMaxEntries,     /* # VPD array entries */

-@@ -185,7 +283,7 @@
+@@ -185,7 +283,7 @@ struct ItVpdAreas itVpdAreas = {

        .xSlicVpdLens = {                       /* VPD lengths */
                0,0,0,                  /*  0 - 2 */
                sizeof(xItExtVpdPanel), /*       3 Extended VPD   */
        .xSlicVpdLens = {                       /* VPD lengths */
                0,0,0,                  /*  0 - 2 */
                sizeof(xItExtVpdPanel), /*       3 Extended VPD   */


@@ -93877,7 +94188,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/iseries/lpardata.c pow
                0,                      /*       5 */
                sizeof(struct ItIplParmsReal),/* 6 length of IPL parms */
                26992,                  /*       7 length of MS VPD */
                0,                      /*       5 */
                sizeof(struct ItIplParmsReal),/* 6 length of IPL parms */
                26992,                  /*       7 length of MS VPD */

-@@ -203,7 +301,7 @@
+@@ -203,7 +301,7 @@ struct ItVpdAreas itVpdAreas = {

        .xSlicVpdAdrs = {                       /* VPD addresses */
                0,0,0,                  /*       0 -  2 */
                &xItExtVpdPanel,        /*       3 Extended VPD */
        .xSlicVpdAdrs = {                       /* VPD addresses */
                0,0,0,                  /*       0 -  2 */
                &xItExtVpdPanel,        /*       3 Extended VPD */


@@ -93886,7 +94197,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/iseries/lpardata.c pow
                0,                      /*       5 */
                &xItIplParmsReal,       /*       6 IPL parms */
                &xMsVpd,                /*       7 MS Vpd */
                0,                      /*       5 */
                &xItIplParmsReal,       /*       6 IPL parms */
                &xMsVpd,                /*       7 MS Vpd */

-@@ -219,10 +317,3 @@
+@@ -219,10 +317,3 @@ struct ItVpdAreas itVpdAreas = {

                0,0
        }
  };
                0,0
        }
  };


@@ -93897,9 +94208,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/iseries/lpardata.c pow
 -              .xSize = sizeof(struct ItLpRegSave),
 -      },
 -};
 -              .xSize = sizeof(struct ItLpRegSave),
 -      },
 -};

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/iseries/naca.h powerpc.git/arch/powerpc/platforms/iseries/naca.h
---- linux-2.6.25-rc9/arch/powerpc/platforms/iseries/naca.h     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/iseries/naca.h  2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/iseries/naca.h
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/iseries/naca.h
++++ linux-2.6.25.1/arch/powerpc/platforms/iseries/naca.h

 @@ -14,7 +14,7 @@
  
  struct naca_struct {
 @@ -14,7 +14,7 @@
  
  struct naca_struct {


@@ -93909,9 +94221,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/iseries/naca.h powerpc
        void *xRamDisk;                 /* iSeries ramdisk           0x08 */
        u64   xRamDiskSize;             /* In pages                  0x10 */
  };
        void *xRamDisk;                 /* iSeries ramdisk           0x08 */
        u64   xRamDiskSize;             /* In pages                  0x10 */
  };

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/iseries/pci.c powerpc.git/arch/powerpc/platforms/iseries/pci.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/iseries/pci.c      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/iseries/pci.c   2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/iseries/pci.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/iseries/pci.c
++++ linux-2.6.25.1/arch/powerpc/platforms/iseries/pci.c

 @@ -23,6 +23,7 @@
  
  #undef DEBUG
 @@ -23,6 +23,7 @@
  
  #undef DEBUG


@@ -93920,7 +94233,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/iseries/pci.c powerpc.
  #include <linux/kernel.h>
  #include <linux/list.h>
  #include <linux/string.h>
  #include <linux/kernel.h>
  #include <linux/list.h>
  #include <linux/string.h>

-@@ -586,7 +587,7 @@
+@@ -586,7 +587,7 @@ static inline struct device_node *xlate_

                static unsigned long last_jiffies;
                static int num_printed;
  
                static unsigned long last_jiffies;
                static int num_printed;
  


@@ -93929,10 +94242,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/iseries/pci.c powerpc.
                        last_jiffies = jiffies;
                        num_printed = 0;
                }
                        last_jiffies = jiffies;
                        num_printed = 0;
                }

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/iseries/release_data.h powerpc.git/arch/powerpc/platforms/iseries/release_data.h
---- linux-2.6.25-rc9/arch/powerpc/platforms/iseries/release_data.h     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/iseries/release_data.h  2008-04-19 16:40:52.000000000 +0200
-@@ -58,6 +58,6 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/iseries/release_data.h
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/iseries/release_data.h
++++ linux-2.6.25.1/arch/powerpc/platforms/iseries/release_data.h
+@@ -58,6 +58,6 @@ struct HvReleaseData {

        char    xRsvd3[20];     /* Reserved                     x2C-x3F */
  };
  
        char    xRsvd3[20];     /* Reserved                     x2C-x3F */
  };
  


@@ -93940,20 +94254,22 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/iseries/release_data.h
 +extern const struct HvReleaseData     hvReleaseData;
  
  #endif /* _ISERIES_RELEASE_DATA_H */
 +extern const struct HvReleaseData     hvReleaseData;
  
  #endif /* _ISERIES_RELEASE_DATA_H */

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/iseries/spcomm_area.h powerpc.git/arch/powerpc/platforms/iseries/spcomm_area.h
---- linux-2.6.25-rc9/arch/powerpc/platforms/iseries/spcomm_area.h      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/iseries/spcomm_area.h   2008-04-19 16:40:52.000000000 +0200
-@@ -31,6 +31,4 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/iseries/spcomm_area.h
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/iseries/spcomm_area.h
++++ linux-2.6.25.1/arch/powerpc/platforms/iseries/spcomm_area.h
+@@ -31,6 +31,4 @@ struct SpCommArea {

        u8      xRsvd2[80];             // Reserved                             030-07F
  };
  
 -extern struct SpCommArea xSpCommArea;
 -
  #endif /* _ISERIES_SPCOMM_AREA_H */
        u8      xRsvd2[80];             // Reserved                             030-07F
  };
  
 -extern struct SpCommArea xSpCommArea;
 -
  #endif /* _ISERIES_SPCOMM_AREA_H */

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/iseries/vpd_areas.h powerpc.git/arch/powerpc/platforms/iseries/vpd_areas.h
---- linux-2.6.25-rc9/arch/powerpc/platforms/iseries/vpd_areas.h        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/iseries/vpd_areas.h     2008-04-19 16:40:52.000000000 +0200
-@@ -80,9 +80,9 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/iseries/vpd_areas.h
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/iseries/vpd_areas.h
++++ linux-2.6.25.1/arch/powerpc/platforms/iseries/vpd_areas.h
+@@ -80,9 +80,9 @@ struct ItVpdAreas {

        u32     xPlicDmaLens[ItDmaMaxEntries];// Array of DMA lengths   080-0A7
        u32     xPlicDmaToks[ItDmaMaxEntries];// Array of DMA tokens    0A8-0CF
        u32     xSlicVpdLens[ItVpdMaxEntries];// Array of VPD lengths   0D0-12F
        u32     xPlicDmaLens[ItDmaMaxEntries];// Array of DMA lengths   080-0A7
        u32     xPlicDmaToks[ItDmaMaxEntries];// Array of DMA tokens    0A8-0CF
        u32     xSlicVpdLens[ItVpdMaxEntries];// Array of VPD lengths   0D0-12F


@@ -93965,10 +94281,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/iseries/vpd_areas.h po
 +extern const struct ItVpdAreas        itVpdAreas;
  
  #endif /* _ISERIES_VPD_AREAS_H */
 +extern const struct ItVpdAreas        itVpdAreas;
  
  #endif /* _ISERIES_VPD_AREAS_H */

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/maple/pci.c powerpc.git/arch/powerpc/platforms/maple/pci.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/maple/pci.c        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/maple/pci.c     2008-04-19 16:40:52.000000000 +0200
-@@ -592,50 +592,3 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/maple/pci.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/maple/pci.c
++++ linux-2.6.25.1/arch/powerpc/platforms/maple/pci.c
+@@ -592,50 +592,3 @@ int maple_pci_get_legacy_ide_irq(struct 

        }
        return irq;
  }
        }
        return irq;
  }


@@ -94019,9 +94336,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/maple/pci.c powerpc.gi
 -}
 -DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8111_IDE,
 -                       fixup_maple_ide);
 -}
 -DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8111_IDE,
 -                       fixup_maple_ide);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/maple/setup.c powerpc.git/arch/powerpc/platforms/maple/setup.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/maple/setup.c      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/maple/setup.c   2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/maple/setup.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/maple/setup.c
++++ linux-2.6.25.1/arch/powerpc/platforms/maple/setup.c

 @@ -43,6 +43,7 @@
  #include <linux/smp.h>
  #include <linux/bitops.h>
 @@ -43,6 +43,7 @@
  #include <linux/smp.h>
  #include <linux/bitops.h>


@@ -94038,7 +94356,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/maple/setup.c powerpc.
  #include <asm/mpic.h>
  #include <asm/rtas.h>
  #include <asm/udbg.h>
  #include <asm/mpic.h>
  #include <asm/rtas.h>
  #include <asm/udbg.h>

-@@ -319,7 +319,7 @@
+@@ -319,7 +319,7 @@ static int __init maple_probe(void)

        return 1;
  }
  
        return 1;
  }
  


@@ -94047,9 +94365,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/maple/setup.c powerpc.
        .name                   = "Maple",
        .probe                  = maple_probe,
        .setup_arch             = maple_setup_arch,
        .name                   = "Maple",
        .probe                  = maple_probe,
        .setup_arch             = maple_setup_arch,

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pasemi/dma_lib.c powerpc.git/arch/powerpc/platforms/pasemi/dma_lib.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/pasemi/dma_lib.c   2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/pasemi/dma_lib.c        2008-03-17 14:03:32.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/platforms/pasemi/dma_lib.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/pasemi/dma_lib.c
++++ linux-2.6.25.1/arch/powerpc/platforms/pasemi/dma_lib.c

 @@ -17,6 +17,7 @@
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
   */
 @@ -17,6 +17,7 @@
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
   */


@@ -94067,7 +94386,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pasemi/dma_lib.c power
  
  static struct pasdma_status *dma_status;
  
  
  static struct pasdma_status *dma_status;
  

-@@ -43,6 +46,8 @@
+@@ -43,6 +46,8 @@ static struct pci_dev *dma_pdev;

  
  static DECLARE_BITMAP(txch_free, MAX_TXCH);
  static DECLARE_BITMAP(rxch_free, MAX_RXCH);
  
  static DECLARE_BITMAP(txch_free, MAX_TXCH);
  static DECLARE_BITMAP(rxch_free, MAX_RXCH);


@@ -94076,7 +94395,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pasemi/dma_lib.c power
  
  /* pasemi_read_iob_reg - read IOB register
   * @reg: Register to read (offset into PCI CFG space)
  
  /* pasemi_read_iob_reg - read IOB register
   * @reg: Register to read (offset into PCI CFG space)

-@@ -373,6 +378,106 @@
+@@ -373,6 +378,106 @@ void pasemi_dma_free_buf(struct pasemi_d

  }
  EXPORT_SYMBOL(pasemi_dma_free_buf);
  
  }
  EXPORT_SYMBOL(pasemi_dma_free_buf);
  


@@ -94183,7 +94502,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pasemi/dma_lib.c power
  static void *map_onedev(struct pci_dev *p, int index)
  {
        struct device_node *dn;
  static void *map_onedev(struct pci_dev *p, int index)
  {
        struct device_node *dn;

-@@ -410,6 +515,7 @@
+@@ -410,6 +515,7 @@ int pasemi_dma_init(void)

        struct resource res;
        struct device_node *dn;
        int i, intf, err = 0;
        struct resource res;
        struct device_node *dn;
        int i, intf, err = 0;


@@ -94191,7 +94510,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pasemi/dma_lib.c power
        u32 tmp;
  
        if (!machine_is(pasemi))
        u32 tmp;
  
        if (!machine_is(pasemi))

-@@ -478,6 +584,44 @@
+@@ -478,6 +584,44 @@ int pasemi_dma_init(void)

        for (i = 0; i < MAX_RXCH; i++)
                __set_bit(i, rxch_free);
  
        for (i = 0; i < MAX_RXCH; i++)
                __set_bit(i, rxch_free);
  


@@ -94236,9 +94555,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pasemi/dma_lib.c power
        printk(KERN_INFO "PA Semi PWRficient DMA library initialized "
                "(%d tx, %d rx channels)\n", num_txch, num_rxch);
  
        printk(KERN_INFO "PA Semi PWRficient DMA library initialized "
                "(%d tx, %d rx channels)\n", num_txch, num_rxch);
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pasemi/iommu.c powerpc.git/arch/powerpc/platforms/pasemi/iommu.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/pasemi/iommu.c     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/pasemi/iommu.c  2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/pasemi/iommu.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/pasemi/iommu.c
++++ linux-2.6.25.1/arch/powerpc/platforms/pasemi/iommu.c

 @@ -1,5 +1,5 @@
  /*
 - * Copyright (C) 2005-2007, PA Semi, Inc
 @@ -1,5 +1,5 @@
  /*
 - * Copyright (C) 2005-2007, PA Semi, Inc


@@ -94297,7 +94617,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pasemi/iommu.c powerpc
  static u32 iob_l1_emptyval;
  static u32 iob_l2_emptyval;
  static u32 *iob_l2_base;
  static u32 iob_l1_emptyval;
  static u32 iob_l2_emptyval;
  static u32 *iob_l2_base;

-@@ -219,7 +218,7 @@
+@@ -219,7 +218,7 @@ int __init iob_init(struct device_node *

        for (i = 0; i < 64; i++) {
                /* Each L1 covers 32MB, i.e. 8K entries = 32K of ram */
                regword = IOBMAP_L1E_V | (__pa(iob_l2_base + i*0x2000) >> 12);
        for (i = 0; i < 64; i++) {
                /* Each L1 covers 32MB, i.e. 8K entries = 32K of ram */
                regword = IOBMAP_L1E_V | (__pa(iob_l2_base + i*0x2000) >> 12);


@@ -94306,9 +94626,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pasemi/iommu.c powerpc
        }
  
        /* set 2GB translation window, based at 0 */
        }
  
        /* set 2GB translation window, based at 0 */

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/powermac/setup.c powerpc.git/arch/powerpc/platforms/powermac/setup.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/powermac/setup.c   2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/powermac/setup.c        2008-03-17 14:03:32.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/platforms/powermac/setup.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/powermac/setup.c
++++ linux-2.6.25.1/arch/powerpc/platforms/powermac/setup.c

 @@ -53,6 +53,7 @@
  #include <linux/suspend.h>
  #include <linux/of_device.h>
 @@ -53,6 +53,7 @@
  #include <linux/suspend.h>
  #include <linux/of_device.h>


@@ -94325,10 +94646,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/powermac/setup.c power
  #include <asm/udbg.h>
  
  #include "pmac.h"
  #include <asm/udbg.h>
  
  #include "pmac.h"

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/ps3/device-init.c powerpc.git/arch/powerpc/platforms/ps3/device-init.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/ps3/device-init.c  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/ps3/device-init.c       2008-04-19 16:40:52.000000000 +0200
-@@ -499,41 +499,14 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/ps3/device-init.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/ps3/device-init.c
++++ linux-2.6.25.1/arch/powerpc/platforms/ps3/device-init.c
+@@ -499,41 +499,14 @@ static int __init ps3_register_graphics_

  }
  
  /**
  }
  
  /**


@@ -94372,7 +94694,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/ps3/device-init.c powe
        case PS3_DEV_TYPE_STOR_DISK:
                result = ps3_setup_storage_dev(repo, PS3_MATCH_ID_STOR_DISK);
  
        case PS3_DEV_TYPE_STOR_DISK:
                result = ps3_setup_storage_dev(repo, PS3_MATCH_ID_STOR_DISK);
  

-@@ -572,6 +545,48 @@
+@@ -572,6 +545,48 @@ static int ps3_register_repository_devic

        return result;
  }
  
        return result;
  }
  


@@ -94421,7 +94743,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/ps3/device-init.c powe
  static void ps3_find_and_add_device(u64 bus_id, u64 dev_id)
  {
        struct ps3_repository_device repo;
  static void ps3_find_and_add_device(u64 bus_id, u64 dev_id)
  {
        struct ps3_repository_device repo;

-@@ -601,7 +616,7 @@
+@@ -601,7 +616,7 @@ found:

                pr_debug("%s:%u: device %lu:%lu found after %u retries\n",
                         __func__, __LINE__, bus_id, dev_id, retries);
  
                pr_debug("%s:%u: device %lu:%lu found after %u retries\n",
                         __func__, __LINE__, bus_id, dev_id, retries);
  


@@ -94430,7 +94752,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/ps3/device-init.c powe
        return;
  }
  
        return;
  }
  

-@@ -905,8 +920,7 @@
+@@ -905,8 +920,7 @@ static int __init ps3_register_devices(v

  
        ps3_register_graphics_devices();
  
  
        ps3_register_graphics_devices();
  


@@ -94440,9 +94762,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/ps3/device-init.c powe
  
        ps3_register_sound_devices();
  
  
        ps3_register_sound_devices();
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/ps3/htab.c powerpc.git/arch/powerpc/platforms/ps3/htab.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/ps3/htab.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/ps3/htab.c      2008-03-17 14:03:32.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/platforms/ps3/htab.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/ps3/htab.c
++++ linux-2.6.25.1/arch/powerpc/platforms/ps3/htab.c

 @@ -19,9 +19,10 @@
   */
  
 @@ -19,9 +19,10 @@
   */
  


@@ -94455,10 +94778,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/ps3/htab.c powerpc.git
  #include <asm/udbg.h>
  #include <asm/lv1call.h>
  #include <asm/ps3fb.h>
  #include <asm/udbg.h>
  #include <asm/lv1call.h>
  #include <asm/ps3fb.h>

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/ps3/interrupt.c powerpc.git/arch/powerpc/platforms/ps3/interrupt.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/ps3/interrupt.c    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/ps3/interrupt.c 2008-04-19 16:40:52.000000000 +0200
-@@ -709,7 +709,7 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/ps3/interrupt.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/ps3/interrupt.c
++++ linux-2.6.25.1/arch/powerpc/platforms/ps3/interrupt.c
+@@ -709,7 +709,7 @@ static unsigned int ps3_get_irq(void)

        asm volatile("cntlzd %0,%1" : "=r" (plug) : "r" (x));
        plug &= 0x3f;
  
        asm volatile("cntlzd %0,%1" : "=r" (plug) : "r" (x));
        plug &= 0x3f;
  


@@ -94467,9 +94791,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/ps3/interrupt.c powerp
                pr_debug("%s:%d: no plug found: thread_id %lu\n", __func__,
                        __LINE__, pd->thread_id);
                dump_bmp(&per_cpu(ps3_private, 0));
                pr_debug("%s:%d: no plug found: thread_id %lu\n", __func__,
                        __LINE__, pd->thread_id);
                dump_bmp(&per_cpu(ps3_private, 0));

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/ps3/mm.c powerpc.git/arch/powerpc/platforms/ps3/mm.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/ps3/mm.c   2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/ps3/mm.c        2008-03-17 14:03:32.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/platforms/ps3/mm.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/ps3/mm.c
++++ linux-2.6.25.1/arch/powerpc/platforms/ps3/mm.c

 @@ -21,9 +21,10 @@
  #include <linux/kernel.h>
  #include <linux/module.h>
 @@ -21,9 +21,10 @@
  #include <linux/kernel.h>
  #include <linux/module.h>


@@ -94482,9 +94807,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/ps3/mm.c powerpc.git/a
  #include <asm/udbg.h>
  #include <asm/lv1call.h>
  
  #include <asm/udbg.h>
  #include <asm/lv1call.h>
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/ps3/os-area.c powerpc.git/arch/powerpc/platforms/ps3/os-area.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/ps3/os-area.c      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/ps3/os-area.c   2008-03-17 14:03:32.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/platforms/ps3/os-area.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/ps3/os-area.c
++++ linux-2.6.25.1/arch/powerpc/platforms/ps3/os-area.c

 @@ -24,8 +24,9 @@
  #include <linux/fs.h>
  #include <linux/syscalls.h>
 @@ -24,8 +24,9 @@
  #include <linux/fs.h>
  #include <linux/syscalls.h>


@@ -94496,10 +94822,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/ps3/os-area.c powerpc.
  
  #include "platform.h"
  
  
  #include "platform.h"
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/ps3/setup.c powerpc.git/arch/powerpc/platforms/ps3/setup.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/ps3/setup.c        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/ps3/setup.c     2008-04-19 16:40:52.000000000 +0200
-@@ -95,6 +95,14 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/ps3/setup.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/ps3/setup.c
++++ linux-2.6.25.1/arch/powerpc/platforms/ps3/setup.c
+@@ -95,6 +95,14 @@ static void ps3_power_off(void)

        ps3_sys_manager_power_off(); /* never returns */
  }
  
        ps3_sys_manager_power_off(); /* never returns */
  }
  


@@ -94514,7 +94841,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/ps3/setup.c powerpc.gi
  static void ps3_panic(char *str)
  {
        DBG("%s:%d %s\n", __func__, __LINE__, str);
  static void ps3_panic(char *str)
  {
        DBG("%s:%d %s\n", __func__, __LINE__, str);

-@@ -105,7 +113,8 @@
+@@ -105,7 +113,8 @@ static void ps3_panic(char *str)

        printk("   Please press POWER button.\n");
        printk("\n");
  
        printk("   Please press POWER button.\n");
        printk("\n");
  


@@ -94524,7 +94851,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/ps3/setup.c powerpc.gi
  }
  
  #if defined(CONFIG_FB_PS3) || defined(CONFIG_FB_PS3_MODULE) || \
  }
  
  #if defined(CONFIG_FB_PS3) || defined(CONFIG_FB_PS3_MODULE) || \

-@@ -117,7 +126,7 @@
+@@ -117,7 +126,7 @@ static void __init prealloc(struct ps3_p

  
        p->address = __alloc_bootmem(p->size, p->align, __pa(MAX_DMA_ADDRESS));
        if (!p->address) {
  
        p->address = __alloc_bootmem(p->size, p->align, __pa(MAX_DMA_ADDRESS));
        if (!p->address) {


@@ -94533,7 +94860,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/ps3/setup.c powerpc.gi
                       p->name);
                return;
        }
                       p->name);
                return;
        }

-@@ -266,6 +275,7 @@
+@@ -266,6 +275,7 @@ define_machine(ps3) {

        .progress                       = ps3_progress,
        .restart                        = ps3_restart,
        .power_off                      = ps3_power_off,
        .progress                       = ps3_progress,
        .restart                        = ps3_restart,
        .power_off                      = ps3_power_off,


@@ -94541,9 +94868,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/ps3/setup.c powerpc.gi
  #if defined(CONFIG_KEXEC)
        .kexec_cpu_down                 = ps3_kexec_cpu_down,
        .machine_kexec                  = default_machine_kexec,
  #if defined(CONFIG_KEXEC)
        .kexec_cpu_down                 = ps3_kexec_cpu_down,
        .machine_kexec                  = default_machine_kexec,

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/ps3/spu.c powerpc.git/arch/powerpc/platforms/ps3/spu.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/ps3/spu.c  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/ps3/spu.c       2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/ps3/spu.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/ps3/spu.c
++++ linux-2.6.25.1/arch/powerpc/platforms/ps3/spu.c

 @@ -27,6 +27,7 @@
  #include <asm/spu.h>
  #include <asm/spu_priv1.h>
 @@ -27,6 +27,7 @@
  #include <asm/spu.h>
  #include <asm/spu_priv1.h>


@@ -94552,7 +94880,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/ps3/spu.c powerpc.git/
  
  #include "../cell/spufs/spufs.h"
  #include "platform.h"
  
  #include "../cell/spufs/spufs.h"
  #include "platform.h"

-@@ -140,6 +141,12 @@
+@@ -140,6 +141,12 @@ static void _dump_areas(unsigned int spe

        pr_debug("%s:%d: shadow:  %lxh\n", func, line, shadow);
  }
  
        pr_debug("%s:%d: shadow:  %lxh\n", func, line, shadow);
  }
  


@@ -94565,18 +94893,20 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/ps3/spu.c powerpc.git/
  static unsigned long get_vas_id(void)
  {
        unsigned long id;
  static unsigned long get_vas_id(void)
  {
        unsigned long id;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/Makefile powerpc.git/arch/powerpc/platforms/pseries/Makefile
---- linux-2.6.25-rc9/arch/powerpc/platforms/pseries/Makefile   2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/pseries/Makefile        2008-04-19 16:40:52.000000000 +0200
-@@ -18,3 +18,4 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/pseries/Makefile
++++ linux-2.6.25.1/arch/powerpc/platforms/pseries/Makefile
+@@ -18,3 +18,4 @@ obj-$(CONFIG_HOTPLUG_CPU)    += hotplug-cpu

  obj-$(CONFIG_HVC_CONSOLE)     += hvconsole.o
  obj-$(CONFIG_HVCS)            += hvcserver.o
  obj-$(CONFIG_HCALL_STATS)     += hvCall_inst.o
 +obj-$(CONFIG_PHYP_DUMP)       += phyp_dump.o
  obj-$(CONFIG_HVC_CONSOLE)     += hvconsole.o
  obj-$(CONFIG_HVCS)            += hvcserver.o
  obj-$(CONFIG_HCALL_STATS)     += hvCall_inst.o
 +obj-$(CONFIG_PHYP_DUMP)       += phyp_dump.o

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/eeh.c powerpc.git/arch/powerpc/platforms/pseries/eeh.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/pseries/eeh.c      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/pseries/eeh.c   2008-04-19 16:40:52.000000000 +0200
-@@ -945,7 +945,6 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/eeh.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/pseries/eeh.c
++++ linux-2.6.25.1/arch/powerpc/platforms/pseries/eeh.c
+@@ -945,7 +945,6 @@ static void *early_enable_eeh(struct dev

        unsigned int rets[3];
        struct eeh_early_enable_info *info = data;
        int ret;
        unsigned int rets[3];
        struct eeh_early_enable_info *info = data;
        int ret;


@@ -94584,7 +94914,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/eeh.c powerpc.
        const u32 *class_code = of_get_property(dn, "class-code", NULL);
        const u32 *vendor_id = of_get_property(dn, "vendor-id", NULL);
        const u32 *device_id = of_get_property(dn, "device-id", NULL);
        const u32 *class_code = of_get_property(dn, "class-code", NULL);
        const u32 *vendor_id = of_get_property(dn, "vendor-id", NULL);
        const u32 *device_id = of_get_property(dn, "device-id", NULL);

-@@ -959,8 +958,8 @@
+@@ -959,8 +958,8 @@ static void *early_enable_eeh(struct dev

        pdn->eeh_freeze_count = 0;
        pdn->eeh_false_positives = 0;
  
        pdn->eeh_freeze_count = 0;
        pdn->eeh_false_positives = 0;
  


@@ -94595,9 +94925,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/eeh.c powerpc.
  
        /* Ignore bad nodes. */
        if (!class_code || !vendor_id || !device_id)
  
        /* Ignore bad nodes. */
        if (!class_code || !vendor_id || !device_id)

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/lpar.c powerpc.git/arch/powerpc/platforms/pseries/lpar.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/pseries/lpar.c     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/pseries/lpar.c  2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/lpar.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/pseries/lpar.c
++++ linux-2.6.25.1/arch/powerpc/platforms/pseries/lpar.c

 @@ -40,6 +40,7 @@
  #include <asm/smp.h>
  
 @@ -40,6 +40,7 @@
  #include <asm/smp.h>
  


@@ -94606,7 +94937,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/lpar.c powerpc
  
  #ifdef DEBUG_LOW
  #define DBG_LOW(fmt...) do { udbg_printf(fmt); } while(0)
  
  #ifdef DEBUG_LOW
  #define DBG_LOW(fmt...) do { udbg_printf(fmt); } while(0)

-@@ -203,7 +204,6 @@
+@@ -203,7 +204,6 @@ void __init find_udbg_vterm(void)

        struct device_node *stdout_node;
        const u32 *termno;
        const char *name;
        struct device_node *stdout_node;
        const u32 *termno;
        const char *name;


@@ -94614,7 +94945,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/lpar.c powerpc
  
        /* find the boot console from /chosen/stdout */
        if (!of_chosen)
  
        /* find the boot console from /chosen/stdout */
        if (!of_chosen)

-@@ -219,8 +219,6 @@
+@@ -219,8 +219,6 @@ void __init find_udbg_vterm(void)

                printk(KERN_WARNING "stdout node missing 'name' property!\n");
                goto out;
        }
                printk(KERN_WARNING "stdout node missing 'name' property!\n");
                goto out;
        }


@@ -94623,7 +94954,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/lpar.c powerpc
  
        /* Check if it's a virtual terminal */
        if (strncmp(name, "vty", 3) != 0)
  
        /* Check if it's a virtual terminal */
        if (strncmp(name, "vty", 3) != 0)

-@@ -234,15 +232,13 @@
+@@ -234,15 +232,13 @@ void __init find_udbg_vterm(void)

                udbg_putc = udbg_putcLP;
                udbg_getc = udbg_getcLP;
                udbg_getc_poll = udbg_getc_pollLP;
                udbg_putc = udbg_putcLP;
                udbg_getc = udbg_getcLP;
                udbg_getc_poll = udbg_getc_pollLP;


@@ -94641,7 +94972,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/lpar.c powerpc
        }
  out:
        of_node_put(stdout_node);
        }
  out:
        of_node_put(stdout_node);

-@@ -520,6 +516,20 @@
+@@ -520,6 +516,20 @@ static void pSeries_lpar_hpte_invalidate

        BUG_ON(lpar_rc != H_SUCCESS);
  }
  
        BUG_ON(lpar_rc != H_SUCCESS);
  }
  


@@ -94662,7 +94993,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/lpar.c powerpc
  /* Flag bits for H_BULK_REMOVE */
  #define HBR_REQUEST   0x4000000000000000UL
  #define HBR_RESPONSE  0x8000000000000000UL
  /* Flag bits for H_BULK_REMOVE */
  #define HBR_REQUEST   0x4000000000000000UL
  #define HBR_RESPONSE  0x8000000000000000UL

-@@ -597,6 +607,7 @@
+@@ -597,6 +607,7 @@ void __init hpte_init_lpar(void)

        ppc_md.hpte_updateboltedpp = pSeries_lpar_hpte_updateboltedpp;
        ppc_md.hpte_insert      = pSeries_lpar_hpte_insert;
        ppc_md.hpte_remove      = pSeries_lpar_hpte_remove;
        ppc_md.hpte_updateboltedpp = pSeries_lpar_hpte_updateboltedpp;
        ppc_md.hpte_insert      = pSeries_lpar_hpte_insert;
        ppc_md.hpte_remove      = pSeries_lpar_hpte_remove;


@@ -94670,10 +95001,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/lpar.c powerpc
        ppc_md.flush_hash_range = pSeries_lpar_flush_hash_range;
        ppc_md.hpte_clear_all   = pSeries_lpar_hptab_clear;
  }
        ppc_md.flush_hash_range = pSeries_lpar_flush_hash_range;
        ppc_md.hpte_clear_all   = pSeries_lpar_hptab_clear;
  }

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/pci_dlpar.c powerpc.git/arch/powerpc/platforms/pseries/pci_dlpar.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/pseries/pci_dlpar.c        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/pseries/pci_dlpar.c     2008-04-19 16:40:52.000000000 +0200
-@@ -123,7 +123,7 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/pci_dlpar.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/pseries/pci_dlpar.c
++++ linux-2.6.25.1/arch/powerpc/platforms/pseries/pci_dlpar.c
+@@ -123,7 +123,7 @@ pcibios_pci_config_bridge(struct pci_dev

        /* Add to children of PCI bridge dev->bus */
        child_bus = pci_add_new_bus(dev->bus, dev, sec_busno);
        if (!child_bus) {
        /* Add to children of PCI bridge dev->bus */
        child_bus = pci_add_new_bus(dev->bus, dev, sec_busno);
        if (!child_bus) {


@@ -94682,9 +95014,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/pci_dlpar.c po
                return -EIO;
        }
        sprintf(child_bus->name, "PCI Bus #%02x", child_bus->number);
                return -EIO;
        }
        sprintf(child_bus->name, "PCI Bus #%02x", child_bus->number);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/phyp_dump.c powerpc.git/arch/powerpc/platforms/pseries/phyp_dump.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/pseries/phyp_dump.c        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pseries/phyp_dump.c     2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/phyp_dump.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/platforms/pseries/phyp_dump.c

 @@ -0,0 +1,507 @@
 +/*
 + * Hypervisor-assisted dump
 @@ -0,0 +1,507 @@
 +/*
 + * Hypervisor-assisted dump


@@ -95193,20 +95526,22 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/phyp_dump.c po
 +        return 0;
 +}
 +early_param("phyp_dump_reserve_size", early_phyp_dump_reserve_size);
 +        return 0;
 +}
 +early_param("phyp_dump_reserve_size", early_phyp_dump_reserve_size);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/pseries.h powerpc.git/arch/powerpc/platforms/pseries/pseries.h
---- linux-2.6.25-rc9/arch/powerpc/platforms/pseries/pseries.h  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/pseries/pseries.h       2008-04-19 16:40:52.000000000 +0200
-@@ -38,4 +38,6 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/pseries.h
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/pseries/pseries.h
++++ linux-2.6.25.1/arch/powerpc/platforms/pseries/pseries.h
+@@ -38,4 +38,6 @@ extern void pSeries_final_fixup(void);

  /* Poweron flag used for enabling auto ups restart */
  extern unsigned long rtas_poweron_auto;
  
 +extern void find_udbg_vterm(void);
 +
  #endif /* _PSERIES_PSERIES_H */
  /* Poweron flag used for enabling auto ups restart */
  extern unsigned long rtas_poweron_auto;
  
 +extern void find_udbg_vterm(void);
 +
  #endif /* _PSERIES_PSERIES_H */

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/reconfig.c powerpc.git/arch/powerpc/platforms/pseries/reconfig.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/pseries/reconfig.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/pseries/reconfig.c      2008-04-19 16:40:52.000000000 +0200
-@@ -222,14 +222,14 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/reconfig.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/pseries/reconfig.c
++++ linux-2.6.25.1/arch/powerpc/platforms/pseries/reconfig.c
+@@ -222,14 +222,14 @@ static char * parse_next_property(char *

        tmp = strchr(buf, ' ');
        if (!tmp) {
                printk(KERN_ERR "property parse failed in %s at line %d\n",
        tmp = strchr(buf, ' ');
        if (!tmp) {
                printk(KERN_ERR "property parse failed in %s at line %d\n",


@@ -95223,7 +95558,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/reconfig.c pow
                return NULL;
        }
  
                return NULL;
        }
  

-@@ -238,12 +238,12 @@
+@@ -238,12 +238,12 @@ static char * parse_next_property(char *

        *length = simple_strtoul(tmp, &tmp, 10);
        if (*length == -1) {
                printk(KERN_ERR "property parse failed in %s at line %d\n",
        *length = simple_strtoul(tmp, &tmp, 10);
        if (*length == -1) {
                printk(KERN_ERR "property parse failed in %s at line %d\n",


@@ -95238,7 +95573,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/reconfig.c pow
                return NULL;
        }
  
                return NULL;
        }
  

-@@ -252,12 +252,12 @@
+@@ -252,12 +252,12 @@ static char * parse_next_property(char *

        tmp += *length;
        if (tmp > end) {
                printk(KERN_ERR "property parse failed in %s at line %d\n",
        tmp += *length;
        if (tmp > end) {
                printk(KERN_ERR "property parse failed in %s at line %d\n",


@@ -95253,10 +95588,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/reconfig.c pow
                return NULL;
        }
        tmp++;
                return NULL;
        }
        tmp++;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/scanlog.c powerpc.git/arch/powerpc/platforms/pseries/scanlog.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/pseries/scanlog.c  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/pseries/scanlog.c       2008-04-19 16:40:52.000000000 +0200
-@@ -195,31 +195,30 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/scanlog.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/pseries/scanlog.c
++++ linux-2.6.25.1/arch/powerpc/platforms/pseries/scanlog.c
+@@ -195,31 +195,30 @@ const struct file_operations scanlog_fop

  static int __init scanlog_init(void)
  {
        struct proc_dir_entry *ent;
  static int __init scanlog_init(void)
  {
        struct proc_dir_entry *ent;


@@ -95306,9 +95642,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/scanlog.c powe
  }
  
  static void __exit scanlog_cleanup(void)
  }
  
  static void __exit scanlog_cleanup(void)

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/setup.c powerpc.git/arch/powerpc/platforms/pseries/setup.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/pseries/setup.c    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/pseries/setup.c 2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/setup.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/pseries/setup.c
++++ linux-2.6.25.1/arch/powerpc/platforms/pseries/setup.c

 @@ -76,9 +76,6 @@
  #define DBG(fmt...)
  #endif
 @@ -76,9 +76,6 @@
  #define DBG(fmt...)
  #endif


@@ -95319,7 +95656,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/setup.c powerp
  int fwnmi_active;  /* TRUE if an FWNMI handler is present */
  
  static void pseries_shared_idle_sleep(void);
  int fwnmi_active;  /* TRUE if an FWNMI handler is present */
  
  static void pseries_shared_idle_sleep(void);

-@@ -127,14 +124,60 @@
+@@ -127,14 +124,60 @@ void pseries_8259_cascade(unsigned int i

        desc->chip->eoi(irq);
  }
  
        desc->chip->eoi(irq);
  }
  


@@ -95384,7 +95721,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/setup.c powerp
        int naddr, n, i, opplen;
        struct mpic *mpic;
  
        int naddr, n, i, opplen;
        struct mpic *mpic;
  

-@@ -167,43 +210,13 @@
+@@ -167,43 +210,13 @@ static void __init pseries_mpic_init_IRQ

        mpic_init(mpic);
  
        /* Look for cascade */
        mpic_init(mpic);
  
        /* Look for cascade */


@@ -95434,7 +95771,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/setup.c powerp
  }
  
  static void pseries_lpar_enable_pmcs(void)
  }
  
  static void pseries_lpar_enable_pmcs(void)

-@@ -235,7 +248,7 @@
+@@ -235,7 +248,7 @@ static void __init pseries_discover_pic(

                        smp_init_pseries_mpic();
                        return;
                } else if (strstr(typep, "ppc-xicp")) {
                        smp_init_pseries_mpic();
                        return;
                } else if (strstr(typep, "ppc-xicp")) {


@@ -95443,7 +95780,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/setup.c powerp
                        setup_kexec_cpu_down_xics();
                        smp_init_pseries_xics();
                        return;
                        setup_kexec_cpu_down_xics();
                        smp_init_pseries_xics();
                        return;

-@@ -393,6 +406,7 @@
+@@ -393,6 +406,7 @@ static void pseries_dedicated_idle_sleep

  { 
        unsigned int cpu = smp_processor_id();
        unsigned long start_snooze;
  { 
        unsigned int cpu = smp_processor_id();
        unsigned long start_snooze;


@@ -95451,7 +95788,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/setup.c powerp
  
        /*
         * Indicate to the HV that we are idle. Now would be
  
        /*
         * Indicate to the HV that we are idle. Now would be

-@@ -400,6 +414,7 @@
+@@ -400,6 +414,7 @@ static void pseries_dedicated_idle_sleep

         */
        get_lppaca()->idle = 1;
        get_lppaca()->donate_dedicated_cpu = 1;
         */
        get_lppaca()->idle = 1;
        get_lppaca()->donate_dedicated_cpu = 1;


@@ -95459,7 +95796,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/setup.c powerp
  
        /*
         * We come in with interrupts disabled, and need_resched()
  
        /*
         * We come in with interrupts disabled, and need_resched()

-@@ -432,6 +447,8 @@
+@@ -432,6 +447,8 @@ static void pseries_dedicated_idle_sleep

  
  out:
        HMT_medium();
  
  out:
        HMT_medium();


@@ -95468,10 +95805,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/setup.c powerp
        get_lppaca()->donate_dedicated_cpu = 0;
        get_lppaca()->idle = 0;
  }
        get_lppaca()->donate_dedicated_cpu = 0;
        get_lppaca()->idle = 0;
  }

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/xics.c powerpc.git/arch/powerpc/platforms/pseries/xics.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/pseries/xics.c     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/pseries/xics.c  2008-04-19 16:40:52.000000000 +0200
-@@ -516,6 +516,8 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/xics.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/pseries/xics.c
++++ linux-2.6.25.1/arch/powerpc/platforms/pseries/xics.c
+@@ -516,6 +516,8 @@ static struct irq_chip xics_pic_lpar = {

        .set_affinity = xics_set_affinity
  };
  
        .set_affinity = xics_set_affinity
  };
  


@@ -95480,7 +95818,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/xics.c powerpc
  
  static int xics_host_match(struct irq_host *h, struct device_node *node)
  {
  
  static int xics_host_match(struct irq_host *h, struct device_node *node)
  {

-@@ -526,23 +528,13 @@
+@@ -526,23 +528,13 @@ static int xics_host_match(struct irq_ho

        return !of_device_is_compatible(node, "chrp,iic");
  }
  
        return !of_device_is_compatible(node, "chrp,iic");
  }
  


@@ -95508,7 +95846,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/xics.c powerpc
        return 0;
  }
  
        return 0;
  }
  

-@@ -561,27 +553,20 @@
+@@ -561,27 +553,20 @@ static int xics_host_xlate(struct irq_ho

        return 0;
  }
  
        return 0;
  }
  


@@ -95542,7 +95880,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/xics.c powerpc
                                   XICS_IRQ_SPURIOUS);
        BUG_ON(xics_host == NULL);
        irq_set_default_host(xics_host);
                                   XICS_IRQ_SPURIOUS);
        BUG_ON(xics_host == NULL);
        irq_set_default_host(xics_host);

-@@ -655,52 +640,6 @@
+@@ -655,52 +640,6 @@ static void __init xics_init_one_node(st

        }
  }
  
        }
  }
  


@@ -95595,7 +95933,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/xics.c powerpc
  void __init xics_init_IRQ(void)
  {
        struct device_node *np;
  void __init xics_init_IRQ(void)
  {
        struct device_node *np;

-@@ -733,8 +672,6 @@
+@@ -733,8 +672,6 @@ void __init xics_init_IRQ(void)

  
        xics_setup_cpu();
  
  
        xics_setup_cpu();
  


@@ -95604,10 +95942,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/xics.c powerpc
        ppc64_boot_msg(0x21, "XICS Done");
  }
  
        ppc64_boot_msg(0x21, "XICS Done");
  }
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/xics.h powerpc.git/arch/powerpc/platforms/pseries/xics.h
---- linux-2.6.25-rc9/arch/powerpc/platforms/pseries/xics.h     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/pseries/xics.h  2008-04-19 16:40:52.000000000 +0200
-@@ -28,7 +28,4 @@
+Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/xics.h
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/platforms/pseries/xics.h
++++ linux-2.6.25.1/arch/powerpc/platforms/pseries/xics.h
+@@ -28,7 +28,4 @@ struct xics_ipi_struct {

  
  extern struct xics_ipi_struct xics_ipi_message[NR_CPUS] __cacheline_aligned;
  
  
  extern struct xics_ipi_struct xics_ipi_message[NR_CPUS] __cacheline_aligned;
  


@@ -95615,10 +95954,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/xics.h powerpc
 -extern void pseries_8259_cascade(unsigned int irq, struct irq_desc *desc);
 -
  #endif /* _POWERPC_KERNEL_XICS_H */
 -extern void pseries_8259_cascade(unsigned int irq, struct irq_desc *desc);
 -
  #endif /* _POWERPC_KERNEL_XICS_H */

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/Makefile powerpc.git/arch/powerpc/sysdev/Makefile
---- linux-2.6.25-rc9/arch/powerpc/sysdev/Makefile      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/Makefile   2008-04-19 16:40:52.000000000 +0200
-@@ -12,6 +12,7 @@
+Index: linux-2.6.25.1/arch/powerpc/sysdev/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/sysdev/Makefile
++++ linux-2.6.25.1/arch/powerpc/sysdev/Makefile
+@@ -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


@@ -95626,7 +95966,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/Makefile powerpc.git/arch
  obj-$(CONFIG_RAPIDIO)         += fsl_rio.o
  obj-$(CONFIG_TSI108_BRIDGE)   += tsi108_pci.o tsi108_dev.o
  obj-$(CONFIG_QUICC_ENGINE)    += qe_lib/
  obj-$(CONFIG_RAPIDIO)         += fsl_rio.o
  obj-$(CONFIG_TSI108_BRIDGE)   += tsi108_pci.o tsi108_dev.o
  obj-$(CONFIG_QUICC_ENGINE)    += qe_lib/

-@@ -27,6 +28,7 @@
+@@ -27,6 +28,7 @@ obj-$(CONFIG_PPC_INDIRECT_PCI)       += indire

  obj-$(CONFIG_PPC_I8259)               += i8259.o
  obj-$(CONFIG_IPIC)            += ipic.o
  obj-$(CONFIG_4xx)             += uic.o
  obj-$(CONFIG_PPC_I8259)               += i8259.o
  obj-$(CONFIG_IPIC)            += ipic.o
  obj-$(CONFIG_4xx)             += uic.o


@@ -95634,9 +95974,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/Makefile powerpc.git/arch
  obj-$(CONFIG_XILINX_VIRTEX)   += xilinx_intc.o
  obj-$(CONFIG_OF_RTC)          += of_rtc.o
  ifeq ($(CONFIG_PCI),y)
  obj-$(CONFIG_XILINX_VIRTEX)   += xilinx_intc.o
  obj-$(CONFIG_OF_RTC)          += of_rtc.o
  ifeq ($(CONFIG_PCI),y)

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/cpm1.c powerpc.git/arch/powerpc/sysdev/cpm1.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/cpm1.c        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/cpm1.c     2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/sysdev/cpm1.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/sysdev/cpm1.c
++++ linux-2.6.25.1/arch/powerpc/sysdev/cpm1.c

 @@ -44,9 +44,6 @@
  
  #define CPM_MAP_SIZE    (0x4000)
 @@ -44,9 +44,6 @@
  
  #define CPM_MAP_SIZE    (0x4000)


@@ -95647,7 +95988,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/cpm1.c powerpc.git/arch/p
  cpm8xx_t __iomem *cpmp;  /* Pointer to comm processor space */
  immap_t __iomem *mpc8xx_immr;
  static cpic8xx_t __iomem *cpic_reg;
  cpm8xx_t __iomem *cpmp;  /* Pointer to comm processor space */
  immap_t __iomem *mpc8xx_immr;
  static cpic8xx_t __iomem *cpic_reg;

-@@ -229,12 +226,7 @@
+@@ -229,12 +226,7 @@ void __init cpm_reset(void)

        out_be32(&siu_conf->sc_sdcr, 1);
        immr_unmap(siu_conf);
  
        out_be32(&siu_conf->sc_sdcr, 1);
        immr_unmap(siu_conf);
  


@@ -95660,7 +96001,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/cpm1.c powerpc.git/arch/p
  }
  
  static DEFINE_SPINLOCK(cmd_lock);
  }
  
  static DEFINE_SPINLOCK(cmd_lock);

-@@ -257,7 +249,7 @@
+@@ -257,7 +249,7 @@ int cpm_command(u32 command, u8 opcode)

                if ((in_be16(&cpmp->cp_cpcr) & CPM_CR_FLG) == 0)
                        goto out;
  
                if ((in_be16(&cpmp->cp_cpcr) & CPM_CR_FLG) == 0)
                        goto out;
  


@@ -95669,7 +96010,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/cpm1.c powerpc.git/arch/p
        ret = -EIO;
  out:
        spin_unlock_irqrestore(&cmd_lock, flags);
        ret = -EIO;
  out:
        spin_unlock_irqrestore(&cmd_lock, flags);

-@@ -293,110 +285,6 @@
+@@ -293,110 +285,6 @@ cpm_setbrg(uint brg, uint rate)

                              CPM_BRG_EN | CPM_BRG_DIV16);
  }
  
                              CPM_BRG_EN | CPM_BRG_DIV16);
  }
  


@@ -95780,9 +96121,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/cpm1.c powerpc.git/arch/p
  struct cpm_ioport16 {
        __be16 dir, par, odr_sor, dat, intr;
        __be16 res[3];
  struct cpm_ioport16 {
        __be16 dir, par, odr_sor, dat, intr;
        __be16 res[3];

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/cpm2.c powerpc.git/arch/powerpc/sysdev/cpm2.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/cpm2.c        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/cpm2.c     2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/sysdev/cpm2.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/sysdev/cpm2.c
++++ linux-2.6.25.1/arch/powerpc/sysdev/cpm2.c

 @@ -46,10 +46,6 @@
  
  #include <sysdev/fsl_soc.h>
 @@ -46,10 +46,6 @@
  
  #include <sysdev/fsl_soc.h>


@@ -95794,7 +96136,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/cpm2.c powerpc.git/arch/p
  cpm_cpm2_t __iomem *cpmp; /* Pointer to comm processor space */
  
  /* We allocate this here because it is used almost exclusively for
  cpm_cpm2_t __iomem *cpmp; /* Pointer to comm processor space */
  
  /* We allocate this here because it is used almost exclusively for

-@@ -71,15 +67,17 @@
+@@ -71,15 +67,17 @@ void __init cpm2_reset(void)

  
        /* Reclaim the DP memory for our use.
         */
  
        /* Reclaim the DP memory for our use.
         */


@@ -95816,7 +96158,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/cpm2.c powerpc.git/arch/p
  }
  
  static DEFINE_SPINLOCK(cmd_lock);
  }
  
  static DEFINE_SPINLOCK(cmd_lock);

-@@ -99,7 +97,7 @@
+@@ -99,7 +97,7 @@ int cpm_command(u32 command, u8 opcode)

                if ((in_be32(&cpmp->cp_cpcr) & CPM_CR_FLG) == 0)
                        goto out;
  
                if ((in_be32(&cpmp->cp_cpcr) & CPM_CR_FLG) == 0)
                        goto out;
  


@@ -95825,7 +96167,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/cpm2.c powerpc.git/arch/p
        ret = -EIO;
  out:
        spin_unlock_irqrestore(&cmd_lock, flags);
        ret = -EIO;
  out:
        spin_unlock_irqrestore(&cmd_lock, flags);

-@@ -347,95 +345,6 @@
+@@ -347,95 +345,6 @@ int cpm2_smc_clk_setup(enum cpm_clk_targ

        return ret;
  }
  
        return ret;
  }
  


@@ -95921,10 +96263,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/cpm2.c powerpc.git/arch/p
  struct cpm2_ioports {
        u32 dir, par, sor, odr, dat;
        u32 res[3];
  struct cpm2_ioports {
        u32 dir, par, sor, odr, dat;
        u32 res[3];

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/cpm_common.c powerpc.git/arch/powerpc/sysdev/cpm_common.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/cpm_common.c  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/cpm_common.c       2008-04-19 16:40:52.000000000 +0200
-@@ -58,7 +58,6 @@
+Index: linux-2.6.25.1/arch/powerpc/sysdev/cpm_common.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/sysdev/cpm_common.c
++++ linux-2.6.25.1/arch/powerpc/sysdev/cpm_common.c
+@@ -58,7 +58,6 @@ void __init udbg_init_cpm(void)

  }
  #endif
  
  }
  #endif
  


@@ -95932,15 +96275,16 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/cpm_common.c powerpc.git/
  static spinlock_t cpm_muram_lock;
  static rh_block_t cpm_boot_muram_rh_block[16];
  static rh_info_t cpm_muram_info;
  static spinlock_t cpm_muram_lock;
  static rh_block_t cpm_boot_muram_rh_block[16];
  static rh_info_t cpm_muram_info;

-@@ -199,5 +198,3 @@
+@@ -199,5 +198,3 @@ dma_addr_t cpm_muram_dma(void __iomem *a

        return muram_pbase + ((u8 __iomem *)addr - muram_vbase);
  }
  EXPORT_SYMBOL(cpm_muram_dma);
 -
 -#endif /* CONFIG_PPC_CPM_NEW_BINDING */
        return muram_pbase + ((u8 __iomem *)addr - muram_vbase);
  }
  EXPORT_SYMBOL(cpm_muram_dma);
 -
 -#endif /* CONFIG_PPC_CPM_NEW_BINDING */

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/dart_iommu.c powerpc.git/arch/powerpc/sysdev/dart_iommu.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/dart_iommu.c  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/dart_iommu.c       2008-03-17 14:03:32.000000000 +0100
+Index: linux-2.6.25.1/arch/powerpc/sysdev/dart_iommu.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/sysdev/dart_iommu.c
++++ linux-2.6.25.1/arch/powerpc/sysdev/dart_iommu.c

 @@ -37,6 +37,7 @@
  #include <linux/dma-mapping.h>
  #include <linux/vmalloc.h>
 @@ -37,6 +37,7 @@
  #include <linux/dma-mapping.h>
  #include <linux/vmalloc.h>


@@ -95957,9 +96301,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/dart_iommu.c powerpc.git/
  #include <asm/ppc-pci.h>
  
  #include "dart.h"
  #include <asm/ppc-pci.h>
  
  #include "dart.h"

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/fsl_lbc.c powerpc.git/arch/powerpc/sysdev/fsl_lbc.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/fsl_lbc.c     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/fsl_lbc.c  2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/sysdev/fsl_lbc.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/sysdev/fsl_lbc.c

 @@ -0,0 +1,129 @@
 +/*
 + * Freescale LBC and UPM routines.
 @@ -0,0 +1,129 @@
 +/*
 + * Freescale LBC and UPM routines.


@@ -96090,10 +96435,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/fsl_lbc.c powerpc.git/arc
 +      return 0;
 +}
 +EXPORT_SYMBOL(fsl_upm_find);
 +      return 0;
 +}
 +EXPORT_SYMBOL(fsl_upm_find);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/fsl_soc.c powerpc.git/arch/powerpc/sysdev/fsl_soc.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/fsl_soc.c     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/fsl_soc.c  2008-04-19 16:40:52.000000000 +0200
-@@ -75,6 +75,33 @@
+Index: linux-2.6.25.1/arch/powerpc/sysdev/fsl_soc.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/sysdev/fsl_soc.c
++++ linux-2.6.25.1/arch/powerpc/sysdev/fsl_soc.c
+@@ -75,6 +75,33 @@ phys_addr_t get_immrbase(void)

  
  EXPORT_SYMBOL(get_immrbase);
  
  
  EXPORT_SYMBOL(get_immrbase);
  


@@ -96127,7 +96473,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/fsl_soc.c powerpc.git/arc
  #if defined(CONFIG_CPM2) || defined(CONFIG_QUICC_ENGINE) || defined(CONFIG_8xx)
  
  static u32 brgfreq = -1;
  #if defined(CONFIG_CPM2) || defined(CONFIG_QUICC_ENGINE) || defined(CONFIG_8xx)
  
  static u32 brgfreq = -1;

-@@ -516,9 +543,9 @@
+@@ -516,9 +543,9 @@ arch_initcall(fsl_i2c_of_init);

  static int __init mpc83xx_wdt_init(void)
  {
        struct resource r;
  static int __init mpc83xx_wdt_init(void)
  {
        struct resource r;


@@ -96139,7 +96485,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/fsl_soc.c powerpc.git/arc
        int ret;
  
        np = of_find_compatible_node(NULL, "watchdog", "mpc83xx_wdt");
        int ret;
  
        np = of_find_compatible_node(NULL, "watchdog", "mpc83xx_wdt");

-@@ -528,19 +555,6 @@
+@@ -528,19 +555,6 @@ static int __init mpc83xx_wdt_init(void)

                goto nodev;
        }
  
                goto nodev;
        }
  


@@ -96159,7 +96505,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/fsl_soc.c powerpc.git/arc
        memset(&r, 0, sizeof(r));
  
        ret = of_address_to_resource(np, 0, &r);
        memset(&r, 0, sizeof(r));
  
        ret = of_address_to_resource(np, 0, &r);

-@@ -553,20 +567,16 @@
+@@ -553,20 +567,16 @@ static int __init mpc83xx_wdt_init(void)

                goto err;
        }
  
                goto err;
        }
  


@@ -96181,7 +96527,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/fsl_soc.c powerpc.git/arc
        of_node_put(np);
  nodev:
        return ret;
        of_node_put(np);
  nodev:
        return ret;

-@@ -735,547 +745,6 @@
+@@ -735,547 +745,6 @@ err:

  
  arch_initcall(fsl_usb_of_init);
  
  
  arch_initcall(fsl_usb_of_init);
  


@@ -96729,7 +97075,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/fsl_soc.c powerpc.git/arc
  static int __init of_fsl_spi_probe(char *type, char *compatible, u32 sysclk,
                                   struct spi_board_info *board_infos,
                                   unsigned int num_board_infos,
  static int __init of_fsl_spi_probe(char *type, char *compatible, u32 sysclk,
                                   struct spi_board_info *board_infos,
                                   unsigned int num_board_infos,

-@@ -1371,25 +840,9 @@
+@@ -1371,25 +840,9 @@ int __init fsl_spi_init(struct spi_board

        sysclk = get_brgfreq();
  #endif
        if (sysclk == -1) {
        sysclk = get_brgfreq();
  #endif
        if (sysclk == -1) {


@@ -96757,9 +97103,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/fsl_soc.c powerpc.git/arc
        }
  
        ret = of_fsl_spi_probe(NULL, "fsl,spi", sysclk, board_infos,
        }
  
        ret = of_fsl_spi_probe(NULL, "fsl,spi", sysclk, board_infos,

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/fsl_soc.h powerpc.git/arch/powerpc/sysdev/fsl_soc.h
---- linux-2.6.25-rc9/arch/powerpc/sysdev/fsl_soc.h     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/fsl_soc.h  2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/sysdev/fsl_soc.h
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/sysdev/fsl_soc.h
++++ linux-2.6.25.1/arch/powerpc/sysdev/fsl_soc.h

 @@ -7,6 +7,7 @@
  extern phys_addr_t get_immrbase(void);
  extern u32 get_brgfreq(void);
 @@ -7,6 +7,7 @@
  extern phys_addr_t get_immrbase(void);
  extern u32 get_brgfreq(void);


@@ -96768,10 +97115,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/fsl_soc.h powerpc.git/arc
  
  struct spi_board_info;
  
  
  struct spi_board_info;
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mpic.c powerpc.git/arch/powerpc/sysdev/mpic.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/mpic.c        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/mpic.c     2008-04-19 16:40:52.000000000 +0200
-@@ -175,13 +175,16 @@
+Index: linux-2.6.25.1/arch/powerpc/sysdev/mpic.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/sysdev/mpic.c
++++ linux-2.6.25.1/arch/powerpc/sysdev/mpic.c
+@@ -175,13 +175,16 @@ static inline void _mpic_write(enum mpic

        switch(type) {
  #ifdef CONFIG_PPC_DCR
        case mpic_access_dcr:
        switch(type) {
  #ifdef CONFIG_PPC_DCR
        case mpic_access_dcr:


@@ -96791,7 +97139,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mpic.c powerpc.git/arch/p
        }
  }
  
        }
  }
  

-@@ -1000,7 +1003,7 @@
+@@ -1000,7 +1003,7 @@ struct mpic * __init mpic_alloc(struct d

                                const char *name)
  {
        struct mpic     *mpic;
                                const char *name)
  {
        struct mpic     *mpic;


@@ -96800,7 +97148,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mpic.c powerpc.git/arch/p
        const char      *vers;
        int             i;
        int             intvec_top;
        const char      *vers;
        int             i;
        int             intvec_top;

-@@ -1064,7 +1067,8 @@
+@@ -1064,7 +1067,8 @@ struct mpic * __init mpic_alloc(struct d

  
        /* Look for protected sources */
        if (node) {
  
        /* Look for protected sources */
        if (node) {


@@ -96810,7 +97158,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mpic.c powerpc.git/arch/p
                const u32 *psrc =
                        of_get_property(node, "protected-sources", &psize);
                if (psrc) {
                const u32 *psrc =
                        of_get_property(node, "protected-sources", &psize);
                if (psrc) {

-@@ -1107,8 +1111,7 @@
+@@ -1107,8 +1111,7 @@ struct mpic * __init mpic_alloc(struct d

         * in, try to obtain one
         */
        if (paddr == 0 && !(mpic->flags & MPIC_USES_DCR)) {
         * in, try to obtain one
         */
        if (paddr == 0 && !(mpic->flags & MPIC_USES_DCR)) {


@@ -96820,7 +97168,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mpic.c powerpc.git/arch/p
                BUG_ON(reg == NULL);
                paddr = of_translate_address(node, reg);
                BUG_ON(paddr == OF_BAD_ADDR);
                BUG_ON(reg == NULL);
                paddr = of_translate_address(node, reg);
                BUG_ON(paddr == OF_BAD_ADDR);

-@@ -1137,12 +1140,13 @@
+@@ -1137,12 +1140,13 @@ struct mpic * __init mpic_alloc(struct d

         * MPICs, num sources as well. On ISU MPICs, sources are counted
         * as ISUs are added
         */
         * MPICs, num sources as well. On ISU MPICs, sources are counted
         * as ISUs are added
         */


@@ -96838,7 +97186,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mpic.c powerpc.git/arch/p
  
        /* Map the per-CPU registers */
        for (i = 0; i < mpic->num_cpus; i++) {
  
        /* Map the per-CPU registers */
        for (i = 0; i < mpic->num_cpus; i++) {

-@@ -1161,7 +1165,7 @@
+@@ -1161,7 +1165,7 @@ struct mpic * __init mpic_alloc(struct d

        mpic->isu_mask = (1 << mpic->isu_shift) - 1;
  
        /* Display version */
        mpic->isu_mask = (1 << mpic->isu_shift) - 1;
  
        /* Display version */


@@ -96847,7 +97195,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mpic.c powerpc.git/arch/p
        case 1:
                vers = "1.0";
                break;
        case 1:
                vers = "1.0";
                break;

-@@ -1321,7 +1325,7 @@
+@@ -1321,7 +1325,7 @@ void __init mpic_set_serial_int(struct m

  
  void mpic_irq_set_priority(unsigned int irq, unsigned int pri)
  {
  
  void mpic_irq_set_priority(unsigned int irq, unsigned int pri)
  {


@@ -96856,7 +97204,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mpic.c powerpc.git/arch/p
        struct mpic *mpic = mpic_find(irq, &is_ipi);
        unsigned int src = mpic_irq_to_hw(irq);
        unsigned long flags;
        struct mpic *mpic = mpic_find(irq, &is_ipi);
        unsigned int src = mpic_irq_to_hw(irq);
        unsigned long flags;

-@@ -1344,7 +1348,7 @@
+@@ -1344,7 +1348,7 @@ void mpic_irq_set_priority(unsigned int 

  
  unsigned int mpic_irq_get_priority(unsigned int irq)
  {
  
  unsigned int mpic_irq_get_priority(unsigned int irq)
  {


@@ -96865,7 +97213,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mpic.c powerpc.git/arch/p
        struct mpic *mpic = mpic_find(irq, &is_ipi);
        unsigned int src = mpic_irq_to_hw(irq);
        unsigned long flags;
        struct mpic *mpic = mpic_find(irq, &is_ipi);
        unsigned int src = mpic_irq_to_hw(irq);
        unsigned long flags;

-@@ -1406,11 +1410,6 @@
+@@ -1406,11 +1410,6 @@ void mpic_cpu_set_priority(int prio)

        mpic_cpu_write(MPIC_INFO(CPU_CURRENT_TASK_PRI), prio);
  }
  
        mpic_cpu_write(MPIC_INFO(CPU_CURRENT_TASK_PRI), prio);
  }
  


@@ -96877,7 +97225,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mpic.c powerpc.git/arch/p
  void mpic_teardown_this_cpu(int secondary)
  {
        struct mpic *mpic = mpic_primary;
  void mpic_teardown_this_cpu(int secondary)
  {
        struct mpic *mpic = mpic_primary;

-@@ -1430,6 +1429,10 @@
+@@ -1430,6 +1429,10 @@ void mpic_teardown_this_cpu(int secondar

  
        /* Set current processor priority to max */
        mpic_cpu_write(MPIC_INFO(CPU_CURRENT_TASK_PRI), 0xf);
  
        /* Set current processor priority to max */
        mpic_cpu_write(MPIC_INFO(CPU_CURRENT_TASK_PRI), 0xf);


@@ -96888,10 +97236,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mpic.c powerpc.git/arch/p
  
        spin_unlock_irqrestore(&mpic_lock, flags);
  }
  
        spin_unlock_irqrestore(&mpic_lock, flags);
  }

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mv64x60_dev.c powerpc.git/arch/powerpc/sysdev/mv64x60_dev.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/mv64x60_dev.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/mv64x60_dev.c      2008-04-19 16:40:52.000000000 +0200
-@@ -127,7 +127,7 @@
+Index: linux-2.6.25.1/arch/powerpc/sysdev/mv64x60_dev.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/sysdev/mv64x60_dev.c
++++ linux-2.6.25.1/arch/powerpc/sysdev/mv64x60_dev.c
+@@ -127,7 +127,7 @@ static int __init mv64x60_mpsc_device_se

        if (err)
                return err;
  
        if (err)
                return err;
  


@@ -96900,7 +97249,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mv64x60_dev.c powerpc.git
        if (!prop)
                return -ENODEV;
        port_number = *(int *)prop;
        if (!prop)
                return -ENODEV;
        port_number = *(int *)prop;

-@@ -136,6 +136,7 @@
+@@ -136,6 +136,7 @@ static int __init mv64x60_mpsc_device_se

  
        pdata.cache_mgmt = 1; /* All current revs need this set */
  
  
        pdata.cache_mgmt = 1; /* All current revs need this set */
  


@@ -96908,7 +97257,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mv64x60_dev.c powerpc.git
        prop = of_get_property(np, "max_idle", NULL);
        if (prop)
                pdata.max_idle = *prop;
        prop = of_get_property(np, "max_idle", NULL);
        if (prop)
                pdata.max_idle = *prop;

-@@ -205,30 +206,24 @@
+@@ -205,30 +206,24 @@ error:

  /*
   * Create mv64x60_eth platform devices
   */
  /*
   * Create mv64x60_eth platform devices
   */


@@ -96946,7 +97295,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mv64x60_dev.c powerpc.git
  {
        struct resource r[1];
        struct mv643xx_eth_platform_data pdata;
  {
        struct resource r[1];
        struct mv643xx_eth_platform_data pdata;

-@@ -239,16 +234,12 @@
+@@ -239,16 +234,12 @@ static int __init mv64x60_eth_device_set

        const phandle *ph;
        int err;
  
        const phandle *ph;
        int err;
  


@@ -96964,7 +97313,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mv64x60_dev.c powerpc.git
        if (!prop)
                return -ENODEV;
        pdata.port_number = *prop;
        if (!prop)
                return -ENODEV;
        pdata.port_number = *prop;

-@@ -301,7 +292,7 @@
+@@ -301,7 +292,7 @@ static int __init mv64x60_eth_device_set

  
        of_node_put(phy);
  
  
        of_node_put(phy);
  


@@ -96973,7 +97322,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mv64x60_dev.c powerpc.git
        if (!pdev)
                return -ENOMEM;
  
        if (!pdev)
                return -ENOMEM;
  

-@@ -345,21 +336,19 @@
+@@ -345,21 +336,19 @@ static int __init mv64x60_i2c_device_set

  
        memset(&pdata, 0, sizeof(pdata));
  
  
        memset(&pdata, 0, sizeof(pdata));
  


@@ -96998,7 +97347,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mv64x60_dev.c powerpc.git
  
        pdev = platform_device_alloc(MV64XXX_I2C_CTLR_NAME, id);
        if (!pdev)
  
        pdev = platform_device_alloc(MV64XXX_I2C_CTLR_NAME, id);
        if (!pdev)

-@@ -401,10 +390,7 @@
+@@ -401,10 +390,7 @@ static int __init mv64x60_wdt_device_set

  
        memset(&pdata, 0, sizeof(pdata));
  
  
        memset(&pdata, 0, sizeof(pdata));
  


@@ -97010,7 +97359,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mv64x60_dev.c powerpc.git
  
        np = of_get_parent(np);
        if (!np)
  
        np = of_get_parent(np);
        if (!np)

-@@ -441,27 +427,43 @@
+@@ -441,27 +427,43 @@ error:

  
  static int __init mv64x60_device_setup(void)
  {
  
  static int __init mv64x60_device_setup(void)
  {


@@ -97061,7 +97410,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mv64x60_dev.c powerpc.git
        if (np) {
                if ((err = mv64x60_wdt_device_setup(np, id)))
                        goto error;
        if (np) {
                if ((err = mv64x60_wdt_device_setup(np, id)))
                        goto error;

-@@ -489,10 +491,10 @@
+@@ -489,10 +491,10 @@ static int __init mv64x60_add_mpsc_conso

        if (!np)
                goto not_mpsc;
  
        if (!np)
                goto not_mpsc;
  


@@ -97074,10 +97423,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mv64x60_dev.c powerpc.git
        if (!prop)
                goto not_mpsc;
  
        if (!prop)
                goto not_mpsc;
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mv64x60_pci.c powerpc.git/arch/powerpc/sysdev/mv64x60_pci.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/mv64x60_pci.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/mv64x60_pci.c      2008-04-19 16:40:52.000000000 +0200
-@@ -86,14 +86,14 @@
+Index: linux-2.6.25.1/arch/powerpc/sysdev/mv64x60_pci.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/sysdev/mv64x60_pci.c
++++ linux-2.6.25.1/arch/powerpc/sysdev/mv64x60_pci.c
+@@ -86,14 +86,14 @@ static int __init mv64x60_sysfs_init(voi

        struct platform_device *pdev;
        const unsigned int *prop;
  
        struct platform_device *pdev;
        const unsigned int *prop;
  


@@ -97094,7 +97444,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mv64x60_pci.c powerpc.git
        if (IS_ERR(pdev))
                return PTR_ERR(pdev);
  
        if (IS_ERR(pdev))
                return PTR_ERR(pdev);
  

-@@ -166,6 +166,6 @@
+@@ -166,6 +166,6 @@ void __init mv64x60_pci_init(void)

  {
        struct device_node *np;
  
  {
        struct device_node *np;
  


@@ -97102,10 +97452,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mv64x60_pci.c powerpc.git
 +      for_each_compatible_node(np, "pci", "marvell,mv64360-pci")
                mv64x60_add_bridge(np);
  }
 +      for_each_compatible_node(np, "pci", "marvell,mv64360-pci")
                mv64x60_add_bridge(np);
  }

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mv64x60_pic.c powerpc.git/arch/powerpc/sysdev/mv64x60_pic.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/mv64x60_pic.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/mv64x60_pic.c      2008-04-19 16:40:52.000000000 +0200
-@@ -238,13 +238,13 @@
+Index: linux-2.6.25.1/arch/powerpc/sysdev/mv64x60_pic.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/sysdev/mv64x60_pic.c
++++ linux-2.6.25.1/arch/powerpc/sysdev/mv64x60_pic.c
+@@ -238,13 +238,13 @@ void __init mv64x60_init_irq(void)

        const unsigned int *reg;
        unsigned long flags;
  
        const unsigned int *reg;
        unsigned long flags;
  


@@ -97121,10 +97472,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mv64x60_pic.c powerpc.git
        reg = of_get_property(np, "reg", &size);
        paddr = of_translate_address(np, reg);
        mv64x60_irq_reg_base = ioremap(paddr, reg[1]);
        reg = of_get_property(np, "reg", &size);
        paddr = of_translate_address(np, reg);
        mv64x60_irq_reg_base = ioremap(paddr, reg[1]);

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mv64x60_udbg.c powerpc.git/arch/powerpc/sysdev/mv64x60_udbg.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/mv64x60_udbg.c        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/mv64x60_udbg.c     2008-04-19 16:40:52.000000000 +0200
-@@ -85,7 +85,7 @@
+Index: linux-2.6.25.1/arch/powerpc/sysdev/mv64x60_udbg.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/sysdev/mv64x60_udbg.c
++++ linux-2.6.25.1/arch/powerpc/sysdev/mv64x60_udbg.c
+@@ -85,7 +85,7 @@ static void mv64x60_udbg_init(void)

        if (!stdout)
                return;
  
        if (!stdout)
                return;
  


@@ -97133,10 +97485,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mv64x60_udbg.c powerpc.gi
                if (np == stdout)
                        break;
        }
                if (np == stdout)
                        break;
        }

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/ppc4xx_pci.c powerpc.git/arch/powerpc/sysdev/ppc4xx_pci.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/ppc4xx_pci.c  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/ppc4xx_pci.c       2008-04-19 16:40:52.000000000 +0200
-@@ -527,6 +527,7 @@
+Index: linux-2.6.25.1/arch/powerpc/sysdev/ppc4xx_pci.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/sysdev/ppc4xx_pci.c
++++ linux-2.6.25.1/arch/powerpc/sysdev/ppc4xx_pci.c
+@@ -527,6 +527,7 @@ static void __init ppc4xx_probe_pcix_bri

   *
   * ibm,plb-pciex-440spe
   * ibm,plb-pciex-405ex
   *
   * ibm,plb-pciex-440spe
   * ibm,plb-pciex-405ex


@@ -97144,7 +97497,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/ppc4xx_pci.c powerpc.git/
   *
   * Anything else will be rejected for now as they are all subtly
   * different unfortunately.
   *
   * Anything else will be rejected for now as they are all subtly
   * different unfortunately.

-@@ -645,7 +646,7 @@
+@@ -645,7 +646,7 @@ static int __init ppc440spe_pciex_core_i

        int time_out = 20;
  
        /* Set PLL clock receiver to LVPECL */
        int time_out = 20;
  
        /* Set PLL clock receiver to LVPECL */


@@ -97153,7 +97506,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/ppc4xx_pci.c powerpc.git/
  
        /* Shouldn't we do all the calibration stuff etc... here ? */
        if (ppc440spe_pciex_check_reset(np))
  
        /* Shouldn't we do all the calibration stuff etc... here ? */
        if (ppc440spe_pciex_check_reset(np))

-@@ -659,8 +660,7 @@
+@@ -659,8 +660,7 @@ static int __init ppc440spe_pciex_core_i

        }
  
        /* De-assert reset of PCIe PLL, wait for lock */
        }
  
        /* De-assert reset of PCIe PLL, wait for lock */


@@ -97163,7 +97516,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/ppc4xx_pci.c powerpc.git/
        udelay(3);
  
        while (time_out) {
        udelay(3);
  
        while (time_out) {

-@@ -712,9 +712,8 @@
+@@ -712,9 +712,8 @@ static int ppc440spe_pciex_init_port_hw(

                mtdcri(SDR0, port->sdr_base + PESDRn_440SPE_HSSL7SET1,
                       0x35000000);
        }
                mtdcri(SDR0, port->sdr_base + PESDRn_440SPE_HSSL7SET1,
                       0x35000000);
        }


@@ -97175,7 +97528,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/ppc4xx_pci.c powerpc.git/
  
        return 0;
  }
  
        return 0;
  }

-@@ -775,6 +774,115 @@
+@@ -775,6 +774,115 @@ static struct ppc4xx_pciex_hwops ppc440s

        .setup_utl      = ppc440speB_pciex_init_utl,
  };
  
        .setup_utl      = ppc440speB_pciex_init_utl,
  };
  


@@ -97291,7 +97644,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/ppc4xx_pci.c powerpc.git/
  #endif /* CONFIG_44x */
  
  #ifdef CONFIG_40x
  #endif /* CONFIG_44x */
  
  #ifdef CONFIG_40x

-@@ -830,17 +938,9 @@
+@@ -830,17 +938,9 @@ static int ppc405ex_pciex_init_port_hw(s

         * PCIe boards don't show this problem.
         * This has to be re-tested and fixed in a later release!
         */
         * PCIe boards don't show this problem.
         * This has to be re-tested and fixed in a later release!
         */


@@ -97309,7 +97662,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/ppc4xx_pci.c powerpc.git/
  
        dcr_write(port->dcrs, DCRO_PEGPL_CFG, 0x10000000);  /* guarded on */
  
  
        dcr_write(port->dcrs, DCRO_PEGPL_CFG, 0x10000000);  /* guarded on */
  

-@@ -896,6 +996,8 @@
+@@ -896,6 +996,8 @@ static int __init ppc4xx_pciex_check_cor

                else
                        ppc4xx_pciex_hwops = &ppc440speB_pcie_hwops;
        }
                else
                        ppc4xx_pciex_hwops = &ppc440speB_pcie_hwops;
        }


@@ -97318,7 +97671,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/ppc4xx_pci.c powerpc.git/
  #endif /* CONFIG_44x    */
  #ifdef CONFIG_40x
        if (of_device_is_compatible(np, "ibm,plb-pciex-405ex"))
  #endif /* CONFIG_44x    */
  #ifdef CONFIG_40x
        if (of_device_is_compatible(np, "ibm,plb-pciex-405ex"))

-@@ -1042,8 +1144,7 @@
+@@ -1042,8 +1144,7 @@ static int __init ppc4xx_pciex_port_init

                port->link = 0;
        }
  
                port->link = 0;
        }
  


@@ -97328,9 +97681,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/ppc4xx_pci.c powerpc.git/
        msleep(100);
  
        return 0;
        msleep(100);
  
        return 0;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/ppc4xx_pci.h powerpc.git/arch/powerpc/sysdev/ppc4xx_pci.h
---- linux-2.6.25-rc9/arch/powerpc/sysdev/ppc4xx_pci.h  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/ppc4xx_pci.h       2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/sysdev/ppc4xx_pci.h
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/sysdev/ppc4xx_pci.h
++++ linux-2.6.25.1/arch/powerpc/sysdev/ppc4xx_pci.h

 @@ -271,6 +271,59 @@
  #define PESDR1_405EX_PHYSTA           0x044C
  
 @@ -271,6 +271,59 @@
  #define PESDR1_405EX_PHYSTA           0x044C
  


@@ -97404,9 +97758,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/ppc4xx_pci.h powerpc.git/
  
  enum
  {
  
  enum
  {

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/ppc4xx_soc.c powerpc.git/arch/powerpc/sysdev/ppc4xx_soc.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/ppc4xx_soc.c  1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/ppc4xx_soc.c       2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/sysdev/ppc4xx_soc.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/powerpc/sysdev/ppc4xx_soc.c

 @@ -0,0 +1,200 @@
 +/*
 + * IBM/AMCC PPC4xx SoC setup code
 @@ -0,0 +1,200 @@
 +/*
 + * IBM/AMCC PPC4xx SoC setup code


@@ -97608,10 +97963,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/ppc4xx_soc.c powerpc.git/
 +      while (1)
 +              ;       /* Just in case the reset doesn't work */
 +}
 +      while (1)
 +              ;       /* Just in case the reset doesn't work */
 +}

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/qe.c powerpc.git/arch/powerpc/sysdev/qe_lib/qe.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/qe.c   2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/qe_lib/qe.c        2008-04-19 16:40:52.000000000 +0200
-@@ -55,7 +55,7 @@
+Index: linux-2.6.25.1/arch/powerpc/sysdev/qe_lib/qe.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/sysdev/qe_lib/qe.c
++++ linux-2.6.25.1/arch/powerpc/sysdev/qe_lib/qe.c
+@@ -55,7 +55,7 @@ struct qe_snum {

  /* We allocate this here because it is used almost exclusively for
   * the communication processor devices.
   */
  /* We allocate this here because it is used almost exclusively for
   * the communication processor devices.
   */


@@ -97620,7 +97976,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/qe.c powerpc.git/a
  EXPORT_SYMBOL(qe_immr);
  
  static struct qe_snum snums[QE_NUM_OF_SNUM];  /* Dynamically allocated SNUMs */
  EXPORT_SYMBOL(qe_immr);
  
  static struct qe_snum snums[QE_NUM_OF_SNUM];  /* Dynamically allocated SNUMs */

-@@ -156,7 +156,7 @@
+@@ -156,7 +156,7 @@ EXPORT_SYMBOL(qe_issue_cmd);

   */
  static unsigned int brg_clk = 0;
  
   */
  static unsigned int brg_clk = 0;
  


@@ -97629,7 +97985,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/qe.c powerpc.git/a
  {
        struct device_node *qe;
        unsigned int size;
  {
        struct device_node *qe;
        unsigned int size;

-@@ -180,6 +180,7 @@
+@@ -180,6 +180,7 @@ unsigned int get_brg_clk(void)

  
        return brg_clk;
  }
  
        return brg_clk;
  }


@@ -97637,7 +97993,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/qe.c powerpc.git/a
  
  /* Program the BRG to the given sampling rate and multiplier
   *
  
  /* Program the BRG to the given sampling rate and multiplier
   *

-@@ -197,7 +198,7 @@
+@@ -197,7 +198,7 @@ int qe_setbrg(enum qe_clock brg, unsigne

        if ((brg < QE_BRG1) || (brg > QE_BRG16))
                return -EINVAL;
  
        if ((brg < QE_BRG1) || (brg > QE_BRG16))
                return -EINVAL;
  


@@ -97646,7 +98002,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/qe.c powerpc.git/a
  
        if (divisor > QE_BRGC_DIVISOR_MAX + 1) {
                div16 = QE_BRGC_DIV16;
  
        if (divisor > QE_BRGC_DIVISOR_MAX + 1) {
                div16 = QE_BRGC_DIV16;

-@@ -415,12 +416,6 @@
+@@ -415,12 +416,6 @@ void qe_muram_dump(void)

  }
  EXPORT_SYMBOL(qe_muram_dump);
  
  }
  EXPORT_SYMBOL(qe_muram_dump);
  


@@ -97659,9 +98015,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/qe.c powerpc.git/a
  /* The maximum number of RISCs we support */
  #define MAX_QE_RISC     2
  
  /* The maximum number of RISCs we support */
  #define MAX_QE_RISC     2
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/qe_io.c powerpc.git/arch/powerpc/sysdev/qe_lib/qe_io.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/qe_io.c        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/qe_lib/qe_io.c     2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/sysdev/qe_lib/qe_io.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/sysdev/qe_lib/qe_io.c
++++ linux-2.6.25.1/arch/powerpc/sysdev/qe_lib/qe_io.c

 @@ -22,6 +22,7 @@
  #include <linux/ioport.h>
  
 @@ -22,6 +22,7 @@
  #include <linux/ioport.h>
  


@@ -97670,7 +98027,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/qe_io.c powerpc.gi
  #include <asm/prom.h>
  #include <sysdev/fsl_soc.h>
  
  #include <asm/prom.h>
  #include <sysdev/fsl_soc.h>
  

-@@ -41,7 +42,7 @@
+@@ -41,7 +42,7 @@ struct port_regs {

  #endif
  };
  
  #endif
  };
  


@@ -97679,7 +98036,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/qe_io.c powerpc.gi
  static int num_par_io_ports = 0;
  
  int par_io_init(struct device_node *np)
  static int num_par_io_ports = 0;
  
  int par_io_init(struct device_node *np)

-@@ -165,7 +166,7 @@
+@@ -165,7 +166,7 @@ int par_io_of_config(struct device_node 

        }
  
        ph = of_get_property(np, "pio-handle", NULL);
        }
  
        ph = of_get_property(np, "pio-handle", NULL);


@@ -97688,7 +98045,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/qe_io.c powerpc.gi
                printk(KERN_ERR "pio-handle not available \n");
                return -1;
        }
                printk(KERN_ERR "pio-handle not available \n");
                return -1;
        }

-@@ -200,7 +201,7 @@
+@@ -200,7 +201,7 @@ static void dump_par_io(void)

  {
        unsigned int i;
  
  {
        unsigned int i;
  


@@ -97697,10 +98054,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/qe_io.c powerpc.gi
        for (i = 0; i < num_par_io_ports; i++) {
                printk(KERN_INFO "      cpodr[%u]=%08x\n", i,
                        in_be32(&par_io[i].cpodr));
        for (i = 0; i < num_par_io_ports; i++) {
                printk(KERN_INFO "      cpodr[%u]=%08x\n", i,
                        in_be32(&par_io[i].cpodr));

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/ucc_fast.c powerpc.git/arch/powerpc/sysdev/qe_lib/ucc_fast.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/ucc_fast.c     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/qe_lib/ucc_fast.c  2008-04-19 16:40:52.000000000 +0200
-@@ -148,57 +148,57 @@
+Index: linux-2.6.25.1/arch/powerpc/sysdev/qe_lib/ucc_fast.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/sysdev/qe_lib/ucc_fast.c
++++ linux-2.6.25.1/arch/powerpc/sysdev/qe_lib/ucc_fast.c
+@@ -148,57 +148,57 @@ int ucc_fast_init(struct ucc_fast_info *

  
        /* check if the UCC port number is in range. */
        if ((uf_info->ucc_num < 0) || (uf_info->ucc_num > UCC_MAX_NUM - 1)) {
  
        /* check if the UCC port number is in range. */
        if ((uf_info->ucc_num < 0) || (uf_info->ucc_num > UCC_MAX_NUM - 1)) {


@@ -97768,7 +98126,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/ucc_fast.c powerpc
                return -ENOMEM;
        }
  
                return -ENOMEM;
        }
  

-@@ -207,7 +207,7 @@
+@@ -207,7 +207,7 @@ int ucc_fast_init(struct ucc_fast_info *

        /* Set the PHY base address */
        uccf->uf_regs = ioremap(uf_info->regs, sizeof(struct ucc_fast));
        if (uccf->uf_regs == NULL) {
        /* Set the PHY base address */
        uccf->uf_regs = ioremap(uf_info->regs, sizeof(struct ucc_fast));
        if (uccf->uf_regs == NULL) {


@@ -97777,7 +98135,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/ucc_fast.c powerpc
                return -ENOMEM;
        }
  
                return -ENOMEM;
        }
  

-@@ -230,7 +230,7 @@
+@@ -230,7 +230,7 @@ int ucc_fast_init(struct ucc_fast_info *

        /* Set UCC to fast type */
        ret = ucc_set_type(uf_info->ucc_num, UCC_SPEED_TYPE_FAST);
        if (ret) {
        /* Set UCC to fast type */
        ret = ucc_set_type(uf_info->ucc_num, UCC_SPEED_TYPE_FAST);
        if (ret) {


@@ -97786,7 +98144,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/ucc_fast.c powerpc
                ucc_fast_free(uccf);
                return ret;
        }
                ucc_fast_free(uccf);
                return ret;
        }

-@@ -270,7 +270,7 @@
+@@ -270,7 +270,7 @@ int ucc_fast_init(struct ucc_fast_info *

            qe_muram_alloc(uf_info->utfs, UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT);
        if (IS_ERR_VALUE(uccf->ucc_fast_tx_virtual_fifo_base_offset)) {
                printk(KERN_ERR "%s: cannot allocate MURAM for TX FIFO\n",
            qe_muram_alloc(uf_info->utfs, UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT);
        if (IS_ERR_VALUE(uccf->ucc_fast_tx_virtual_fifo_base_offset)) {
                printk(KERN_ERR "%s: cannot allocate MURAM for TX FIFO\n",


@@ -97795,7 +98153,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/ucc_fast.c powerpc
                uccf->ucc_fast_tx_virtual_fifo_base_offset = 0;
                ucc_fast_free(uccf);
                return -ENOMEM;
                uccf->ucc_fast_tx_virtual_fifo_base_offset = 0;
                ucc_fast_free(uccf);
                return -ENOMEM;

-@@ -283,7 +283,7 @@
+@@ -283,7 +283,7 @@ int ucc_fast_init(struct ucc_fast_info *

                           UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT);
        if (IS_ERR_VALUE(uccf->ucc_fast_rx_virtual_fifo_base_offset)) {
                printk(KERN_ERR "%s: cannot allocate MURAM for RX FIFO\n",
                           UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT);
        if (IS_ERR_VALUE(uccf->ucc_fast_rx_virtual_fifo_base_offset)) {
                printk(KERN_ERR "%s: cannot allocate MURAM for RX FIFO\n",


@@ -97804,7 +98162,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/ucc_fast.c powerpc
                uccf->ucc_fast_rx_virtual_fifo_base_offset = 0;
                ucc_fast_free(uccf);
                return -ENOMEM;
                uccf->ucc_fast_rx_virtual_fifo_base_offset = 0;
                ucc_fast_free(uccf);
                return -ENOMEM;

-@@ -314,7 +314,7 @@
+@@ -314,7 +314,7 @@ int ucc_fast_init(struct ucc_fast_info *

                    ucc_set_qe_mux_rxtx(uf_info->ucc_num, uf_info->rx_clock,
                                        COMM_DIR_RX)) {
                        printk(KERN_ERR "%s: illegal value for RX clock\n",
                    ucc_set_qe_mux_rxtx(uf_info->ucc_num, uf_info->rx_clock,
                                        COMM_DIR_RX)) {
                        printk(KERN_ERR "%s: illegal value for RX clock\n",


@@ -97813,7 +98171,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/ucc_fast.c powerpc
                        ucc_fast_free(uccf);
                        return -EINVAL;
                }
                        ucc_fast_free(uccf);
                        return -EINVAL;
                }

-@@ -323,7 +323,7 @@
+@@ -323,7 +323,7 @@ int ucc_fast_init(struct ucc_fast_info *

                    ucc_set_qe_mux_rxtx(uf_info->ucc_num, uf_info->tx_clock,
                                        COMM_DIR_TX)) {
                        printk(KERN_ERR "%s: illegal value for TX clock\n",
                    ucc_set_qe_mux_rxtx(uf_info->ucc_num, uf_info->tx_clock,
                                        COMM_DIR_TX)) {
                        printk(KERN_ERR "%s: illegal value for TX clock\n",


@@ -97822,10 +98180,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/ucc_fast.c powerpc
                        ucc_fast_free(uccf);
                        return -EINVAL;
                }
                        ucc_fast_free(uccf);
                        return -EINVAL;
                }

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/ucc_slow.c powerpc.git/arch/powerpc/sysdev/qe_lib/ucc_slow.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/ucc_slow.c     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/qe_lib/ucc_slow.c  2008-04-19 16:40:52.000000000 +0200
-@@ -142,7 +142,7 @@
+Index: linux-2.6.25.1/arch/powerpc/sysdev/qe_lib/ucc_slow.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/sysdev/qe_lib/ucc_slow.c
++++ linux-2.6.25.1/arch/powerpc/sysdev/qe_lib/ucc_slow.c
+@@ -142,7 +142,7 @@ int ucc_slow_init(struct ucc_slow_info *

  
        /* check if the UCC port number is in range. */
        if ((us_info->ucc_num < 0) || (us_info->ucc_num > UCC_MAX_NUM - 1)) {
  
        /* check if the UCC port number is in range. */
        if ((us_info->ucc_num < 0) || (us_info->ucc_num > UCC_MAX_NUM - 1)) {


@@ -97834,7 +98193,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/ucc_slow.c powerpc
                return -EINVAL;
        }
  
                return -EINVAL;
        }
  

-@@ -161,7 +161,7 @@
+@@ -161,7 +161,7 @@ int ucc_slow_init(struct ucc_slow_info *

        uccs = kzalloc(sizeof(struct ucc_slow_private), GFP_KERNEL);
        if (!uccs) {
                printk(KERN_ERR "%s: Cannot allocate private data\n",
        uccs = kzalloc(sizeof(struct ucc_slow_private), GFP_KERNEL);
        if (!uccs) {
                printk(KERN_ERR "%s: Cannot allocate private data\n",


@@ -97843,7 +98202,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/ucc_slow.c powerpc
                return -ENOMEM;
        }
  
                return -ENOMEM;
        }
  

-@@ -170,7 +170,7 @@
+@@ -170,7 +170,7 @@ int ucc_slow_init(struct ucc_slow_info *

        /* Set the PHY base address */
        uccs->us_regs = ioremap(us_info->regs, sizeof(struct ucc_slow));
        if (uccs->us_regs == NULL) {
        /* Set the PHY base address */
        uccs->us_regs = ioremap(us_info->regs, sizeof(struct ucc_slow));
        if (uccs->us_regs == NULL) {


@@ -97852,7 +98211,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/ucc_slow.c powerpc
                return -ENOMEM;
        }
  
                return -ENOMEM;
        }
  

-@@ -189,7 +189,7 @@
+@@ -189,7 +189,7 @@ int ucc_slow_init(struct ucc_slow_info *

        uccs->us_pram_offset =
                qe_muram_alloc(UCC_SLOW_PRAM_SIZE, ALIGNMENT_OF_UCC_SLOW_PRAM);
        if (IS_ERR_VALUE(uccs->us_pram_offset)) {
        uccs->us_pram_offset =
                qe_muram_alloc(UCC_SLOW_PRAM_SIZE, ALIGNMENT_OF_UCC_SLOW_PRAM);
        if (IS_ERR_VALUE(uccs->us_pram_offset)) {


@@ -97861,7 +98220,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/ucc_slow.c powerpc
                ucc_slow_free(uccs);
                return -ENOMEM;
        }
                ucc_slow_free(uccs);
                return -ENOMEM;
        }

-@@ -202,7 +202,7 @@
+@@ -202,7 +202,7 @@ int ucc_slow_init(struct ucc_slow_info *

        /* Set UCC to slow type */
        ret = ucc_set_type(us_info->ucc_num, UCC_SPEED_TYPE_SLOW);
        if (ret) {
        /* Set UCC to slow type */
        ret = ucc_set_type(us_info->ucc_num, UCC_SPEED_TYPE_SLOW);
        if (ret) {


@@ -97870,7 +98229,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/ucc_slow.c powerpc
                ucc_slow_free(uccs);
                return ret;
        }
                ucc_slow_free(uccs);
                return ret;
        }

-@@ -216,7 +216,7 @@
+@@ -216,7 +216,7 @@ int ucc_slow_init(struct ucc_slow_info *

                qe_muram_alloc(us_info->rx_bd_ring_len * sizeof(struct qe_bd),
                                QE_ALIGNMENT_OF_BD);
        if (IS_ERR_VALUE(uccs->rx_base_offset)) {
                qe_muram_alloc(us_info->rx_bd_ring_len * sizeof(struct qe_bd),
                                QE_ALIGNMENT_OF_BD);
        if (IS_ERR_VALUE(uccs->rx_base_offset)) {


@@ -97879,7 +98238,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/ucc_slow.c powerpc
                        us_info->rx_bd_ring_len);
                uccs->rx_base_offset = 0;
                ucc_slow_free(uccs);
                        us_info->rx_bd_ring_len);
                uccs->rx_base_offset = 0;
                ucc_slow_free(uccs);

-@@ -227,7 +227,7 @@
+@@ -227,7 +227,7 @@ int ucc_slow_init(struct ucc_slow_info *

                qe_muram_alloc(us_info->tx_bd_ring_len * sizeof(struct qe_bd),
                        QE_ALIGNMENT_OF_BD);
        if (IS_ERR_VALUE(uccs->tx_base_offset)) {
                qe_muram_alloc(us_info->tx_bd_ring_len * sizeof(struct qe_bd),
                        QE_ALIGNMENT_OF_BD);
        if (IS_ERR_VALUE(uccs->tx_base_offset)) {


@@ -97888,7 +98247,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/ucc_slow.c powerpc
                uccs->tx_base_offset = 0;
                ucc_slow_free(uccs);
                return -ENOMEM;
                uccs->tx_base_offset = 0;
                ucc_slow_free(uccs);
                return -ENOMEM;

-@@ -317,7 +317,7 @@
+@@ -317,7 +317,7 @@ int ucc_slow_init(struct ucc_slow_info *

                if (ucc_set_qe_mux_rxtx(us_info->ucc_num, us_info->rx_clock,
                                        COMM_DIR_RX)) {
                        printk(KERN_ERR "%s: illegal value for RX clock\n",
                if (ucc_set_qe_mux_rxtx(us_info->ucc_num, us_info->rx_clock,
                                        COMM_DIR_RX)) {
                        printk(KERN_ERR "%s: illegal value for RX clock\n",


@@ -97897,7 +98256,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/ucc_slow.c powerpc
                        ucc_slow_free(uccs);
                        return -EINVAL;
                }
                        ucc_slow_free(uccs);
                        return -EINVAL;
                }

-@@ -325,7 +325,7 @@
+@@ -325,7 +325,7 @@ int ucc_slow_init(struct ucc_slow_info *

                if (ucc_set_qe_mux_rxtx(us_info->ucc_num, us_info->tx_clock,
                                        COMM_DIR_TX)) {
                        printk(KERN_ERR "%s: illegal value for TX clock\n",
                if (ucc_set_qe_mux_rxtx(us_info->ucc_num, us_info->tx_clock,
                                        COMM_DIR_TX)) {
                        printk(KERN_ERR "%s: illegal value for TX clock\n",


@@ -97906,19 +98265,21 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/ucc_slow.c powerpc
                        ucc_slow_free(uccs);
                        return -EINVAL;
                }
                        ucc_slow_free(uccs);
                        return -EINVAL;
                }

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/rtc_cmos_setup.c powerpc.git/arch/powerpc/sysdev/rtc_cmos_setup.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/rtc_cmos_setup.c      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/rtc_cmos_setup.c   2008-04-19 16:40:52.000000000 +0200
-@@ -56,3 +56,5 @@
+Index: linux-2.6.25.1/arch/powerpc/sysdev/rtc_cmos_setup.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/sysdev/rtc_cmos_setup.c
++++ linux-2.6.25.1/arch/powerpc/sysdev/rtc_cmos_setup.c
+@@ -56,3 +56,5 @@ static int  __init add_rtc(void)

        return 0;
  }
  fs_initcall(add_rtc);
 +
 +MODULE_LICENSE("GPL");
        return 0;
  }
  fs_initcall(add_rtc);
 +
 +MODULE_LICENSE("GPL");

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/tsi108_dev.c powerpc.git/arch/powerpc/sysdev/tsi108_dev.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/tsi108_dev.c  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/tsi108_dev.c       2008-04-19 16:40:52.000000000 +0200
-@@ -84,7 +84,7 @@
+Index: linux-2.6.25.1/arch/powerpc/sysdev/tsi108_dev.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/sysdev/tsi108_dev.c
++++ linux-2.6.25.1/arch/powerpc/sysdev/tsi108_dev.c
+@@ -84,7 +84,7 @@ static int __init tsi108_eth_of_init(voi

  
                ret = of_address_to_resource(np, 0, &r[0]);
                DBG("%s: name:start->end = %s:0x%lx-> 0x%lx\n",
  
                ret = of_address_to_resource(np, 0, &r[0]);
                DBG("%s: name:start->end = %s:0x%lx-> 0x%lx\n",


@@ -97927,7 +98288,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/tsi108_dev.c powerpc.git/
                if (ret)
                        goto err;
  
                if (ret)
                        goto err;
  

-@@ -93,7 +93,7 @@
+@@ -93,7 +93,7 @@ static int __init tsi108_eth_of_init(voi

                r[1].end = irq_of_parse_and_map(np, 0);
                r[1].flags = IORESOURCE_IRQ;
                DBG("%s: name:start->end = %s:0x%lx-> 0x%lx\n",
                r[1].end = irq_of_parse_and_map(np, 0);
                r[1].flags = IORESOURCE_IRQ;
                DBG("%s: name:start->end = %s:0x%lx-> 0x%lx\n",


@@ -97936,10 +98297,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/tsi108_dev.c powerpc.git/
  
                tsi_eth_dev =
                    platform_device_register_simple("tsi-ethernet", i++, &r[0],
  
                tsi_eth_dev =
                    platform_device_register_simple("tsi-ethernet", i++, &r[0],

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/tsi108_pci.c powerpc.git/arch/powerpc/sysdev/tsi108_pci.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/tsi108_pci.c  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/tsi108_pci.c       2008-04-19 16:40:52.000000000 +0200
-@@ -207,7 +207,7 @@
+Index: linux-2.6.25.1/arch/powerpc/sysdev/tsi108_pci.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/sysdev/tsi108_pci.c
++++ linux-2.6.25.1/arch/powerpc/sysdev/tsi108_pci.c
+@@ -207,7 +207,7 @@ int __init tsi108_setup_pci(struct devic

        /* PCI Config mapping */
        tsi108_pci_cfg_base = (u32)ioremap(cfg_phys, TSI108_PCI_CFG_SIZE);
        tsi108_pci_cfg_phys = cfg_phys;
        /* PCI Config mapping */
        tsi108_pci_cfg_base = (u32)ioremap(cfg_phys, TSI108_PCI_CFG_SIZE);
        tsi108_pci_cfg_phys = cfg_phys;


@@ -97948,7 +98310,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/tsi108_pci.c powerpc.git/
            tsi108_pci_cfg_base);
  
        /* Fetch host bridge registers address */
            tsi108_pci_cfg_base);
  
        /* Fetch host bridge registers address */

-@@ -395,7 +395,7 @@
+@@ -395,7 +395,7 @@ static int pci_irq_host_xlate(struct irq

  static int pci_irq_host_map(struct irq_host *h, unsigned int virq,
                          irq_hw_number_t hw)
  {     unsigned int irq;
  static int pci_irq_host_map(struct irq_host *h, unsigned int virq,
                          irq_hw_number_t hw)
  {     unsigned int irq;


@@ -97957,9 +98319,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/tsi108_pci.c powerpc.git/
        if ((virq >= 1) && (virq <= 4)){
                irq = virq + IRQ_PCI_INTAD_BASE - 1;
                get_irq_desc(irq)->status |= IRQ_LEVEL;
        if ((virq >= 1) && (virq <= 4)){
                irq = virq + IRQ_PCI_INTAD_BASE - 1;
                get_irq_desc(irq)->status |= IRQ_LEVEL;

-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/xmon/xmon.c powerpc.git/arch/powerpc/xmon/xmon.c
---- linux-2.6.25-rc9/arch/powerpc/xmon/xmon.c  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/xmon/xmon.c       2008-04-19 16:40:52.000000000 +0200
+Index: linux-2.6.25.1/arch/powerpc/xmon/xmon.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/powerpc/xmon/xmon.c
++++ linux-2.6.25.1/arch/powerpc/xmon/xmon.c

 @@ -45,7 +45,6 @@
  #ifdef CONFIG_PPC64
  #include <asm/hvcall.h>
 @@ -45,7 +45,6 @@
  #ifdef CONFIG_PPC64
  #include <asm/hvcall.h>


@@ -97968,7 +98331,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/xmon/xmon.c powerpc.git/arch/pow
  #endif
  
  #include "nonstdio.h"
  #endif
  
  #include "nonstdio.h"

-@@ -1244,15 +1243,12 @@
+@@ -1244,15 +1243,12 @@ static void get_function_bounds(unsigned

  
  static int xmon_depth_to_print = 64;
  
  
  static int xmon_depth_to_print = 64;
  


@@ -97988,7 +98351,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/xmon/xmon.c powerpc.git/arch/pow
  #define REGS_OFFSET           16
  #endif
  
  #define REGS_OFFSET           16
  #endif
  

-@@ -1318,7 +1314,7 @@
+@@ -1318,7 +1314,7 @@ static void xmon_show_stack(unsigned lon

                /* Look for "regshere" marker to see if this is
                   an exception frame. */
                if (mread(sp + MARKER_OFFSET, &marker, sizeof(unsigned long))
                /* Look for "regshere" marker to see if this is
                   an exception frame. */
                if (mread(sp + MARKER_OFFSET, &marker, sizeof(unsigned long))


@@ -97997,7 +98360,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/xmon/xmon.c powerpc.git/arch/pow
                        if (mread(sp + REGS_OFFSET, &regs, sizeof(regs))
                            != sizeof(regs)) {
                                printf("Couldn't read registers at %lx\n",
                        if (mread(sp + REGS_OFFSET, &regs, sizeof(regs))
                            != sizeof(regs)) {
                                printf("Couldn't read registers at %lx\n",

-@@ -1598,7 +1594,6 @@
+@@ -1598,7 +1594,6 @@ void super_regs(void)

                if (firmware_has_feature(FW_FEATURE_ISERIES)) {
                        struct paca_struct *ptrPaca;
                        struct lppaca *ptrLpPaca;
                if (firmware_has_feature(FW_FEATURE_ISERIES)) {
                        struct paca_struct *ptrPaca;
                        struct lppaca *ptrLpPaca;


@@ -98005,7 +98368,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/xmon/xmon.c powerpc.git/arch/pow
  
                        /* Dump out relevant Paca data areas. */
                        printf("Paca: \n");
  
                        /* Dump out relevant Paca data areas. */
                        printf("Paca: \n");

-@@ -1611,15 +1606,6 @@
+@@ -1611,15 +1606,6 @@ void super_regs(void)

                        printf("    Saved Gpr3=%.16lx  Saved Gpr4=%.16lx \n",
                               ptrLpPaca->saved_gpr3, ptrLpPaca->saved_gpr4);
                        printf("    Saved Gpr5=%.16lx \n", ptrLpPaca->saved_gpr5);
                        printf("    Saved Gpr3=%.16lx  Saved Gpr4=%.16lx \n",
                               ptrLpPaca->saved_gpr3, ptrLpPaca->saved_gpr4);
                        printf("    Saved Gpr5=%.16lx \n", ptrLpPaca->saved_gpr5);


@@ -98021,9 +98384,10 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/xmon/xmon.c powerpc.git/arch/pow
                }
  #endif
  
                }
  #endif
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/ppc/8xx_io/commproc.c powerpc.git/arch/ppc/8xx_io/commproc.c
---- linux-2.6.25-rc9/arch/ppc/8xx_io/commproc.c        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/ppc/8xx_io/commproc.c     2008-03-17 14:03:32.000000000 +0100
+Index: linux-2.6.25.1/arch/ppc/8xx_io/commproc.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/ppc/8xx_io/commproc.c
++++ linux-2.6.25.1/arch/ppc/8xx_io/commproc.c

 @@ -43,7 +43,7 @@
  ({                                                                    \
        u32 offset = offsetof(immap_t, member);                         \
 @@ -43,7 +43,7 @@
  ({                                                                    \
        u32 offset = offsetof(immap_t, member);                         \


@@ -98033,10 +98397,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/ppc/8xx_io/commproc.c powerpc.git/arch/p
        addr;                                                           \
  })
  
        addr;                                                           \
  })
  

-diff -x .git -Nur linux-2.6.25-rc9/arch/ppc/8xx_io/fec.c powerpc.git/arch/ppc/8xx_io/fec.c
---- linux-2.6.25-rc9/arch/ppc/8xx_io/fec.c     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/ppc/8xx_io/fec.c  2008-04-19 16:40:52.000000000 +0200
-@@ -520,7 +520,7 @@
+Index: linux-2.6.25.1/arch/ppc/8xx_io/fec.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/ppc/8xx_io/fec.c
++++ linux-2.6.25.1/arch/ppc/8xx_io/fec.c
+@@ -520,7 +520,7 @@ fec_enet_interrupt(int irq, void * dev_i

  #ifdef        CONFIG_USE_MDIO
                        fec_enet_mii(dev);
  #else
  #ifdef        CONFIG_USE_MDIO
                        fec_enet_mii(dev);
  #else


@@ -98045,7 +98410,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/ppc/8xx_io/fec.c powerpc.git/arch/ppc/8x
  #endif        /* CONFIG_USE_MDIO */
                }
  
  #endif        /* CONFIG_USE_MDIO */
                }
  

-@@ -1441,7 +1441,7 @@
+@@ -1441,7 +1441,7 @@ irqreturn_t mii_link_interrupt(int irq, 

                fecp->fec_ecntrl = ecntrl;      /* restore old settings */
        }
  #else
                fecp->fec_ecntrl = ecntrl;      /* restore old settings */
        }
  #else


@@ -98054,10 +98419,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/ppc/8xx_io/fec.c powerpc.git/arch/ppc/8x
  #endif        /* CONFIG_USE_MDIO */
  
  #ifndef CONFIG_RPXCLASSIC
  #endif        /* CONFIG_USE_MDIO */
  
  #ifndef CONFIG_RPXCLASSIC

-diff -x .git -Nur linux-2.6.25-rc9/arch/ppc/kernel/head.S powerpc.git/arch/ppc/kernel/head.S
---- linux-2.6.25-rc9/arch/ppc/kernel/head.S    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/ppc/kernel/head.S 2008-03-17 14:03:32.000000000 +0100
-@@ -701,23 +701,6 @@
+Index: linux-2.6.25.1/arch/ppc/kernel/head.S
+===================================================================
+--- linux-2.6.25.1.orig/arch/ppc/kernel/head.S
++++ linux-2.6.25.1/arch/ppc/kernel/head.S
+@@ -701,23 +701,6 @@ load_up_altivec:

        b       fast_exception_return
  
  /*
        b       fast_exception_return
  
  /*


@@ -98081,10 +98447,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/ppc/kernel/head.S powerpc.git/arch/ppc/k
   * giveup_altivec(tsk)
   * Disable AltiVec for the task given as the argument,
   * and save the AltiVec registers in its thread_struct.
   * giveup_altivec(tsk)
   * Disable AltiVec for the task given as the argument,
   * and save the AltiVec registers in its thread_struct.

-diff -x .git -Nur linux-2.6.25-rc9/arch/ppc/mm/init.c powerpc.git/arch/ppc/mm/init.c
---- linux-2.6.25-rc9/arch/ppc/mm/init.c        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/ppc/mm/init.c     2008-04-19 16:40:52.000000000 +0200
-@@ -109,7 +109,6 @@
+Index: linux-2.6.25.1/arch/ppc/mm/init.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/ppc/mm/init.c
++++ linux-2.6.25.1/arch/ppc/mm/init.c
+@@ -109,7 +109,6 @@ void show_mem(void)

  
        printk("Mem-info:\n");
        show_free_areas();
  
        printk("Mem-info:\n");
        show_free_areas();


@@ -98092,10 +98459,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/ppc/mm/init.c powerpc.git/arch/ppc/mm/in
        i = max_mapnr;
        while (i-- > 0) {
                total++;
        i = max_mapnr;
        while (i-- > 0) {
                total++;

-diff -x .git -Nur linux-2.6.25-rc9/arch/ppc/platforms/radstone_ppc7d.c powerpc.git/arch/ppc/platforms/radstone_ppc7d.c
---- linux-2.6.25-rc9/arch/ppc/platforms/radstone_ppc7d.c       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/ppc/platforms/radstone_ppc7d.c    2008-04-19 16:40:52.000000000 +0200
-@@ -512,7 +512,7 @@
+Index: linux-2.6.25.1/arch/ppc/platforms/radstone_ppc7d.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/ppc/platforms/radstone_ppc7d.c
++++ linux-2.6.25.1/arch/ppc/platforms/radstone_ppc7d.c
+@@ -512,7 +512,7 @@ static void __init ppc7d_init_irq(void)

  {
        int irq;
  
  {
        int irq;
  


@@ -98104,7 +98472,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/ppc/platforms/radstone_ppc7d.c powerpc.g
        i8259_init(0, 0);
        mv64360_init_irq();
  
        i8259_init(0, 0);
        mv64360_init_irq();
  

-@@ -569,7 +569,7 @@
+@@ -569,7 +569,7 @@ static int __init ppc7d_map_irq(struct p

        };
        const long min_idsel = 10, max_idsel = 14, irqs_per_slot = 4;
  
        };
        const long min_idsel = 10, max_idsel = 14, irqs_per_slot = 4;
  


@@ -98113,7 +98481,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/ppc/platforms/radstone_ppc7d.c powerpc.g
                 dev->vendor, dev->device, PCI_FUNC(dev->devfn), idsel, pin);
  
        return PCI_IRQ_TABLE_LOOKUP;
                 dev->vendor, dev->device, PCI_FUNC(dev->devfn), idsel, pin);
  
        return PCI_IRQ_TABLE_LOOKUP;

-@@ -1300,7 +1300,7 @@
+@@ -1300,7 +1300,7 @@ static void ppc7d_init2(void)

        u32 data;
        u8 data8;
  
        u32 data;
        u8 data8;
  


@@ -98122,7 +98490,7 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/ppc/platforms/radstone_ppc7d.c powerpc.g
  
        /* Wait for debugger? */
        if (ppc7d_wait_debugger) {
  
        /* Wait for debugger? */
        if (ppc7d_wait_debugger) {

-@@ -1333,7 +1333,7 @@
+@@ -1333,7 +1333,7 @@ static void ppc7d_init2(void)

          ppc_md.set_rtc_time = ppc7d_set_rtc_time;
          ppc_md.get_rtc_time = ppc7d_get_rtc_time;
  
          ppc_md.set_rtc_time = ppc7d_set_rtc_time;
          ppc_md.get_rtc_time = ppc7d_get_rtc_time;
  


@@ -98131,10 +98499,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/ppc/platforms/radstone_ppc7d.c powerpc.g
  }
  
  /* Called from machine_init(), early, before any of the __init functions
  }
  
  /* Called from machine_init(), early, before any of the __init functions

-diff -x .git -Nur linux-2.6.25-rc9/arch/ppc/syslib/mpc52xx_setup.c powerpc.git/arch/ppc/syslib/mpc52xx_setup.c
---- linux-2.6.25-rc9/arch/ppc/syslib/mpc52xx_setup.c   2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/ppc/syslib/mpc52xx_setup.c        2008-04-19 16:40:52.000000000 +0200
-@@ -279,7 +279,7 @@
+Index: linux-2.6.25.1/arch/ppc/syslib/mpc52xx_setup.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/ppc/syslib/mpc52xx_setup.c
++++ linux-2.6.25.1/arch/ppc/syslib/mpc52xx_setup.c
+@@ -279,7 +279,7 @@ int mpc52xx_match_psc_function(int psc_i

  
  int mpc52xx_set_psc_clkdiv(int psc_id, int clkdiv)
  {
  
  int mpc52xx_set_psc_clkdiv(int psc_id, int clkdiv)
  {


@@ -98143,10 +98512,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/ppc/syslib/mpc52xx_setup.c powerpc.git/a
        struct mpc52xx_cdm __iomem *cdm;
        unsigned long flags;
        u16 mclken_div;
        struct mpc52xx_cdm __iomem *cdm;
        unsigned long flags;
        u16 mclken_div;

-diff -x .git -Nur linux-2.6.25-rc9/arch/sparc64/Kconfig powerpc.git/arch/sparc64/Kconfig
---- linux-2.6.25-rc9/arch/sparc64/Kconfig      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/sparc64/Kconfig   2008-03-17 14:03:36.000000000 +0100
-@@ -16,6 +16,7 @@
+Index: linux-2.6.25.1/arch/sparc64/Kconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/sparc64/Kconfig
++++ linux-2.6.25.1/arch/sparc64/Kconfig
+@@ -16,6 +16,7 @@ config SPARC64

        bool
        default y
        select HAVE_IDE
        bool
        default y
        select HAVE_IDE


@@ -98154,10 +98524,11 @@ diff -x .git -Nur linux-2.6.25-rc9/arch/sparc64/Kconfig powerpc.git/arch/sparc64
        help
          SPARC is a family of RISC microprocessors designed and marketed by
          Sun Microsystems, incorporated.  This port covers the newer 64-bit
        help
          SPARC is a family of RISC microprocessors designed and marketed by
          Sun Microsystems, incorporated.  This port covers the newer 64-bit

-diff -x .git -Nur linux-2.6.25-rc9/drivers/block/viodasd.c powerpc.git/drivers/block/viodasd.c
---- linux-2.6.25-rc9/drivers/block/viodasd.c   2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/block/viodasd.c        2008-04-19 16:40:53.000000000 +0200
-@@ -69,7 +69,7 @@
+Index: linux-2.6.25.1/drivers/block/viodasd.c
+===================================================================
+--- linux-2.6.25.1.orig/drivers/block/viodasd.c
++++ linux-2.6.25.1/drivers/block/viodasd.c
+@@ -69,7 +69,7 @@ MODULE_LICENSE("GPL");

  enum {
        PARTITION_SHIFT = 3,
        MAX_DISKNO = HVMAXARCHITECTEDVIRTUALDISKS,
  enum {
        PARTITION_SHIFT = 3,
        MAX_DISKNO = HVMAXARCHITECTEDVIRTUALDISKS,


@@ -98166,10 +98537,11 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/block/viodasd.c powerpc.git/drivers/b
  };
  
  static DEFINE_SPINLOCK(viodasd_spinlock);
  };
  
  static DEFINE_SPINLOCK(viodasd_spinlock);

-diff -x .git -Nur linux-2.6.25-rc9/drivers/char/hvc_beat.c powerpc.git/drivers/char/hvc_beat.c
---- linux-2.6.25-rc9/drivers/char/hvc_beat.c   2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/char/hvc_beat.c        2008-04-19 16:40:53.000000000 +0200
-@@ -78,8 +78,8 @@
+Index: linux-2.6.25.1/drivers/char/hvc_beat.c
+===================================================================
+--- linux-2.6.25.1.orig/drivers/char/hvc_beat.c
++++ linux-2.6.25.1/drivers/char/hvc_beat.c
+@@ -78,8 +78,8 @@ static int hvc_beat_put_chars(uint32_t v

        for (rest = cnt; rest > 0; rest -= nlen) {
                nlen = (rest > 16) ? 16 : rest;
                memcpy(kb, buf, nlen);
        for (rest = cnt; rest > 0; rest -= nlen) {
                nlen = (rest > 16) ? 16 : rest;
                memcpy(kb, buf, nlen);


@@ -98180,9 +98552,10 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/char/hvc_beat.c powerpc.git/drivers/c
        }
        return cnt;
  }
        }
        return cnt;
  }

-diff -x .git -Nur linux-2.6.25-rc9/drivers/char/xilinx_hwicap/buffer_icap.c powerpc.git/drivers/char/xilinx_hwicap/buffer_icap.c
---- linux-2.6.25-rc9/drivers/char/xilinx_hwicap/buffer_icap.c  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/char/xilinx_hwicap/buffer_icap.c       2008-04-19 16:40:53.000000000 +0200
+Index: linux-2.6.25.1/drivers/char/xilinx_hwicap/buffer_icap.c
+===================================================================
+--- linux-2.6.25.1.orig/drivers/char/xilinx_hwicap/buffer_icap.c
++++ linux-2.6.25.1/drivers/char/xilinx_hwicap/buffer_icap.c

 @@ -74,7 +74,7 @@
  
  /**
 @@ -74,7 +74,7 @@
  
  /**


@@ -98204,7 +98577,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/char/xilinx_hwicap/buffer_icap.c powe
  }
  
  /**
  }
  
  /**

-@@ -117,20 +117,8 @@
+@@ -117,20 +117,8 @@ static inline u32 buffer_icap_get_bram(v

   **/
  static inline bool buffer_icap_busy(void __iomem *base_address)
  {
   **/
  static inline bool buffer_icap_busy(void __iomem *base_address)
  {


@@ -98227,9 +98600,10 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/char/xilinx_hwicap/buffer_icap.c powe
  }
  
  /**
  }
  
  /**

-diff -x .git -Nur linux-2.6.25-rc9/drivers/char/xilinx_hwicap/buffer_icap.h powerpc.git/drivers/char/xilinx_hwicap/buffer_icap.h
---- linux-2.6.25-rc9/drivers/char/xilinx_hwicap/buffer_icap.h  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/char/xilinx_hwicap/buffer_icap.h       2008-04-19 16:40:53.000000000 +0200
+Index: linux-2.6.25.1/drivers/char/xilinx_hwicap/buffer_icap.h
+===================================================================
+--- linux-2.6.25.1.orig/drivers/char/xilinx_hwicap/buffer_icap.h
++++ linux-2.6.25.1/drivers/char/xilinx_hwicap/buffer_icap.h

 @@ -44,8 +44,6 @@
  #include <asm/io.h>
  #include "xilinx_hwicap.h"
 @@ -44,8 +44,6 @@
  #include <asm/io.h>
  #include "xilinx_hwicap.h"


@@ -98239,7 +98613,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/char/xilinx_hwicap/buffer_icap.h powe
  /* Loads a partial bitstream from system memory. */
  int buffer_icap_set_configuration(struct hwicap_drvdata *drvdata, u32 *data,
                             u32 Size);
  /* Loads a partial bitstream from system memory. */
  int buffer_icap_set_configuration(struct hwicap_drvdata *drvdata, u32 *data,
                             u32 Size);

-@@ -54,4 +52,7 @@
+@@ -54,4 +52,7 @@ int buffer_icap_set_configuration(struct

  int buffer_icap_get_configuration(struct hwicap_drvdata *drvdata, u32 *data,
                             u32 Size);
  
  int buffer_icap_get_configuration(struct hwicap_drvdata *drvdata, u32 *data,
                             u32 Size);
  


@@ -98247,9 +98621,10 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/char/xilinx_hwicap/buffer_icap.h powe
 +void buffer_icap_reset(struct hwicap_drvdata *drvdata);
 +
  #endif
 +void buffer_icap_reset(struct hwicap_drvdata *drvdata);
 +
  #endif

-diff -x .git -Nur linux-2.6.25-rc9/drivers/char/xilinx_hwicap/fifo_icap.c powerpc.git/drivers/char/xilinx_hwicap/fifo_icap.c
---- linux-2.6.25-rc9/drivers/char/xilinx_hwicap/fifo_icap.c    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/char/xilinx_hwicap/fifo_icap.c 2008-04-19 16:40:53.000000000 +0200
+Index: linux-2.6.25.1/drivers/char/xilinx_hwicap/fifo_icap.c
+===================================================================
+--- linux-2.6.25.1.orig/drivers/char/xilinx_hwicap/fifo_icap.c
++++ linux-2.6.25.1/drivers/char/xilinx_hwicap/fifo_icap.c

 @@ -78,13 +78,6 @@
  #define XHI_CR_READ_MASK 0x00000002 /* Read from ICAP to FIFO */
  #define XHI_CR_WRITE_MASK 0x00000001 /* Write from FIFO to ICAP */
 @@ -78,13 +78,6 @@
  #define XHI_CR_READ_MASK 0x00000002 /* Read from ICAP to FIFO */
  #define XHI_CR_WRITE_MASK 0x00000001 /* Write from FIFO to ICAP */


@@ -98264,7 +98639,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/char/xilinx_hwicap/fifo_icap.c powerp
  
  #define XHI_WFO_MAX_VACANCY 1024 /* Max Write FIFO Vacancy, in words */
  #define XHI_RFO_MAX_OCCUPANCY 256 /* Max Read FIFO Occupancy, in words */
  
  #define XHI_WFO_MAX_VACANCY 1024 /* Max Write FIFO Vacancy, in words */
  #define XHI_RFO_MAX_OCCUPANCY 256 /* Max Read FIFO Occupancy, in words */

-@@ -152,13 +145,35 @@
+@@ -152,13 +145,35 @@ static inline void fifo_icap_start_readb

  }
  
  /**
  }
  
  /**


@@ -98301,10 +98676,11 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/char/xilinx_hwicap/fifo_icap.c powerp
        return (status & XHI_SR_DONE_MASK) ? 0 : 1;
  }
  
        return (status & XHI_SR_DONE_MASK) ? 0 : 1;
  }
  

-diff -x .git -Nur linux-2.6.25-rc9/drivers/char/xilinx_hwicap/fifo_icap.h powerpc.git/drivers/char/xilinx_hwicap/fifo_icap.h
---- linux-2.6.25-rc9/drivers/char/xilinx_hwicap/fifo_icap.h    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/char/xilinx_hwicap/fifo_icap.h 2008-04-19 16:40:53.000000000 +0200
-@@ -56,6 +56,7 @@
+Index: linux-2.6.25.1/drivers/char/xilinx_hwicap/fifo_icap.h
+===================================================================
+--- linux-2.6.25.1.orig/drivers/char/xilinx_hwicap/fifo_icap.h
++++ linux-2.6.25.1/drivers/char/xilinx_hwicap/fifo_icap.h
+@@ -56,6 +56,7 @@ int fifo_icap_set_configuration(

                u32 *FrameBuffer,
                u32 NumWords);
  
                u32 *FrameBuffer,
                u32 NumWords);
  


@@ -98312,9 +98688,10 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/char/xilinx_hwicap/fifo_icap.h powerp
  void fifo_icap_reset(struct hwicap_drvdata *drvdata);
  void fifo_icap_flush_fifo(struct hwicap_drvdata *drvdata);
  
  void fifo_icap_reset(struct hwicap_drvdata *drvdata);
  void fifo_icap_flush_fifo(struct hwicap_drvdata *drvdata);
  

-diff -x .git -Nur linux-2.6.25-rc9/drivers/char/xilinx_hwicap/xilinx_hwicap.c powerpc.git/drivers/char/xilinx_hwicap/xilinx_hwicap.c
---- linux-2.6.25-rc9/drivers/char/xilinx_hwicap/xilinx_hwicap.c        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/char/xilinx_hwicap/xilinx_hwicap.c     2008-04-19 16:40:53.000000000 +0200
+Index: linux-2.6.25.1/drivers/char/xilinx_hwicap/xilinx_hwicap.c
+===================================================================
+--- linux-2.6.25.1.orig/drivers/char/xilinx_hwicap/xilinx_hwicap.c
++++ linux-2.6.25.1/drivers/char/xilinx_hwicap/xilinx_hwicap.c

 @@ -36,7 +36,7 @@
   *****************************************************************************/
  
 @@ -36,7 +36,7 @@
   *****************************************************************************/
  


@@ -98355,7 +98732,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/char/xilinx_hwicap/xilinx_hwicap.c po
  /* An array, which is set to true when the device is registered. */
  static bool probed_devices[HWICAP_DEVICES];
  static struct mutex icap_sem;
  /* An array, which is set to true when the device is registered. */
  static bool probed_devices[HWICAP_DEVICES];
  static struct mutex icap_sem;

-@@ -250,8 +246,26 @@
+@@ -250,8 +246,26 @@ static int hwicap_get_configuration_regi

         * Create the data to be written to the ICAP.
         */
        buffer[index++] = XHI_DUMMY_PACKET;
         * Create the data to be written to the ICAP.
         */
        buffer[index++] = XHI_DUMMY_PACKET;


@@ -98382,7 +98759,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/char/xilinx_hwicap/xilinx_hwicap.c po
        buffer[index++] = hwicap_type_1_read(reg) | 1;
        buffer[index++] = XHI_NOOP_PACKET;
        buffer[index++] = XHI_NOOP_PACKET;
        buffer[index++] = hwicap_type_1_read(reg) | 1;
        buffer[index++] = XHI_NOOP_PACKET;
        buffer[index++] = XHI_NOOP_PACKET;

-@@ -587,7 +601,7 @@
+@@ -587,7 +601,7 @@ static int __devinit hwicap_setup(struct

        probed_devices[id] = 1;
        mutex_unlock(&icap_sem);
  
        probed_devices[id] = 1;
        mutex_unlock(&icap_sem);
  


@@ -98391,7 +98768,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/char/xilinx_hwicap/xilinx_hwicap.c po
  
        drvdata = kzalloc(sizeof(struct hwicap_drvdata), GFP_KERNEL);
        if (!drvdata) {
  
        drvdata = kzalloc(sizeof(struct hwicap_drvdata), GFP_KERNEL);
        if (!drvdata) {

-@@ -664,12 +678,14 @@
+@@ -664,12 +678,14 @@ static int __devinit hwicap_setup(struct

  static struct hwicap_driver_config buffer_icap_config = {
        .get_configuration = buffer_icap_get_configuration,
        .set_configuration = buffer_icap_set_configuration,
  static struct hwicap_driver_config buffer_icap_config = {
        .get_configuration = buffer_icap_get_configuration,
        .set_configuration = buffer_icap_set_configuration,


@@ -98406,7 +98783,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/char/xilinx_hwicap/xilinx_hwicap.c po
        .reset = fifo_icap_reset,
  };
  
        .reset = fifo_icap_reset,
  };
  

-@@ -690,7 +706,7 @@
+@@ -690,7 +706,7 @@ static int __devexit hwicap_remove(struc

        dev_set_drvdata(dev, NULL);
  
        mutex_lock(&icap_sem);
        dev_set_drvdata(dev, NULL);
  
        mutex_lock(&icap_sem);


@@ -98415,7 +98792,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/char/xilinx_hwicap/xilinx_hwicap.c po
        mutex_unlock(&icap_sem);
        return 0;               /* success */
  }
        mutex_unlock(&icap_sem);
        return 0;               /* success */
  }

-@@ -830,23 +846,12 @@
+@@ -830,23 +846,12 @@ static int __init hwicap_module_init(voi

        icap_class = class_create(THIS_MODULE, "xilinx_config");
        mutex_init(&icap_sem);
  
        icap_class = class_create(THIS_MODULE, "xilinx_config");
        mutex_init(&icap_sem);
  


@@ -98445,7 +98822,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/char/xilinx_hwicap/xilinx_hwicap.c po
  
        retval = platform_driver_register(&hwicap_platform_driver);
  
  
        retval = platform_driver_register(&hwicap_platform_driver);
  

-@@ -871,7 +876,7 @@
+@@ -871,7 +876,7 @@ static int __init hwicap_module_init(voi

  
  static void __exit hwicap_module_cleanup(void)
  {
  
  static void __exit hwicap_module_cleanup(void)
  {


@@ -98454,10 +98831,11 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/char/xilinx_hwicap/xilinx_hwicap.c po
  
        class_destroy(icap_class);
  
  
        class_destroy(icap_class);
  

-diff -x .git -Nur linux-2.6.25-rc9/drivers/char/xilinx_hwicap/xilinx_hwicap.h powerpc.git/drivers/char/xilinx_hwicap/xilinx_hwicap.h
---- linux-2.6.25-rc9/drivers/char/xilinx_hwicap/xilinx_hwicap.h        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/char/xilinx_hwicap/xilinx_hwicap.h     2008-04-19 16:40:53.000000000 +0200
-@@ -65,10 +65,27 @@
+Index: linux-2.6.25.1/drivers/char/xilinx_hwicap/xilinx_hwicap.h
+===================================================================
+--- linux-2.6.25.1.orig/drivers/char/xilinx_hwicap/xilinx_hwicap.h
++++ linux-2.6.25.1/drivers/char/xilinx_hwicap/xilinx_hwicap.h
+@@ -65,10 +65,27 @@ struct hwicap_drvdata {

  };
  
  struct hwicap_driver_config {
  };
  
  struct hwicap_driver_config {


@@ -98485,7 +98863,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/char/xilinx_hwicap/xilinx_hwicap.h po
        void (*reset)(struct hwicap_drvdata *drvdata);
  };
  
        void (*reset)(struct hwicap_drvdata *drvdata);
  };
  

-@@ -163,6 +180,13 @@
+@@ -163,6 +180,13 @@ struct config_registers {

  /* Constant to use for CRC check when CRC has been disabled */
  #define XHI_DISABLED_AUTO_CRC       0x0000DEFCUL
  
  /* Constant to use for CRC check when CRC has been disabled */
  #define XHI_DISABLED_AUTO_CRC       0x0000DEFCUL
  


@@ -98499,9 +98877,10 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/char/xilinx_hwicap/xilinx_hwicap.h po
  /**
   * hwicap_type_1_read - Generates a Type 1 read packet header.
   * @reg: is the address of the register to be read back.
  /**
   * hwicap_type_1_read - Generates a Type 1 read packet header.
   * @reg: is the address of the register to be read back.

-diff -x .git -Nur linux-2.6.25-rc9/drivers/mtd/nand/fsl_elbc_nand.c powerpc.git/drivers/mtd/nand/fsl_elbc_nand.c
---- linux-2.6.25-rc9/drivers/mtd/nand/fsl_elbc_nand.c  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/mtd/nand/fsl_elbc_nand.c       2008-04-19 16:40:54.000000000 +0200
+Index: linux-2.6.25.1/drivers/mtd/nand/fsl_elbc_nand.c
+===================================================================
+--- linux-2.6.25.1.orig/drivers/mtd/nand/fsl_elbc_nand.c
++++ linux-2.6.25.1/drivers/mtd/nand/fsl_elbc_nand.c

 @@ -36,207 +36,12 @@
  #include <linux/mtd/partitions.h>
  
 @@ -36,207 +36,12 @@
  #include <linux/mtd/partitions.h>
  


@@ -98711,7 +99090,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/mtd/nand/fsl_elbc_nand.c powerpc.git/
  struct fsl_elbc_ctrl;
  
  /* mtd information per set */
  struct fsl_elbc_ctrl;
  
  /* mtd information per set */

-@@ -261,7 +66,7 @@
+@@ -261,7 +66,7 @@ struct fsl_elbc_ctrl {

  
        /* device info */
        struct device *dev;
  
        /* device info */
        struct device *dev;


@@ -98720,7 +99099,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/mtd/nand/fsl_elbc_nand.c powerpc.git/
        int irq;
        wait_queue_head_t irq_wait;
        unsigned int irq_status; /* status read from LTESR by irq handler */
        int irq;
        wait_queue_head_t irq_wait;
        unsigned int irq_status; /* status read from LTESR by irq handler */

-@@ -322,7 +127,7 @@
+@@ -322,7 +127,7 @@ static void set_addr(struct mtd_info *mt

        struct nand_chip *chip = mtd->priv;
        struct fsl_elbc_mtd *priv = chip->priv;
        struct fsl_elbc_ctrl *ctrl = priv->ctrl;
        struct nand_chip *chip = mtd->priv;
        struct fsl_elbc_mtd *priv = chip->priv;
        struct fsl_elbc_ctrl *ctrl = priv->ctrl;


@@ -98729,7 +99108,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/mtd/nand/fsl_elbc_nand.c powerpc.git/
        int buf_num;
  
        ctrl->page = page_addr;
        int buf_num;
  
        ctrl->page = page_addr;

-@@ -363,7 +168,7 @@
+@@ -363,7 +168,7 @@ static int fsl_elbc_run_command(struct m

        struct nand_chip *chip = mtd->priv;
        struct fsl_elbc_mtd *priv = chip->priv;
        struct fsl_elbc_ctrl *ctrl = priv->ctrl;
        struct nand_chip *chip = mtd->priv;
        struct fsl_elbc_mtd *priv = chip->priv;
        struct fsl_elbc_ctrl *ctrl = priv->ctrl;


@@ -98738,7 +99117,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/mtd/nand/fsl_elbc_nand.c powerpc.git/
  
        /* Setup the FMR[OP] to execute without write protection */
        out_be32(&lbc->fmr, priv->fmr | 3);
  
        /* Setup the FMR[OP] to execute without write protection */
        out_be32(&lbc->fmr, priv->fmr | 3);

-@@ -406,7 +211,7 @@
+@@ -406,7 +211,7 @@ static void fsl_elbc_do_read(struct nand

  {
        struct fsl_elbc_mtd *priv = chip->priv;
        struct fsl_elbc_ctrl *ctrl = priv->ctrl;
  {
        struct fsl_elbc_mtd *priv = chip->priv;
        struct fsl_elbc_ctrl *ctrl = priv->ctrl;


@@ -98747,7 +99126,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/mtd/nand/fsl_elbc_nand.c powerpc.git/
  
        if (priv->page_size) {
                out_be32(&lbc->fir,
  
        if (priv->page_size) {
                out_be32(&lbc->fir,

-@@ -439,7 +244,7 @@
+@@ -439,7 +244,7 @@ static void fsl_elbc_cmdfunc(struct mtd_

        struct nand_chip *chip = mtd->priv;
        struct fsl_elbc_mtd *priv = chip->priv;
        struct fsl_elbc_ctrl *ctrl = priv->ctrl;
        struct nand_chip *chip = mtd->priv;
        struct fsl_elbc_mtd *priv = chip->priv;
        struct fsl_elbc_ctrl *ctrl = priv->ctrl;


@@ -98756,7 +99135,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/mtd/nand/fsl_elbc_nand.c powerpc.git/
  
        ctrl->use_mdr = 0;
  
  
        ctrl->use_mdr = 0;
  

-@@ -775,7 +580,7 @@
+@@ -775,7 +580,7 @@ static int fsl_elbc_wait(struct mtd_info

  {
        struct fsl_elbc_mtd *priv = chip->priv;
        struct fsl_elbc_ctrl *ctrl = priv->ctrl;
  {
        struct fsl_elbc_mtd *priv = chip->priv;
        struct fsl_elbc_ctrl *ctrl = priv->ctrl;


@@ -98765,7 +99144,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/mtd/nand/fsl_elbc_nand.c powerpc.git/
  
        if (ctrl->status != LTESR_CC)
                return NAND_STATUS_FAIL;
  
        if (ctrl->status != LTESR_CC)
                return NAND_STATUS_FAIL;

-@@ -807,7 +612,7 @@
+@@ -807,7 +612,7 @@ static int fsl_elbc_chip_init_tail(struc

        struct nand_chip *chip = mtd->priv;
        struct fsl_elbc_mtd *priv = chip->priv;
        struct fsl_elbc_ctrl *ctrl = priv->ctrl;
        struct nand_chip *chip = mtd->priv;
        struct fsl_elbc_mtd *priv = chip->priv;
        struct fsl_elbc_ctrl *ctrl = priv->ctrl;


@@ -98774,7 +99153,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/mtd/nand/fsl_elbc_nand.c powerpc.git/
        unsigned int al;
  
        /* calculate FMR Address Length field */
        unsigned int al;
  
        /* calculate FMR Address Length field */

-@@ -922,7 +727,7 @@
+@@ -922,7 +727,7 @@ static void fsl_elbc_write_page(struct m

  static int fsl_elbc_chip_init(struct fsl_elbc_mtd *priv)
  {
        struct fsl_elbc_ctrl *ctrl = priv->ctrl;
  static int fsl_elbc_chip_init(struct fsl_elbc_mtd *priv)
  {
        struct fsl_elbc_ctrl *ctrl = priv->ctrl;


@@ -98783,7 +99162,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/mtd/nand/fsl_elbc_nand.c powerpc.git/
        struct nand_chip *chip = &priv->chip;
  
        dev_dbg(priv->dev, "eLBC Set Information for bank %d\n", priv->bank);
        struct nand_chip *chip = &priv->chip;
  
        dev_dbg(priv->dev, "eLBC Set Information for bank %d\n", priv->bank);

-@@ -986,7 +791,7 @@
+@@ -986,7 +791,7 @@ static int fsl_elbc_chip_remove(struct f

  static int fsl_elbc_chip_probe(struct fsl_elbc_ctrl *ctrl,
                                 struct device_node *node)
  {
  static int fsl_elbc_chip_probe(struct fsl_elbc_ctrl *ctrl,
                                 struct device_node *node)
  {


@@ -98792,7 +99171,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/mtd/nand/fsl_elbc_nand.c powerpc.git/
        struct fsl_elbc_mtd *priv;
        struct resource res;
  #ifdef CONFIG_MTD_PARTITIONS
        struct fsl_elbc_mtd *priv;
        struct resource res;
  #ifdef CONFIG_MTD_PARTITIONS

-@@ -1083,7 +888,7 @@
+@@ -1083,7 +888,7 @@ err:

  
  static int __devinit fsl_elbc_ctrl_init(struct fsl_elbc_ctrl *ctrl)
  {
  
  static int __devinit fsl_elbc_ctrl_init(struct fsl_elbc_ctrl *ctrl)
  {


@@ -98801,7 +99180,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/mtd/nand/fsl_elbc_nand.c powerpc.git/
  
        /* clear event registers */
        setbits32(&lbc->ltesr, LTESR_NAND_MASK);
  
        /* clear event registers */
        setbits32(&lbc->ltesr, LTESR_NAND_MASK);

-@@ -1128,7 +933,7 @@
+@@ -1128,7 +933,7 @@ static int __devexit fsl_elbc_ctrl_remov

  static irqreturn_t fsl_elbc_ctrl_irq(int irqno, void *data)
  {
        struct fsl_elbc_ctrl *ctrl = data;
  static irqreturn_t fsl_elbc_ctrl_irq(int irqno, void *data)
  {
        struct fsl_elbc_ctrl *ctrl = data;


@@ -98810,10 +99189,11 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/mtd/nand/fsl_elbc_nand.c powerpc.git/
        __be32 status = in_be32(&lbc->ltesr) & LTESR_NAND_MASK;
  
        if (status) {
        __be32 status = in_be32(&lbc->ltesr) & LTESR_NAND_MASK;
  
        if (status) {

-diff -x .git -Nur linux-2.6.25-rc9/drivers/net/Makefile powerpc.git/drivers/net/Makefile
---- linux-2.6.25-rc9/drivers/net/Makefile      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/net/Makefile   2008-03-17 14:03:55.000000000 +0100
-@@ -218,7 +218,8 @@
+Index: linux-2.6.25.1/drivers/net/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/drivers/net/Makefile
++++ linux-2.6.25.1/drivers/net/Makefile
+@@ -219,7 +219,8 @@ obj-$(CONFIG_SMC911X) += smc911x.o

  obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
  obj-$(CONFIG_DM9000) += dm9000.o
  obj-$(CONFIG_FEC_8XX) += fec_8xx/
  obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
  obj-$(CONFIG_DM9000) += dm9000.o
  obj-$(CONFIG_FEC_8XX) += fec_8xx/


@@ -98823,10 +99203,11 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/Makefile powerpc.git/drivers/net/
  obj-$(CONFIG_MLX4_CORE) += mlx4/
  obj-$(CONFIG_ENC28J60) += enc28j60.o
  
  obj-$(CONFIG_MLX4_CORE) += mlx4/
  obj-$(CONFIG_ENC28J60) += enc28j60.o
  

-diff -x .git -Nur linux-2.6.25-rc9/drivers/net/iseries_veth.c powerpc.git/drivers/net/iseries_veth.c
---- linux-2.6.25-rc9/drivers/net/iseries_veth.c        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/net/iseries_veth.c     2008-04-19 16:40:54.000000000 +0200
-@@ -308,7 +308,8 @@
+Index: linux-2.6.25.1/drivers/net/iseries_veth.c
+===================================================================
+--- linux-2.6.25.1.orig/drivers/net/iseries_veth.c
++++ linux-2.6.25.1/drivers/net/iseries_veth.c
+@@ -308,7 +308,8 @@ static void veth_complete_allocation(voi

  
  static int veth_allocate_events(HvLpIndex rlp, int number)
  {
  
  static int veth_allocate_events(HvLpIndex rlp, int number)
  {


@@ -98836,9 +99217,10 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/iseries_veth.c powerpc.git/driver
  
        mf_allocate_lp_events(rlp, HvLpEvent_Type_VirtualLan,
                            sizeof(struct veth_lpevent), number,
  
        mf_allocate_lp_events(rlp, HvLpEvent_Type_VirtualLan,
                            sizeof(struct veth_lpevent), number,

-diff -x .git -Nur linux-2.6.25-rc9/drivers/net/pasemi_mac.c powerpc.git/drivers/net/pasemi_mac.c
---- linux-2.6.25-rc9/drivers/net/pasemi_mac.c  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/net/pasemi_mac.c       2008-04-19 16:40:54.000000000 +0200
+Index: linux-2.6.25.1/drivers/net/pasemi_mac.c
+===================================================================
+--- linux-2.6.25.1.orig/drivers/net/pasemi_mac.c
++++ linux-2.6.25.1/drivers/net/pasemi_mac.c

 @@ -55,15 +55,10 @@
   * - Multiqueue RX/TX
   */
 @@ -55,15 +55,10 @@
   * - Multiqueue RX/TX
   */


@@ -98873,7 +99255,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/pasemi_mac.c powerpc.git/drivers/
  MODULE_LICENSE("GPL");
  MODULE_AUTHOR ("Olof Johansson <olof@lixom.net>");
  MODULE_DESCRIPTION("PA Semi PWRficient Ethernet driver");
  MODULE_LICENSE("GPL");
  MODULE_AUTHOR ("Olof Johansson <olof@lixom.net>");
  MODULE_DESCRIPTION("PA Semi PWRficient Ethernet driver");

-@@ -94,6 +79,8 @@
+@@ -94,6 +79,8 @@ static int debug = -1;       /* -1 == use DEFA

  module_param(debug, int, 0);
  MODULE_PARM_DESC(debug, "PA Semi MAC bitmapped debugging message enable value");
  
  module_param(debug, int, 0);
  MODULE_PARM_DESC(debug, "PA Semi MAC bitmapped debugging message enable value");
  


@@ -98882,7 +99264,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/pasemi_mac.c powerpc.git/drivers/
  static int translation_enabled(void)
  {
  #if defined(CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE)
  static int translation_enabled(void)
  {
  #if defined(CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE)

-@@ -322,6 +309,104 @@
+@@ -322,6 +309,104 @@ static int pasemi_mac_unmap_tx_skb(struc

        return (nfrags + 3) & ~1;
  }
  
        return (nfrags + 3) & ~1;
  }
  


@@ -98987,7 +99369,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/pasemi_mac.c powerpc.git/drivers/
  static int pasemi_mac_setup_rx_resources(const struct net_device *dev)
  {
        struct pasemi_mac_rxring *ring;
  static int pasemi_mac_setup_rx_resources(const struct net_device *dev)
  {
        struct pasemi_mac_rxring *ring;

-@@ -445,7 +530,7 @@
+@@ -445,7 +530,7 @@ pasemi_mac_setup_tx_resources(const stru

        cfg = PAS_DMA_TXCHAN_CFG_TY_IFACE |
              PAS_DMA_TXCHAN_CFG_TATTR(mac->dma_if) |
              PAS_DMA_TXCHAN_CFG_UP |
        cfg = PAS_DMA_TXCHAN_CFG_TY_IFACE |
              PAS_DMA_TXCHAN_CFG_TATTR(mac->dma_if) |
              PAS_DMA_TXCHAN_CFG_UP |


@@ -98996,7 +99378,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/pasemi_mac.c powerpc.git/drivers/
  
        if (translation_enabled())
                cfg |= PAS_DMA_TXCHAN_CFG_TRD | PAS_DMA_TXCHAN_CFG_TRR;
  
        if (translation_enabled())
                cfg |= PAS_DMA_TXCHAN_CFG_TRD | PAS_DMA_TXCHAN_CFG_TRR;

-@@ -810,13 +895,21 @@
+@@ -810,13 +895,21 @@ restart:

                u64 mactx = TX_DESC(txring, i);
                struct sk_buff *skb;
  
                u64 mactx = TX_DESC(txring, i);
                struct sk_buff *skb;
  


@@ -99021,7 +99403,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/pasemi_mac.c powerpc.git/drivers/
                if (unlikely(mactx & XCT_MACTX_O))
                        /* Not yet transmitted */
                        break;
                if (unlikely(mactx & XCT_MACTX_O))
                        /* Not yet transmitted */
                        break;

-@@ -1041,13 +1134,7 @@
+@@ -1041,13 +1134,7 @@ static int pasemi_mac_open(struct net_de

  {
        struct pasemi_mac *mac = netdev_priv(dev);
        unsigned int flags;
  {
        struct pasemi_mac *mac = netdev_priv(dev);
        unsigned int flags;


@@ -99036,7 +99418,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/pasemi_mac.c powerpc.git/drivers/
  
        flags = PAS_MAC_CFG_TXP_FCE | PAS_MAC_CFG_TXP_FPC(3) |
                PAS_MAC_CFG_TXP_SL(3) | PAS_MAC_CFG_TXP_COB(0xf) |
  
        flags = PAS_MAC_CFG_TXP_FCE | PAS_MAC_CFG_TXP_FPC(3) |
                PAS_MAC_CFG_TXP_SL(3) | PAS_MAC_CFG_TXP_COB(0xf) |

-@@ -1064,6 +1151,19 @@
+@@ -1064,6 +1151,19 @@ static int pasemi_mac_open(struct net_de

        if (!mac->tx)
                goto out_tx_ring;
  
        if (!mac->tx)
                goto out_tx_ring;
  


@@ -99056,7 +99438,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/pasemi_mac.c powerpc.git/drivers/
        /* 0x3ff with 33MHz clock is about 31us */
        write_iob_reg(PAS_IOB_DMA_COM_TIMEOUTCFG,
                      PAS_IOB_DMA_COM_TIMEOUTCFG_TCNT(0x3ff));
        /* 0x3ff with 33MHz clock is about 31us */
        write_iob_reg(PAS_IOB_DMA_COM_TIMEOUTCFG,
                      PAS_IOB_DMA_COM_TIMEOUTCFG_TCNT(0x3ff));

-@@ -1247,7 +1347,7 @@
+@@ -1247,7 +1347,7 @@ static int pasemi_mac_close(struct net_d

  {
        struct pasemi_mac *mac = netdev_priv(dev);
        unsigned int sta;
  {
        struct pasemi_mac *mac = netdev_priv(dev);
        unsigned int sta;


@@ -99065,7 +99447,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/pasemi_mac.c powerpc.git/drivers/
  
        rxch = rx_ring(mac)->chan.chno;
        txch = tx_ring(mac)->chan.chno;
  
        rxch = rx_ring(mac)->chan.chno;
        txch = tx_ring(mac)->chan.chno;

-@@ -1292,6 +1392,13 @@
+@@ -1292,6 +1392,13 @@ static int pasemi_mac_close(struct net_d

        free_irq(mac->tx->chan.irq, mac->tx);
        free_irq(mac->rx->chan.irq, mac->rx);
  
        free_irq(mac->tx->chan.irq, mac->tx);
        free_irq(mac->rx->chan.irq, mac->rx);
  


@@ -99079,7 +99461,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/pasemi_mac.c powerpc.git/drivers/
        /* Free resources */
        pasemi_mac_free_rx_resources(mac);
        pasemi_mac_free_tx_resources(mac);
        /* Free resources */
        pasemi_mac_free_rx_resources(mac);
        pasemi_mac_free_tx_resources(mac);

-@@ -1299,35 +1406,113 @@
+@@ -1299,35 +1406,113 @@ static int pasemi_mac_close(struct net_d

        return 0;
  }
  
        return 0;
  }
  


@@ -99213,7 +99595,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/pasemi_mac.c powerpc.git/drivers/
  
        nfrags = skb_shinfo(skb)->nr_frags;
  
  
        nfrags = skb_shinfo(skb)->nr_frags;
  

-@@ -1350,24 +1535,46 @@
+@@ -1350,24 +1535,46 @@ static int pasemi_mac_start_tx(struct sk

                }
        }
  
                }
        }
  


@@ -99265,7 +99647,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/pasemi_mac.c powerpc.git/drivers/
        TX_DESC(txring, fill) = mactx;
        TX_DESC_INFO(txring, fill).dma = nfrags;
        fill++;
        TX_DESC(txring, fill) = mactx;
        TX_DESC_INFO(txring, fill).dma = nfrags;
        fill++;

-@@ -1441,12 +1648,33 @@
+@@ -1441,12 +1648,33 @@ static int pasemi_mac_poll(struct napi_s

        return pkts;
  }
  
        return pkts;
  }
  


@@ -99300,7 +99682,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/pasemi_mac.c powerpc.git/drivers/
  
        if (new_mtu < PE_MIN_MTU || new_mtu > PE_MAX_MTU)
                return -EINVAL;
  
        if (new_mtu < PE_MIN_MTU || new_mtu > PE_MAX_MTU)
                return -EINVAL;

-@@ -1468,6 +1696,16 @@
+@@ -1468,6 +1696,16 @@ static int pasemi_mac_change_mtu(struct 

                pasemi_mac_pause_rxint(mac);
                pasemi_mac_clean_rx(rx_ring(mac), RX_RING_SIZE);
                pasemi_mac_free_rx_buffers(mac);
                pasemi_mac_pause_rxint(mac);
                pasemi_mac_clean_rx(rx_ring(mac), RX_RING_SIZE);
                pasemi_mac_free_rx_buffers(mac);


@@ -99317,7 +99699,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/pasemi_mac.c powerpc.git/drivers/
        }
  
        /* Change maxf, i.e. what size frames are accepted.
        }
  
        /* Change maxf, i.e. what size frames are accepted.

-@@ -1482,6 +1720,7 @@
+@@ -1482,6 +1720,7 @@ static int pasemi_mac_change_mtu(struct 

        /* MTU + ETH_HLEN + VLAN_HLEN + 2 64B cachelines */
        mac->bufsz = new_mtu + ETH_HLEN + ETH_FCS_LEN + LOCAL_SKB_ALIGN + 128;
  
        /* MTU + ETH_HLEN + VLAN_HLEN + 2 64B cachelines */
        mac->bufsz = new_mtu + ETH_HLEN + ETH_FCS_LEN + LOCAL_SKB_ALIGN + 128;
  


@@ -99325,7 +99707,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/pasemi_mac.c powerpc.git/drivers/
        if (running) {
                write_dma_reg(PAS_DMA_RXINT_RCMDSTA(mac->dma_if),
                              rcmdsta | PAS_DMA_RXINT_RCMDSTA_EN);
        if (running) {
                write_dma_reg(PAS_DMA_RXINT_RCMDSTA(mac->dma_if),
                              rcmdsta | PAS_DMA_RXINT_RCMDSTA_EN);

-@@ -1494,7 +1733,7 @@
+@@ -1494,7 +1733,7 @@ static int pasemi_mac_change_mtu(struct 

                pasemi_mac_intf_enable(mac);
        }
  
                pasemi_mac_intf_enable(mac);
        }
  


@@ -99334,7 +99716,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/pasemi_mac.c powerpc.git/drivers/
  }
  
  static int __devinit
  }
  
  static int __devinit

-@@ -1528,7 +1767,7 @@
+@@ -1528,7 +1767,7 @@ pasemi_mac_probe(struct pci_dev *pdev, c

        netif_napi_add(dev, &mac->napi, pasemi_mac_poll, 64);
  
        dev->features = NETIF_F_IP_CSUM | NETIF_F_LLTX | NETIF_F_SG |
        netif_napi_add(dev, &mac->napi, pasemi_mac_poll, 64);
  
        dev->features = NETIF_F_IP_CSUM | NETIF_F_LLTX | NETIF_F_SG |


@@ -99343,7 +99725,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/pasemi_mac.c powerpc.git/drivers/
  
        mac->lro_mgr.max_aggr = LRO_MAX_AGGR;
        mac->lro_mgr.max_desc = MAX_LRO_DESCRIPTORS;
  
        mac->lro_mgr.max_aggr = LRO_MAX_AGGR;
        mac->lro_mgr.max_desc = MAX_LRO_DESCRIPTORS;

-@@ -1588,8 +1827,12 @@
+@@ -1588,8 +1827,12 @@ pasemi_mac_probe(struct pci_dev *pdev, c

        dev->mtu = PE_DEF_MTU;
        /* 1500 MTU + ETH_HLEN + VLAN_HLEN + 2 64B cachelines */
        mac->bufsz = dev->mtu + ETH_HLEN + ETH_FCS_LEN + LOCAL_SKB_ALIGN + 128;
        dev->mtu = PE_DEF_MTU;
        /* 1500 MTU + ETH_HLEN + VLAN_HLEN + 2 64B cachelines */
        mac->bufsz = dev->mtu + ETH_HLEN + ETH_FCS_LEN + LOCAL_SKB_ALIGN + 128;


@@ -99356,9 +99738,10 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/pasemi_mac.c powerpc.git/drivers/
  
        if (err)
                goto out;
  
        if (err)
                goto out;

-diff -x .git -Nur linux-2.6.25-rc9/drivers/net/pasemi_mac.h powerpc.git/drivers/net/pasemi_mac.h
---- linux-2.6.25-rc9/drivers/net/pasemi_mac.h  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/net/pasemi_mac.h       2008-03-17 14:03:59.000000000 +0100
+Index: linux-2.6.25.1/drivers/net/pasemi_mac.h
+===================================================================
+--- linux-2.6.25.1.orig/drivers/net/pasemi_mac.h
++++ linux-2.6.25.1/drivers/net/pasemi_mac.h

 @@ -26,7 +26,14 @@
  #include <linux/spinlock.h>
  #include <linux/phy.h>
 @@ -26,7 +26,14 @@
  #include <linux/spinlock.h>
  #include <linux/phy.h>


@@ -99374,7 +99757,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/pasemi_mac.h powerpc.git/drivers/
  
  struct pasemi_mac_txring {
        struct pasemi_dmachan chan; /* Must be first */
  
  struct pasemi_mac_txring {
        struct pasemi_dmachan chan; /* Must be first */

-@@ -51,6 +58,15 @@
+@@ -51,6 +58,15 @@ struct pasemi_mac_rxring {

        struct pasemi_mac *mac; /* Needed in intr handler */
  };
  
        struct pasemi_mac *mac; /* Needed in intr handler */
  };
  


@@ -99390,7 +99773,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/pasemi_mac.h powerpc.git/drivers/
  struct pasemi_mac {
        struct net_device *netdev;
        struct pci_dev *pdev;
  struct pasemi_mac {
        struct net_device *netdev;
        struct pci_dev *pdev;

-@@ -60,10 +76,12 @@
+@@ -60,10 +76,12 @@ struct pasemi_mac {

        struct napi_struct napi;
  
        int             bufsz; /* RX ring buffer size */
        struct napi_struct napi;
  
        int             bufsz; /* RX ring buffer size */


@@ -99404,7 +99787,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/pasemi_mac.h powerpc.git/drivers/
  
        u8              mac_addr[6];
  
  
        u8              mac_addr[6];
  

-@@ -74,6 +92,7 @@
+@@ -74,6 +92,7 @@ struct pasemi_mac {

  
        struct pasemi_mac_txring *tx;
        struct pasemi_mac_rxring *rx;
  
        struct pasemi_mac_txring *tx;
        struct pasemi_mac_rxring *rx;


@@ -99412,7 +99795,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/pasemi_mac.h powerpc.git/drivers/
        char            tx_irq_name[10];                /* "eth%d tx" */
        char            rx_irq_name[10];                /* "eth%d rx" */
        int     link;
        char            tx_irq_name[10];                /* "eth%d tx" */
        char            rx_irq_name[10];                /* "eth%d rx" */
        int     link;

-@@ -90,6 +109,16 @@
+@@ -90,6 +109,16 @@ struct pasemi_mac_buffer {

        dma_addr_t      dma;
  };
  
        dma_addr_t      dma;
  };
  


@@ -99429,7 +99812,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/pasemi_mac.h powerpc.git/drivers/
  
  /* PCI register offsets and formats */
  
  
  /* PCI register offsets and formats */
  

-@@ -101,6 +130,7 @@
+@@ -101,6 +130,7 @@ enum {

        PAS_MAC_CFG_ADR0 = 0x8c,
        PAS_MAC_CFG_ADR1 = 0x90,
        PAS_MAC_CFG_TXP = 0x98,
        PAS_MAC_CFG_ADR0 = 0x8c,
        PAS_MAC_CFG_ADR1 = 0x90,
        PAS_MAC_CFG_TXP = 0x98,


@@ -99437,7 +99820,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/pasemi_mac.h powerpc.git/drivers/
        PAS_MAC_IPC_CHNL = 0x208,
  };
  
        PAS_MAC_IPC_CHNL = 0x208,
  };
  

-@@ -172,6 +202,8 @@
+@@ -172,6 +202,8 @@ enum {

  #define PAS_MAC_CFG_TXP_TIFG(x)               (((x) << PAS_MAC_CFG_TXP_TIFG_S) & \
                                         PAS_MAC_CFG_TXP_TIFG_M)
  
  #define PAS_MAC_CFG_TXP_TIFG(x)               (((x) << PAS_MAC_CFG_TXP_TIFG_S) & \
                                         PAS_MAC_CFG_TXP_TIFG_M)
  


@@ -99446,15 +99829,16 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/pasemi_mac.h powerpc.git/drivers/
  #define PAS_MAC_IPC_CHNL_DCHNO_M      0x003f0000
  #define PAS_MAC_IPC_CHNL_DCHNO_S      16
  #define PAS_MAC_IPC_CHNL_DCHNO(x)     (((x) << PAS_MAC_IPC_CHNL_DCHNO_S) & \
  #define PAS_MAC_IPC_CHNL_DCHNO_M      0x003f0000
  #define PAS_MAC_IPC_CHNL_DCHNO_S      16
  #define PAS_MAC_IPC_CHNL_DCHNO(x)     (((x) << PAS_MAC_IPC_CHNL_DCHNO_S) & \

-@@ -181,4 +213,5 @@
+@@ -181,4 +213,5 @@ enum {

  #define PAS_MAC_IPC_CHNL_BCH(x)               (((x) << PAS_MAC_IPC_CHNL_BCH_S) & \
                                         PAS_MAC_IPC_CHNL_BCH_M)
  
 +
  #endif /* PASEMI_MAC_H */
  #define PAS_MAC_IPC_CHNL_BCH(x)               (((x) << PAS_MAC_IPC_CHNL_BCH_S) & \
                                         PAS_MAC_IPC_CHNL_BCH_M)
  
 +
  #endif /* PASEMI_MAC_H */

-diff -x .git -Nur linux-2.6.25-rc9/drivers/net/pasemi_mac_ethtool.c powerpc.git/drivers/net/pasemi_mac_ethtool.c
---- linux-2.6.25-rc9/drivers/net/pasemi_mac_ethtool.c  1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/drivers/net/pasemi_mac_ethtool.c       2008-03-17 14:03:59.000000000 +0100
+Index: linux-2.6.25.1/drivers/net/pasemi_mac_ethtool.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/drivers/net/pasemi_mac_ethtool.c

 @@ -0,0 +1,159 @@
 +/*
 + * Copyright (C) 2006-2008 PA Semi, Inc
 @@ -0,0 +1,159 @@
 +/*
 + * Copyright (C) 2006-2008 PA Semi, Inc


@@ -99615,10 +99999,11 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/pasemi_mac_ethtool.c powerpc.git/
 +      .get_ethtool_stats      = pasemi_mac_get_ethtool_stats,
 +};
 +
 +      .get_ethtool_stats      = pasemi_mac_get_ethtool_stats,
 +};
 +

-diff -x .git -Nur linux-2.6.25-rc9/drivers/net/ps3_gelic_net.c powerpc.git/drivers/net/ps3_gelic_net.c
---- linux-2.6.25-rc9/drivers/net/ps3_gelic_net.c       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/net/ps3_gelic_net.c    2008-04-19 16:40:54.000000000 +0200
-@@ -1266,6 +1266,85 @@
+Index: linux-2.6.25.1/drivers/net/ps3_gelic_net.c
+===================================================================
+--- linux-2.6.25.1.orig/drivers/net/ps3_gelic_net.c
++++ linux-2.6.25.1/drivers/net/ps3_gelic_net.c
+@@ -1266,6 +1266,85 @@ int gelic_net_set_rx_csum(struct net_dev

        return 0;
  }
  
        return 0;
  }
  


@@ -99704,7 +100089,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/ps3_gelic_net.c powerpc.git/drive
  static struct ethtool_ops gelic_ether_ethtool_ops = {
        .get_drvinfo    = gelic_net_get_drvinfo,
        .get_settings   = gelic_ether_get_settings,
  static struct ethtool_ops gelic_ether_ethtool_ops = {
        .get_drvinfo    = gelic_net_get_drvinfo,
        .get_settings   = gelic_ether_get_settings,

-@@ -1274,6 +1353,8 @@
+@@ -1274,6 +1353,8 @@ static struct ethtool_ops gelic_ether_et

        .set_tx_csum    = ethtool_op_set_tx_csum,
        .get_rx_csum    = gelic_net_get_rx_csum,
        .set_rx_csum    = gelic_net_set_rx_csum,
        .set_tx_csum    = ethtool_op_set_tx_csum,
        .get_rx_csum    = gelic_net_get_rx_csum,
        .set_rx_csum    = gelic_net_set_rx_csum,


@@ -99713,10 +100098,11 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/ps3_gelic_net.c powerpc.git/drive
  };
  
  /**
  };
  
  /**

-diff -x .git -Nur linux-2.6.25-rc9/drivers/net/ps3_gelic_net.h powerpc.git/drivers/net/ps3_gelic_net.h
---- linux-2.6.25-rc9/drivers/net/ps3_gelic_net.h       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/net/ps3_gelic_net.h    2008-04-19 16:40:54.000000000 +0200
-@@ -182,12 +182,32 @@
+Index: linux-2.6.25.1/drivers/net/ps3_gelic_net.h
+===================================================================
+--- linux-2.6.25.1.orig/drivers/net/ps3_gelic_net.h
++++ linux-2.6.25.1/drivers/net/ps3_gelic_net.h
+@@ -182,12 +182,32 @@ enum gelic_lv1_net_control_code {

        GELIC_LV1_GET_ETH_PORT_STATUS   = 2,
        GELIC_LV1_SET_NEGOTIATION_MODE  = 3,
        GELIC_LV1_GET_VLAN_ID           = 4,
        GELIC_LV1_GET_ETH_PORT_STATUS   = 2,
        GELIC_LV1_SET_NEGOTIATION_MODE  = 3,
        GELIC_LV1_GET_VLAN_ID           = 4,


@@ -99749,10 +100135,11 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/ps3_gelic_net.h powerpc.git/drive
  /* status returened from GET_ETH_PORT_STATUS */
  enum gelic_lv1_ether_port_status {
        GELIC_LV1_ETHER_LINK_UP         = 0x0000000000000001L,
  /* status returened from GET_ETH_PORT_STATUS */
  enum gelic_lv1_ether_port_status {
        GELIC_LV1_ETHER_LINK_UP         = 0x0000000000000001L,

-diff -x .git -Nur linux-2.6.25-rc9/drivers/net/ucc_geth.c powerpc.git/drivers/net/ucc_geth.c
---- linux-2.6.25-rc9/drivers/net/ucc_geth.c    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/net/ucc_geth.c 2008-04-19 16:40:54.000000000 +0200
-@@ -3852,7 +3852,13 @@
+Index: linux-2.6.25.1/drivers/net/ucc_geth.c
+===================================================================
+--- linux-2.6.25.1.orig/drivers/net/ucc_geth.c
++++ linux-2.6.25.1/drivers/net/ucc_geth.c
+@@ -3853,7 +3853,13 @@ static int ucc_geth_probe(struct of_devi

  
        ugeth_vdbg("%s: IN", __FUNCTION__);
  
  
        ugeth_vdbg("%s: IN", __FUNCTION__);
  


@@ -99767,10 +100154,11 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/ucc_geth.c powerpc.git/drivers/ne
        ucc_num = *prop - 1;
        if ((ucc_num < 0) || (ucc_num > 7))
                return -ENODEV;
        ucc_num = *prop - 1;
        if ((ucc_num < 0) || (ucc_num > 7))
                return -ENODEV;

-diff -x .git -Nur linux-2.6.25-rc9/drivers/net/ucc_geth_mii.c powerpc.git/drivers/net/ucc_geth_mii.c
---- linux-2.6.25-rc9/drivers/net/ucc_geth_mii.c        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/net/ucc_geth_mii.c     2008-04-19 16:40:54.000000000 +0200
-@@ -203,9 +203,14 @@
+Index: linux-2.6.25.1/drivers/net/ucc_geth_mii.c
+===================================================================
+--- linux-2.6.25.1.orig/drivers/net/ucc_geth_mii.c
++++ linux-2.6.25.1/drivers/net/ucc_geth_mii.c
+@@ -203,9 +203,14 @@ static int uec_mdio_probe(struct of_devi

                if ((res.start >= tempres.start) &&
                    (res.end <= tempres.end)) {
                        /* set this UCC to be the MII master */
                if ((res.start >= tempres.start) &&
                    (res.end <= tempres.end)) {
                        /* set this UCC to be the MII master */


@@ -99788,9 +100176,10 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/net/ucc_geth_mii.c powerpc.git/driver
  
                        ucc_set_qe_mux_mii_mng(*id - 1);
  
  
                        ucc_set_qe_mux_mii_mng(*id - 1);
  

-diff -x .git -Nur linux-2.6.25-rc9/drivers/of/Kconfig powerpc.git/drivers/of/Kconfig
---- linux-2.6.25-rc9/drivers/of/Kconfig        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/of/Kconfig     2008-04-19 16:40:55.000000000 +0200
+Index: linux-2.6.25.1/drivers/of/Kconfig
+===================================================================
+--- linux-2.6.25.1.orig/drivers/of/Kconfig
++++ linux-2.6.25.1/drivers/of/Kconfig

 @@ -1,3 +1,15 @@
  config OF_DEVICE
        def_bool y
 @@ -1,3 +1,15 @@
  config OF_DEVICE
        def_bool y


@@ -99807,18 +100196,20 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/of/Kconfig powerpc.git/drivers/of/Kco
 +      depends on OF && I2C
 +      help
 +        OpenFirmware I2C accessors
 +      depends on OF && I2C
 +      help
 +        OpenFirmware I2C accessors

-diff -x .git -Nur linux-2.6.25-rc9/drivers/of/Makefile powerpc.git/drivers/of/Makefile
---- linux-2.6.25-rc9/drivers/of/Makefile       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/of/Makefile    2008-04-19 16:40:55.000000000 +0200
+Index: linux-2.6.25.1/drivers/of/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/drivers/of/Makefile
++++ linux-2.6.25.1/drivers/of/Makefile

 @@ -1,2 +1,4 @@
  obj-y = base.o
  obj-$(CONFIG_OF_DEVICE) += device.o platform.o
 +obj-$(CONFIG_OF_GPIO)   += gpio.o
 +obj-$(CONFIG_OF_I2C)  += i2c.o
 @@ -1,2 +1,4 @@
  obj-y = base.o
  obj-$(CONFIG_OF_DEVICE) += device.o platform.o
 +obj-$(CONFIG_OF_GPIO)   += gpio.o
 +obj-$(CONFIG_OF_I2C)  += i2c.o

-diff -x .git -Nur linux-2.6.25-rc9/drivers/of/base.c powerpc.git/drivers/of/base.c
---- linux-2.6.25-rc9/drivers/of/base.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/of/base.c      2008-04-19 16:40:55.000000000 +0200
-@@ -117,6 +117,32 @@
+Index: linux-2.6.25.1/drivers/of/base.c
+===================================================================
+--- linux-2.6.25.1.orig/drivers/of/base.c
++++ linux-2.6.25.1/drivers/of/base.c
+@@ -117,6 +117,32 @@ int of_device_is_compatible(const struct

  EXPORT_SYMBOL(of_device_is_compatible);
  
  /**
  EXPORT_SYMBOL(of_device_is_compatible);
  
  /**


@@ -99851,9 +100242,10 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/of/base.c powerpc.git/drivers/of/base
   *    of_get_parent - Get a node's parent if any
   *    @node:  Node to get parent
   *
   *    of_get_parent - Get a node's parent if any
   *    @node:  Node to get parent
   *

-diff -x .git -Nur linux-2.6.25-rc9/drivers/of/gpio.c powerpc.git/drivers/of/gpio.c
---- linux-2.6.25-rc9/drivers/of/gpio.c 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/drivers/of/gpio.c      2008-04-19 16:40:55.000000000 +0200
+Index: linux-2.6.25.1/drivers/of/gpio.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/drivers/of/gpio.c

 @@ -0,0 +1,242 @@
 +/*
 + * OF helpers for the GPIO API
 @@ -0,0 +1,242 @@
 +/*
 + * OF helpers for the GPIO API


@@ -100097,9 +100489,10 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/of/gpio.c powerpc.git/drivers/of/gpio
 +      return ret;
 +}
 +EXPORT_SYMBOL(of_mm_gpiochip_add);
 +      return ret;
 +}
 +EXPORT_SYMBOL(of_mm_gpiochip_add);

-diff -x .git -Nur linux-2.6.25-rc9/drivers/of/i2c.c powerpc.git/drivers/of/i2c.c
---- linux-2.6.25-rc9/drivers/of/i2c.c  1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/drivers/of/i2c.c       2008-04-19 16:40:55.000000000 +0200
+Index: linux-2.6.25.1/drivers/of/i2c.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/drivers/of/i2c.c

 @@ -0,0 +1,115 @@
 +/*
 + * OF helpers for the I2C API
 @@ -0,0 +1,115 @@
 +/*
 + * OF helpers for the I2C API


@@ -100216,9 +100609,10 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/of/i2c.c powerpc.git/drivers/of/i2c.c
 +      }
 +}
 +EXPORT_SYMBOL(of_register_i2c_devices);
 +      }
 +}
 +EXPORT_SYMBOL(of_register_i2c_devices);

-diff -x .git -Nur linux-2.6.25-rc9/drivers/ps3/ps3-sys-manager.c powerpc.git/drivers/ps3/ps3-sys-manager.c
---- linux-2.6.25-rc9/drivers/ps3/ps3-sys-manager.c     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/ps3/ps3-sys-manager.c  2008-04-19 16:40:55.000000000 +0200
+Index: linux-2.6.25.1/drivers/ps3/ps3-sys-manager.c
+===================================================================
+--- linux-2.6.25.1.orig/drivers/ps3/ps3-sys-manager.c
++++ linux-2.6.25.1/drivers/ps3/ps3-sys-manager.c

 @@ -24,6 +24,7 @@
  #include <linux/reboot.h>
  
 @@ -24,6 +24,7 @@
  #include <linux/reboot.h>
  


@@ -100227,7 +100621,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/ps3/ps3-sys-manager.c powerpc.git/dri
  #include <asm/ps3.h>
  
  #include "vuart.h"
  #include <asm/ps3.h>
  
  #include "vuart.h"

-@@ -187,6 +188,7 @@
+@@ -187,6 +188,7 @@ enum ps3_sys_manager_next_op {

   * controller, and bluetooth controller.
   * @PS3_SM_WAKE_RTC:
   * @PS3_SM_WAKE_RTC_ERROR:
   * controller, and bluetooth controller.
   * @PS3_SM_WAKE_RTC:
   * @PS3_SM_WAKE_RTC_ERROR:


@@ -100235,7 +100629,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/ps3/ps3-sys-manager.c powerpc.git/dri
   * @PS3_SM_WAKE_P_O_R: Power on reset.
   *
   * Additional wakeup sources when specifying PS3_SM_NEXT_OP_SYS_SHUTDOWN.
   * @PS3_SM_WAKE_P_O_R: Power on reset.
   *
   * Additional wakeup sources when specifying PS3_SM_NEXT_OP_SYS_SHUTDOWN.

-@@ -200,10 +202,19 @@
+@@ -200,10 +202,19 @@ enum ps3_sys_manager_wake_source {

        PS3_SM_WAKE_DEFAULT   = 0,
        PS3_SM_WAKE_RTC       = 0x00000040,
        PS3_SM_WAKE_RTC_ERROR = 0x00000080,
        PS3_SM_WAKE_DEFAULT   = 0,
        PS3_SM_WAKE_RTC       = 0x00000040,
        PS3_SM_WAKE_RTC_ERROR = 0x00000080,


@@ -100255,7 +100649,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/ps3/ps3-sys-manager.c powerpc.git/dri
   * enum ps3_sys_manager_cmd - Command from system manager to guest.
   *
   * The guest completes the actions needed, then acks or naks the command via
   * enum ps3_sys_manager_cmd - Command from system manager to guest.
   *
   * The guest completes the actions needed, then acks or naks the command via

-@@ -581,6 +592,23 @@
+@@ -581,6 +592,23 @@ fail_id:

        return -EIO;
  }
  
        return -EIO;
  }
  


@@ -100279,7 +100673,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/ps3/ps3-sys-manager.c powerpc.git/dri
  /**
   * ps3_sys_manager_final_power_off - The final platform machine_power_off routine.
   *
  /**
   * ps3_sys_manager_final_power_off - The final platform machine_power_off routine.
   *

-@@ -601,13 +629,9 @@
+@@ -601,13 +629,9 @@ static void ps3_sys_manager_final_power_

        ps3_vuart_cancel_async(dev);
  
        ps3_sys_manager_send_next_op(dev, PS3_SM_NEXT_OP_SYS_SHUTDOWN,
        ps3_vuart_cancel_async(dev);
  
        ps3_sys_manager_send_next_op(dev, PS3_SM_NEXT_OP_SYS_SHUTDOWN,


@@ -100295,7 +100689,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/ps3/ps3-sys-manager.c powerpc.git/dri
  }
  
  /**
  }
  
  /**

-@@ -638,14 +662,42 @@
+@@ -638,14 +662,42 @@ static void ps3_sys_manager_final_restar

  
        ps3_sys_manager_send_attr(dev, 0);
        ps3_sys_manager_send_next_op(dev, PS3_SM_NEXT_OP_SYS_REBOOT,
  
        ps3_sys_manager_send_attr(dev, 0);
        ps3_sys_manager_send_next_op(dev, PS3_SM_NEXT_OP_SYS_REBOOT,


@@ -100343,9 +100737,10 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/ps3/ps3-sys-manager.c powerpc.git/dri
  
  /**
   * ps3_sys_manager_work - Asynchronous read handler.
  
  /**
   * ps3_sys_manager_work - Asynchronous read handler.

-diff -x .git -Nur linux-2.6.25-rc9/drivers/ps3/sys-manager-core.c powerpc.git/drivers/ps3/sys-manager-core.c
---- linux-2.6.25-rc9/drivers/ps3/sys-manager-core.c    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/ps3/sys-manager-core.c 2008-04-19 16:40:55.000000000 +0200
+Index: linux-2.6.25.1/drivers/ps3/sys-manager-core.c
+===================================================================
+--- linux-2.6.25.1.orig/drivers/ps3/sys-manager-core.c
++++ linux-2.6.25.1/drivers/ps3/sys-manager-core.c

 @@ -19,6 +19,7 @@
   */
  
 @@ -19,6 +19,7 @@
   */
  


@@ -100354,7 +100749,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/ps3/sys-manager-core.c powerpc.git/dr
  #include <asm/ps3.h>
  
  /**
  #include <asm/ps3.h>
  
  /**

-@@ -50,10 +51,7 @@
+@@ -50,10 +51,7 @@ void ps3_sys_manager_power_off(void)

        if (ps3_sys_manager_ops.power_off)
                ps3_sys_manager_ops.power_off(ps3_sys_manager_ops.dev);
  
        if (ps3_sys_manager_ops.power_off)
                ps3_sys_manager_ops.power_off(ps3_sys_manager_ops.dev);
  


@@ -100366,7 +100761,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/ps3/sys-manager-core.c powerpc.git/dr
  }
  
  void ps3_sys_manager_restart(void)
  }
  
  void ps3_sys_manager_restart(void)

-@@ -61,8 +59,14 @@
+@@ -61,8 +59,14 @@ void ps3_sys_manager_restart(void)

        if (ps3_sys_manager_ops.restart)
                ps3_sys_manager_ops.restart(ps3_sys_manager_ops.dev);
  
        if (ps3_sys_manager_ops.restart)
                ps3_sys_manager_ops.restart(ps3_sys_manager_ops.dev);
  


@@ -100383,10 +100778,11 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/ps3/sys-manager-core.c powerpc.git/dr
 +              lv1_pause(1);
  }
 +
 +              lv1_pause(1);
  }
 +

-diff -x .git -Nur linux-2.6.25-rc9/drivers/serial/cpm_uart/cpm_uart.h powerpc.git/drivers/serial/cpm_uart/cpm_uart.h
---- linux-2.6.25-rc9/drivers/serial/cpm_uart/cpm_uart.h        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/serial/cpm_uart/cpm_uart.h     2008-04-19 16:40:55.000000000 +0200
-@@ -92,6 +92,9 @@
+Index: linux-2.6.25.1/drivers/serial/cpm_uart/cpm_uart.h
+===================================================================
+--- linux-2.6.25.1.orig/drivers/serial/cpm_uart/cpm_uart.h
++++ linux-2.6.25.1/drivers/serial/cpm_uart/cpm_uart.h
+@@ -92,6 +92,9 @@ extern struct uart_cpm_port cpm_uart_por

  
  /* these are located in their respective files */
  void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd);
  
  /* these are located in their respective files */
  void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd);


@@ -100396,10 +100792,11 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/serial/cpm_uart/cpm_uart.h powerpc.gi
  int cpm_uart_init_portdesc(void);
  int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con);
  void cpm_uart_freebuf(struct uart_cpm_port *pinfo);
  int cpm_uart_init_portdesc(void);
  int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con);
  void cpm_uart_freebuf(struct uart_cpm_port *pinfo);

-diff -x .git -Nur linux-2.6.25-rc9/drivers/serial/cpm_uart/cpm_uart_core.c powerpc.git/drivers/serial/cpm_uart/cpm_uart_core.c
---- linux-2.6.25-rc9/drivers/serial/cpm_uart/cpm_uart_core.c   2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/serial/cpm_uart/cpm_uart_core.c        2008-04-19 16:40:55.000000000 +0200
-@@ -966,24 +966,23 @@
+Index: linux-2.6.25.1/drivers/serial/cpm_uart/cpm_uart_core.c
+===================================================================
+--- linux-2.6.25.1.orig/drivers/serial/cpm_uart/cpm_uart_core.c
++++ linux-2.6.25.1/drivers/serial/cpm_uart/cpm_uart_core.c
+@@ -966,24 +966,23 @@ static int cpm_uart_init_port(struct dev

        if (!mem)
                return -ENOMEM;
  
        if (!mem)
                return -ENOMEM;
  


@@ -100432,7 +100829,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/serial/cpm_uart/cpm_uart_core.c power
        }
  
        pinfo->tx_nrfifos = TX_NUM_FIFO;
        }
  
        pinfo->tx_nrfifos = TX_NUM_FIFO;

-@@ -1007,7 +1006,7 @@
+@@ -1007,7 +1006,7 @@ static int cpm_uart_init_port(struct dev

        return cpm_uart_request_port(&pinfo->port);
  
  out_pram:
        return cpm_uart_request_port(&pinfo->port);
  
  out_pram:


@@ -100441,9 +100838,10 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/serial/cpm_uart/cpm_uart_core.c power
  out_mem:
        iounmap(mem);
        return ret;
  out_mem:
        iounmap(mem);
        return ret;

-diff -x .git -Nur linux-2.6.25-rc9/drivers/serial/cpm_uart/cpm_uart_cpm1.c powerpc.git/drivers/serial/cpm_uart/cpm_uart_cpm1.c
---- linux-2.6.25-rc9/drivers/serial/cpm_uart/cpm_uart_cpm1.c   2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/serial/cpm_uart/cpm_uart_cpm1.c        2008-04-19 16:40:55.000000000 +0200
+Index: linux-2.6.25.1/drivers/serial/cpm_uart/cpm_uart_cpm1.c
+===================================================================
+--- linux-2.6.25.1.orig/drivers/serial/cpm_uart/cpm_uart_cpm1.c
++++ linux-2.6.25.1/drivers/serial/cpm_uart/cpm_uart_cpm1.c

 @@ -45,6 +45,8 @@
  #include <linux/serial_core.h>
  #include <linux/kernel.h>
 @@ -45,6 +45,8 @@
  #include <linux/serial_core.h>
  #include <linux/kernel.h>


@@ -100453,7 +100851,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/serial/cpm_uart/cpm_uart_cpm1.c power
  #include "cpm_uart.h"
  
  /**************************************************************/
  #include "cpm_uart.h"
  
  /**************************************************************/

-@@ -54,6 +56,18 @@
+@@ -54,6 +56,18 @@ void cpm_line_cr_cmd(struct uart_cpm_por

  {
        cpm_command(port->command, cmd);
  }
  {
        cpm_command(port->command, cmd);
  }


@@ -100472,9 +100870,10 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/serial/cpm_uart/cpm_uart_cpm1.c power
  #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 -Nur linux-2.6.25-rc9/drivers/serial/cpm_uart/cpm_uart_cpm2.c powerpc.git/drivers/serial/cpm_uart/cpm_uart_cpm2.c
---- linux-2.6.25-rc9/drivers/serial/cpm_uart/cpm_uart_cpm2.c   2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/serial/cpm_uart/cpm_uart_cpm2.c        2008-04-19 16:40:55.000000000 +0200
+Index: linux-2.6.25.1/drivers/serial/cpm_uart/cpm_uart_cpm2.c
+===================================================================
+--- linux-2.6.25.1.orig/drivers/serial/cpm_uart/cpm_uart_cpm2.c
++++ linux-2.6.25.1/drivers/serial/cpm_uart/cpm_uart_cpm2.c

 @@ -41,6 +41,9 @@
  #include <asm/io.h>
  #include <asm/irq.h>
 @@ -41,6 +41,9 @@
  #include <asm/io.h>
  #include <asm/irq.h>


@@ -100485,7 +100884,7 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/serial/cpm_uart/cpm_uart_cpm2.c power
  
  #include <linux/serial_core.h>
  #include <linux/kernel.h>
  
  #include <linux/serial_core.h>
  #include <linux/kernel.h>

-@@ -54,6 +57,55 @@
+@@ -54,6 +57,55 @@ void cpm_line_cr_cmd(struct uart_cpm_por

  {
        cpm_command(port->command, cmd);
  }
  {
        cpm_command(port->command, cmd);
  }


@@ -100541,10 +100940,11 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/serial/cpm_uart/cpm_uart_cpm2.c power
  #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 -Nur linux-2.6.25-rc9/drivers/serial/of_serial.c powerpc.git/drivers/serial/of_serial.c
---- linux-2.6.25-rc9/drivers/serial/of_serial.c        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/serial/of_serial.c     2008-04-19 16:40:55.000000000 +0200
-@@ -56,7 +56,9 @@
+Index: linux-2.6.25.1/drivers/serial/of_serial.c
+===================================================================
+--- linux-2.6.25.1.orig/drivers/serial/of_serial.c
++++ linux-2.6.25.1/drivers/serial/of_serial.c
+@@ -56,7 +56,9 @@ static int __devinit of_platform_serial_

        port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP
                | UPF_FIXED_PORT;
        port->dev = &ofdev->dev;
        port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP
                | UPF_FIXED_PORT;
        port->dev = &ofdev->dev;


@@ -100555,10 +100955,11 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/serial/of_serial.c powerpc.git/driver
  
        return 0;
  }
  
        return 0;
  }

-diff -x .git -Nur linux-2.6.25-rc9/drivers/serial/ucc_uart.c powerpc.git/drivers/serial/ucc_uart.c
---- linux-2.6.25-rc9/drivers/serial/ucc_uart.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/serial/ucc_uart.c      2008-04-19 16:40:55.000000000 +0200
-@@ -1270,10 +1270,18 @@
+Index: linux-2.6.25.1/drivers/serial/ucc_uart.c
+===================================================================
+--- linux-2.6.25.1.orig/drivers/serial/ucc_uart.c
++++ linux-2.6.25.1/drivers/serial/ucc_uart.c
+@@ -1270,10 +1270,18 @@ static int ucc_uart_probe(struct of_devi

  
        /* Get the UCC number (device ID) */
        /* UCCs are numbered 1-7 */
  
        /* Get the UCC number (device ID) */
        /* UCCs are numbered 1-7 */


@@ -100581,9 +100982,10 @@ diff -x .git -Nur linux-2.6.25-rc9/drivers/serial/ucc_uart.c powerpc.git/drivers
                kfree(qe_port);
                return -ENODEV;
        }
                kfree(qe_port);
                return -ENODEV;
        }

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/Kbuild powerpc.git/include/asm-powerpc/Kbuild
---- linux-2.6.25-rc9/include/asm-powerpc/Kbuild        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/Kbuild     2008-04-19 16:40:57.000000000 +0200
+Index: linux-2.6.25.1/include/asm-powerpc/Kbuild
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/Kbuild
++++ linux-2.6.25.1/include/asm-powerpc/Kbuild

 @@ -1,5 +1,6 @@
  include include/asm-generic/Kbuild.asm
  
 @@ -1,5 +1,6 @@
  include include/asm-generic/Kbuild.asm
  


@@ -100591,7 +100993,7 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/Kbuild powerpc.git/includ
  header-y += auxvec.h
  header-y += ioctls.h
  header-y += mman.h
  header-y += auxvec.h
  header-y += ioctls.h
  header-y += mman.h

-@@ -23,7 +24,6 @@
+@@ -23,7 +24,6 @@ header-y += sigcontext.h

  header-y += statfs.h
  header-y += ps3fb.h
  
  header-y += statfs.h
  header-y += ps3fb.h
  


@@ -100599,9 +101001,10 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/Kbuild powerpc.git/includ
  unifdef-y += asm-compat.h
  unifdef-y += bootx.h
  unifdef-y += byteorder.h
  unifdef-y += asm-compat.h
  unifdef-y += bootx.h
  unifdef-y += byteorder.h

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/abs_addr.h powerpc.git/include/asm-powerpc/abs_addr.h
---- linux-2.6.25-rc9/include/asm-powerpc/abs_addr.h    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/abs_addr.h 2008-03-17 14:04:35.000000000 +0100
+Index: linux-2.6.25.1/include/asm-powerpc/abs_addr.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/abs_addr.h
++++ linux-2.6.25.1/include/asm-powerpc/abs_addr.h

 @@ -12,10 +12,11 @@
   * 2 of the License, or (at your option) any later version.
   */
 @@ -12,10 +12,11 @@
   * 2 of the License, or (at your option) any later version.
   */


@@ -100615,10 +101018,11 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/abs_addr.h powerpc.git/in
  #include <asm/firmware.h>
  
  struct mschunks_map {
  #include <asm/firmware.h>
  
  struct mschunks_map {

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/bitops.h powerpc.git/include/asm-powerpc/bitops.h
---- linux-2.6.25-rc9/include/asm-powerpc/bitops.h      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/bitops.h   2008-04-19 16:40:57.000000000 +0200
-@@ -312,24 +312,26 @@
+Index: linux-2.6.25.1/include/asm-powerpc/bitops.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/bitops.h
++++ linux-2.6.25.1/include/asm-powerpc/bitops.h
+@@ -312,24 +312,26 @@ static __inline__ int fls(unsigned int x

        asm ("cntlzw %0,%1" : "=r" (lz) : "r" (x));
        return 32 - lz;
  }
        asm ("cntlzw %0,%1" : "=r" (lz) : "r" (x));
        return 32 - lz;
  }


@@ -100660,9 +101064,10 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/bitops.h powerpc.git/incl
  
  /* Little-endian versions */
  
  
  /* Little-endian versions */
  

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/cpm.h powerpc.git/include/asm-powerpc/cpm.h
---- linux-2.6.25-rc9/include/asm-powerpc/cpm.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/cpm.h      2008-04-19 16:40:57.000000000 +0200
+Index: linux-2.6.25.1/include/asm-powerpc/cpm.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/cpm.h
++++ linux-2.6.25.1/include/asm-powerpc/cpm.h

 @@ -4,6 +4,20 @@
  #include <linux/compiler.h>
  #include <linux/types.h>
 @@ -4,6 +4,20 @@
  #include <linux/compiler.h>
  #include <linux/types.h>


@@ -100684,9 +101089,10 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/cpm.h powerpc.git/include
  /* Buffer descriptors used by many of the CPM protocols. */
  typedef struct cpm_buf_desc {
        ushort  cbd_sc;         /* Status and Control */
  /* Buffer descriptors used by many of the CPM protocols. */
  typedef struct cpm_buf_desc {
        ushort  cbd_sc;         /* Status and Control */

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/cpm1.h powerpc.git/include/asm-powerpc/cpm1.h
---- linux-2.6.25-rc9/include/asm-powerpc/cpm1.h        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/cpm1.h     2008-04-19 16:40:57.000000000 +0200
+Index: linux-2.6.25.1/include/asm-powerpc/cpm1.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/cpm1.h
++++ linux-2.6.25.1/include/asm-powerpc/cpm1.h

 @@ -28,19 +28,6 @@
  #define CPM_CR_CHAN   ((ushort)0x00f0)
  #define CPM_CR_FLG    ((ushort)0x0001)
 @@ -28,19 +28,6 @@
  #define CPM_CR_CHAN   ((ushort)0x00f0)
  #define CPM_CR_FLG    ((ushort)0x0001)


@@ -100707,9 +101113,10 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/cpm1.h powerpc.git/includ
  /* Channel numbers.
  */
  #define CPM_CR_CH_SCC1                ((ushort)0x0000)
  /* Channel numbers.
  */
  #define CPM_CR_CH_SCC1                ((ushort)0x0000)

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/cpm2.h powerpc.git/include/asm-powerpc/cpm2.h
---- linux-2.6.25-rc9/include/asm-powerpc/cpm2.h        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/cpm2.h     2008-04-19 16:40:57.000000000 +0200
+Index: linux-2.6.25.1/include/asm-powerpc/cpm2.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/cpm2.h
++++ linux-2.6.25.1/include/asm-powerpc/cpm2.h

 @@ -71,18 +71,9 @@
  
  #define CPM_CR_FCC_PAGE(x)    (x + 0x04)
 @@ -71,18 +71,9 @@
  
  #define CPM_CR_FCC_PAGE(x)    (x + 0x04)


@@ -100730,10 +101137,11 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/cpm2.h powerpc.git/includ
  
  #define mk_cr_cmd(PG, SBC, MCN, OP) \
        ((PG << 26) | (SBC << 21) | (MCN << 6) | OP)
  
  #define mk_cr_cmd(PG, SBC, MCN, OP) \
        ((PG << 26) | (SBC << 21) | (MCN << 6) | OP)

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/cputhreads.h powerpc.git/include/asm-powerpc/cputhreads.h
---- linux-2.6.25-rc9/include/asm-powerpc/cputhreads.h  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/cputhreads.h       2008-03-17 14:04:35.000000000 +0100
-@@ -35,7 +35,7 @@
+Index: linux-2.6.25.1/include/asm-powerpc/cputhreads.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/cputhreads.h
++++ linux-2.6.25.1/include/asm-powerpc/cputhreads.h
+@@ -35,7 +35,7 @@ static inline cpumask_t cpu_thread_mask_

  
        res = CPU_MASK_NONE;
        for (i = 0; i < NR_CPUS; i += threads_per_core) {
  
        res = CPU_MASK_NONE;
        for (i = 0; i < NR_CPUS; i += threads_per_core) {


@@ -100742,10 +101150,11 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/cputhreads.h powerpc.git/
                if (cpus_intersects(threads, tmp))
                        cpu_set(i, res);
        }
                if (cpus_intersects(threads, tmp))
                        cpu_set(i, res);
        }

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/dcr-native.h powerpc.git/include/asm-powerpc/dcr-native.h
---- linux-2.6.25-rc9/include/asm-powerpc/dcr-native.h  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/dcr-native.h       2008-04-19 16:40:57.000000000 +0200
-@@ -82,6 +82,19 @@
+Index: linux-2.6.25.1/include/asm-powerpc/dcr-native.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/dcr-native.h
++++ linux-2.6.25.1/include/asm-powerpc/dcr-native.h
+@@ -82,6 +82,19 @@ static inline void __mtdcri(int base_add

        spin_unlock_irqrestore(&dcr_ind_lock, flags);
  }
  
        spin_unlock_irqrestore(&dcr_ind_lock, flags);
  }
  


@@ -100765,7 +101174,7 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/dcr-native.h powerpc.git/
  #define mfdcri(base, reg)     __mfdcri(DCRN_ ## base ## _CONFIG_ADDR, \
                                         DCRN_ ## base ## _CONFIG_DATA, \
                                         reg)
  #define mfdcri(base, reg)     __mfdcri(DCRN_ ## base ## _CONFIG_ADDR, \
                                         DCRN_ ## base ## _CONFIG_DATA, \
                                         reg)

-@@ -90,6 +103,10 @@
+@@ -90,6 +103,10 @@ static inline void __mtdcri(int base_add

                                         DCRN_ ## base ## _CONFIG_DATA, \
                                         reg, data)
  
                                         DCRN_ ## base ## _CONFIG_DATA, \
                                         reg, data)
  


@@ -100776,9 +101185,10 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/dcr-native.h powerpc.git/
  #endif /* __ASSEMBLY__ */
  #endif /* __KERNEL__ */
  #endif /* _ASM_POWERPC_DCR_NATIVE_H */
  #endif /* __ASSEMBLY__ */
  #endif /* __KERNEL__ */
  #endif /* _ASM_POWERPC_DCR_NATIVE_H */

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/dcr-regs.h powerpc.git/include/asm-powerpc/dcr-regs.h
---- linux-2.6.25-rc9/include/asm-powerpc/dcr-regs.h    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/dcr-regs.h 2008-04-19 16:40:57.000000000 +0200
+Index: linux-2.6.25.1/include/asm-powerpc/dcr-regs.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/dcr-regs.h
++++ linux-2.6.25.1/include/asm-powerpc/dcr-regs.h

 @@ -68,4 +68,82 @@
  #define SDR0_UART3            0x0123
  #define SDR0_CUST0            0x4000
 @@ -68,4 +68,82 @@
  #define SDR0_UART3            0x0123
  #define SDR0_CUST0            0x4000


@@ -100862,10 +101272,11 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/dcr-regs.h powerpc.git/in
 +#define  L2C_SNP_ESR          0x00000800
 +
  #endif /* __DCR_REGS_H__ */
 +#define  L2C_SNP_ESR          0x00000800
 +
  #endif /* __DCR_REGS_H__ */

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/exception.h powerpc.git/include/asm-powerpc/exception.h
---- linux-2.6.25-rc9/include/asm-powerpc/exception.h   2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/exception.h        2008-04-19 16:40:57.000000000 +0200
-@@ -228,18 +228,18 @@
+Index: linux-2.6.25.1/include/asm-powerpc/exception.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/exception.h
++++ linux-2.6.25.1/include/asm-powerpc/exception.h
+@@ -228,18 +228,18 @@ label##_pSeries:                                                 \

  BEGIN_FW_FTR_SECTION;                         \
        stb     r11,PACAHARDIRQEN(r13);         \
  END_FW_FTR_SECTION_IFCLR(FW_FEATURE_ISERIES); \
  BEGIN_FW_FTR_SECTION;                         \
        stb     r11,PACAHARDIRQEN(r13);         \
  END_FW_FTR_SECTION_IFCLR(FW_FEATURE_ISERIES); \


@@ -100887,9 +101298,10 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/exception.h powerpc.git/i
  #endif /* CONFIG_PPC_ISERIES */
  
  #define ENABLE_INTS                           \
  #endif /* CONFIG_PPC_ISERIES */
  
  #define ENABLE_INTS                           \

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/fsl_lbc.h powerpc.git/include/asm-powerpc/fsl_lbc.h
---- linux-2.6.25-rc9/include/asm-powerpc/fsl_lbc.h     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/fsl_lbc.h  2008-04-19 16:40:57.000000000 +0200
+Index: linux-2.6.25.1/include/asm-powerpc/fsl_lbc.h
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/include/asm-powerpc/fsl_lbc.h

 @@ -0,0 +1,311 @@
 +/* Freescale Local Bus Controller
 + *
 @@ -0,0 +1,311 @@
 +/* Freescale Local Bus Controller
 + *


@@ -101202,9 +101614,10 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/fsl_lbc.h powerpc.git/inc
 +}
 +
 +#endif /* __ASM_FSL_LBC_H */
 +}
 +
 +#endif /* __ASM_FSL_LBC_H */

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/gpio.h powerpc.git/include/asm-powerpc/gpio.h
---- linux-2.6.25-rc9/include/asm-powerpc/gpio.h        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/gpio.h     2008-04-19 16:40:57.000000000 +0200
+Index: linux-2.6.25.1/include/asm-powerpc/gpio.h
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/include/asm-powerpc/gpio.h

 @@ -0,0 +1,56 @@
 +/*
 + * Generic GPIO API implementation for PowerPC.
 @@ -0,0 +1,56 @@
 +/*
 + * Generic GPIO API implementation for PowerPC.


@@ -101262,10 +101675,11 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/gpio.h powerpc.git/includ
 +#endif /* CONFIG_HAVE_GPIO_LIB */
 +
 +#endif /* __ASM_POWERPC_GPIO_H */
 +#endif /* CONFIG_HAVE_GPIO_LIB */
 +
 +#endif /* __ASM_POWERPC_GPIO_H */

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/hw_irq.h powerpc.git/include/asm-powerpc/hw_irq.h
---- linux-2.6.25-rc9/include/asm-powerpc/hw_irq.h      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/hw_irq.h   2008-04-19 16:40:57.000000000 +0200
-@@ -27,7 +27,7 @@
+Index: linux-2.6.25.1/include/asm-powerpc/hw_irq.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/hw_irq.h
++++ linux-2.6.25.1/include/asm-powerpc/hw_irq.h
+@@ -27,7 +27,7 @@ static inline unsigned long local_get_fl

        return flags;
  }
  
        return flags;
  }
  


@@ -101274,7 +101688,7 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/hw_irq.h powerpc.git/incl
  {
        unsigned long flags, zero;
  
  {
        unsigned long flags, zero;
  

-@@ -39,14 +39,15 @@
+@@ -39,14 +39,15 @@ static inline unsigned long local_irq_di

        return flags;
  }
  
        return flags;
  }
  


@@ -101295,9 +101709,10 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/hw_irq.h powerpc.git/incl
  
  #define __hard_irq_enable()   __mtmsrd(mfmsr() | MSR_EE, 1)
  #define __hard_irq_disable()  __mtmsrd(mfmsr() & ~MSR_EE, 1)
  
  #define __hard_irq_enable()   __mtmsrd(mfmsr() | MSR_EE, 1)
  #define __hard_irq_disable()  __mtmsrd(mfmsr() & ~MSR_EE, 1)

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/immap_qe.h powerpc.git/include/asm-powerpc/immap_qe.h
---- linux-2.6.25-rc9/include/asm-powerpc/immap_qe.h    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/immap_qe.h 2008-04-19 16:40:57.000000000 +0200
+Index: linux-2.6.25.1/include/asm-powerpc/immap_qe.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/immap_qe.h
++++ linux-2.6.25.1/include/asm-powerpc/immap_qe.h

 @@ -20,6 +20,7 @@
  #ifdef __KERNEL__
  
 @@ -20,6 +20,7 @@
  #ifdef __KERNEL__
  


@@ -101306,7 +101721,7 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/immap_qe.h powerpc.git/in
  
  #define QE_IMMAP_SIZE (1024 * 1024)   /* 1MB from 1MB+IMMR */
  
  
  #define QE_IMMAP_SIZE (1024 * 1024)   /* 1MB from 1MB+IMMR */
  

-@@ -468,7 +469,7 @@
+@@ -468,7 +469,7 @@ struct qe_immap {

        u8                      res18[0xC0000]; /* 0x140000 - 0x200000 */
  } __attribute__ ((packed));
  
        u8                      res18[0xC0000]; /* 0x140000 - 0x200000 */
  } __attribute__ ((packed));
  


@@ -101315,9 +101730,10 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/immap_qe.h powerpc.git/in
  extern phys_addr_t get_qe_base(void);
  
  static inline unsigned long immrbar_virt_to_phys(void *address)
  extern phys_addr_t get_qe_base(void);
  
  static inline unsigned long immrbar_virt_to_phys(void *address)

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/irqflags.h powerpc.git/include/asm-powerpc/irqflags.h
---- linux-2.6.25-rc9/include/asm-powerpc/irqflags.h    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/irqflags.h 2008-04-19 16:40:57.000000000 +0200
+Index: linux-2.6.25.1/include/asm-powerpc/irqflags.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/irqflags.h
++++ linux-2.6.25.1/include/asm-powerpc/irqflags.h

 @@ -2,30 +2,43 @@
   * include/asm-powerpc/irqflags.h
   *
 @@ -2,30 +2,43 @@
   * include/asm-powerpc/irqflags.h
   *


@@ -101374,9 +101790,10 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/irqflags.h powerpc.git/in
  #endif
  
  #endif
  #endif
  
  #endif

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/iseries/alpaca.h powerpc.git/include/asm-powerpc/iseries/alpaca.h
---- linux-2.6.25-rc9/include/asm-powerpc/iseries/alpaca.h      1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/iseries/alpaca.h   2008-04-19 16:40:57.000000000 +0200
+Index: linux-2.6.25.1/include/asm-powerpc/iseries/alpaca.h
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/include/asm-powerpc/iseries/alpaca.h

 @@ -0,0 +1,31 @@
 +/*
 + * Copyright © 2008  Stephen Rothwell IBM Corporation
 @@ -0,0 +1,31 @@
 +/*
 + * Copyright © 2008  Stephen Rothwell IBM Corporation


@@ -101409,9 +101826,10 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/iseries/alpaca.h powerpc.
 +};
 +
 +#endif /* _ASM_POWERPC_ISERIES_ALPACA_H */
 +};
 +
 +#endif /* _ASM_POWERPC_ISERIES_ALPACA_H */

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/iseries/it_lp_reg_save.h powerpc.git/include/asm-powerpc/iseries/it_lp_reg_save.h
---- linux-2.6.25-rc9/include/asm-powerpc/iseries/it_lp_reg_save.h      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/iseries/it_lp_reg_save.h   1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.6.25.1/include/asm-powerpc/iseries/it_lp_reg_save.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/iseries/it_lp_reg_save.h
++++ /dev/null

 @@ -1,85 +0,0 @@
 -/*
 - * Copyright (C) 2001  Mike Corrigan IBM Corporation
 @@ -1,85 +0,0 @@
 -/*
 - * Copyright (C) 2001  Mike Corrigan IBM Corporation


@@ -101498,9 +101916,10 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/iseries/it_lp_reg_save.h
 -extern struct ItLpRegSave iseries_reg_save[];
 -
 -#endif /* _ASM_POWERPC_ISERIES_IT_LP_REG_SAVE_H */
 -extern struct ItLpRegSave iseries_reg_save[];
 -
 -#endif /* _ASM_POWERPC_ISERIES_IT_LP_REG_SAVE_H */

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/lmb.h powerpc.git/include/asm-powerpc/lmb.h
---- linux-2.6.25-rc9/include/asm-powerpc/lmb.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/lmb.h      2008-04-19 16:40:57.000000000 +0200
+Index: linux-2.6.25.1/include/asm-powerpc/lmb.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/lmb.h
++++ linux-2.6.25.1/include/asm-powerpc/lmb.h

 @@ -1,81 +1,15 @@
  #ifndef _ASM_POWERPC_LMB_H
  #define _ASM_POWERPC_LMB_H
 @@ -1,81 +1,15 @@
  #ifndef _ASM_POWERPC_LMB_H
  #define _ASM_POWERPC_LMB_H


@@ -101591,10 +102010,11 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/lmb.h powerpc.git/include
 -
 -#endif /* __KERNEL__ */
  #endif /* _ASM_POWERPC_LMB_H */
 -
 -#endif /* __KERNEL__ */
  #endif /* _ASM_POWERPC_LMB_H */

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/machdep.h powerpc.git/include/asm-powerpc/machdep.h
---- linux-2.6.25-rc9/include/asm-powerpc/machdep.h     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/machdep.h  2008-04-19 16:40:57.000000000 +0200
-@@ -68,6 +68,8 @@
+Index: linux-2.6.25.1/include/asm-powerpc/machdep.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/machdep.h
++++ linux-2.6.25.1/include/asm-powerpc/machdep.h
+@@ -68,6 +68,8 @@ struct machdep_calls {

                                       unsigned long vflags,
                                       int psize, int ssize);
        long            (*hpte_remove)(unsigned long hpte_group);
                                       unsigned long vflags,
                                       int psize, int ssize);
        long            (*hpte_remove)(unsigned long hpte_group);


@@ -101603,7 +102023,7 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/machdep.h powerpc.git/inc
        void            (*flush_hash_range)(unsigned long number, int local);
  
        /* special for kexec, to be called in real mode, linar mapping is
        void            (*flush_hash_range)(unsigned long number, int local);
  
        /* special for kexec, to be called in real mode, linar mapping is

-@@ -196,9 +198,6 @@
+@@ -196,9 +198,6 @@ struct machdep_calls {

           May be NULL. */
        void            (*init)(void);
  
           May be NULL. */
        void            (*init)(void);
  


@@ -101613,9 +102033,10 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/machdep.h powerpc.git/inc
        void            (*kgdb_map_scc)(void);
  
        /*
        void            (*kgdb_map_scc)(void);
  
        /*

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/macio.h powerpc.git/include/asm-powerpc/macio.h
---- linux-2.6.25-rc9/include/asm-powerpc/macio.h       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/macio.h    2008-04-19 16:40:57.000000000 +0200
+Index: linux-2.6.25.1/include/asm-powerpc/macio.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/macio.h
++++ linux-2.6.25.1/include/asm-powerpc/macio.h

 @@ -2,7 +2,7 @@
  #define __MACIO_ASIC_H__
  #ifdef __KERNEL__
 @@ -2,7 +2,7 @@
  #define __MACIO_ASIC_H__
  #ifdef __KERNEL__


@@ -101625,9 +102046,10 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/macio.h powerpc.git/inclu
  
  extern struct bus_type macio_bus_type;
  
  
  extern struct bus_type macio_bus_type;
  

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/mmu-40x.h powerpc.git/include/asm-powerpc/mmu-40x.h
---- linux-2.6.25-rc9/include/asm-powerpc/mmu-40x.h     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/mmu-40x.h  2008-04-19 16:40:57.000000000 +0200
+Index: linux-2.6.25.1/include/asm-powerpc/mmu-40x.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/mmu-40x.h
++++ linux-2.6.25.1/include/asm-powerpc/mmu-40x.h

 @@ -53,8 +53,6 @@
  
  #ifndef __ASSEMBLY__
 @@ -53,8 +53,6 @@
  
  #ifndef __ASSEMBLY__


@@ -101637,9 +102059,10 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/mmu-40x.h powerpc.git/inc
  typedef struct {
        unsigned long id;
        unsigned long vdso_base;
  typedef struct {
        unsigned long id;
        unsigned long vdso_base;

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/mmu-44x.h powerpc.git/include/asm-powerpc/mmu-44x.h
---- linux-2.6.25-rc9/include/asm-powerpc/mmu-44x.h     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/mmu-44x.h  2008-04-19 16:40:57.000000000 +0200
+Index: linux-2.6.25.1/include/asm-powerpc/mmu-44x.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/mmu-44x.h
++++ linux-2.6.25.1/include/asm-powerpc/mmu-44x.h

 @@ -53,8 +53,6 @@
  
  #ifndef __ASSEMBLY__
 @@ -53,8 +53,6 @@
  
  #ifndef __ASSEMBLY__


@@ -101649,9 +102072,10 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/mmu-44x.h powerpc.git/inc
  typedef struct {
        unsigned long id;
        unsigned long vdso_base;
  typedef struct {
        unsigned long id;
        unsigned long vdso_base;

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/mmu-8xx.h powerpc.git/include/asm-powerpc/mmu-8xx.h
---- linux-2.6.25-rc9/include/asm-powerpc/mmu-8xx.h     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/mmu-8xx.h  2008-04-19 16:40:57.000000000 +0200
+Index: linux-2.6.25.1/include/asm-powerpc/mmu-8xx.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/mmu-8xx.h
++++ linux-2.6.25.1/include/asm-powerpc/mmu-8xx.h

 @@ -136,8 +136,6 @@
  #define SPRN_M_TW     799
  
 @@ -136,8 +136,6 @@
  #define SPRN_M_TW     799
  


@@ -101661,9 +102085,10 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/mmu-8xx.h powerpc.git/inc
  typedef struct {
        unsigned long id;
        unsigned long vdso_base;
  typedef struct {
        unsigned long id;
        unsigned long vdso_base;

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/mmu-fsl-booke.h powerpc.git/include/asm-powerpc/mmu-fsl-booke.h
---- linux-2.6.25-rc9/include/asm-powerpc/mmu-fsl-booke.h       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/mmu-fsl-booke.h    2008-04-19 16:40:57.000000000 +0200
+Index: linux-2.6.25.1/include/asm-powerpc/mmu-fsl-booke.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/mmu-fsl-booke.h
++++ linux-2.6.25.1/include/asm-powerpc/mmu-fsl-booke.h

 @@ -73,12 +73,6 @@
  
  #ifndef __ASSEMBLY__
 @@ -73,12 +73,6 @@
  
  #ifndef __ASSEMBLY__


@@ -101677,10 +102102,11 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/mmu-fsl-booke.h powerpc.g
  typedef struct {
        unsigned long id;
        unsigned long vdso_base;
  typedef struct {
        unsigned long id;
        unsigned long vdso_base;

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/mmu-hash32.h powerpc.git/include/asm-powerpc/mmu-hash32.h
---- linux-2.6.25-rc9/include/asm-powerpc/mmu-hash32.h  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/mmu-hash32.h       2008-04-19 16:40:57.000000000 +0200
-@@ -84,8 +84,6 @@
+Index: linux-2.6.25.1/include/asm-powerpc/mmu-hash32.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/mmu-hash32.h
++++ linux-2.6.25.1/include/asm-powerpc/mmu-hash32.h
+@@ -84,8 +84,6 @@ typedef struct {

        unsigned long vdso_base;
  } mm_context_t;
  
        unsigned long vdso_base;
  } mm_context_t;
  


@@ -101689,10 +102115,11 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/mmu-hash32.h powerpc.git/
  #endif /* !__ASSEMBLY__ */
  
  #endif /* _ASM_POWERPC_MMU_HASH32_H_ */
  #endif /* !__ASSEMBLY__ */
  
  #endif /* _ASM_POWERPC_MMU_HASH32_H_ */

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/mmu-hash64.h powerpc.git/include/asm-powerpc/mmu-hash64.h
---- linux-2.6.25-rc9/include/asm-powerpc/mmu-hash64.h  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/mmu-hash64.h       2008-04-19 16:40:57.000000000 +0200
-@@ -469,9 +469,6 @@
+Index: linux-2.6.25.1/include/asm-powerpc/mmu-hash64.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/mmu-hash64.h
++++ linux-2.6.25.1/include/asm-powerpc/mmu-hash64.h
+@@ -469,9 +469,6 @@ static inline unsigned long get_vsid(uns

                                 VSID_MODULUS_256M)
  #define KERNEL_VSID(ea)               VSID_SCRAMBLE(GET_ESID(ea))
  
                                 VSID_MODULUS_256M)
  #define KERNEL_VSID(ea)               VSID_SCRAMBLE(GET_ESID(ea))
  


@@ -101702,10 +102129,11 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/mmu-hash64.h powerpc.git/
  #endif /* __ASSEMBLY__ */
  
  #endif /* _ASM_POWERPC_MMU_HASH64_H_ */
  #endif /* __ASSEMBLY__ */
  
  #endif /* _ASM_POWERPC_MMU_HASH64_H_ */

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/paca.h powerpc.git/include/asm-powerpc/paca.h
---- linux-2.6.25-rc9/include/asm-powerpc/paca.h        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/paca.h     2008-04-19 16:40:57.000000000 +0200
-@@ -42,10 +42,7 @@
+Index: linux-2.6.25.1/include/asm-powerpc/paca.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/paca.h
++++ linux-2.6.25.1/include/asm-powerpc/paca.h
+@@ -42,10 +42,7 @@ struct task_struct;

   * Defines the layout of the paca.
   *
   * This structure is not directly accessed by firmware or the service
   * Defines the layout of the paca.
   *
   * This structure is not directly accessed by firmware or the service


@@ -101717,7 +102145,7 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/paca.h powerpc.git/includ
   */
  struct paca_struct {
        /*
   */
  struct paca_struct {
        /*

-@@ -55,14 +52,7 @@
+@@ -55,14 +52,7 @@ struct paca_struct {

         * avoid cacheline bouncing.
         */
  
         * avoid cacheline bouncing.
         */
  


@@ -101732,9 +102160,10 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/paca.h powerpc.git/includ
  
        /*
         * MAGIC: the spinlock functions in arch/powerpc/lib/locks.c 
  
        /*
         * MAGIC: the spinlock functions in arch/powerpc/lib/locks.c 

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/page.h powerpc.git/include/asm-powerpc/page.h
---- linux-2.6.25-rc9/include/asm-powerpc/page.h        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/page.h     2008-04-19 16:40:57.000000000 +0200
+Index: linux-2.6.25.1/include/asm-powerpc/page.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/page.h
++++ linux-2.6.25.1/include/asm-powerpc/page.h

 @@ -53,6 +53,7 @@
  
  #define PAGE_OFFSET     ASM_CONST(CONFIG_KERNEL_START)
 @@ -53,6 +53,7 @@
  
  #define PAGE_OFFSET     ASM_CONST(CONFIG_KERNEL_START)


@@ -101743,9 +102172,10 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/page.h powerpc.git/includ
  
  #ifdef CONFIG_FLATMEM
  #define pfn_valid(pfn)                ((pfn) < max_mapnr)
  
  #ifdef CONFIG_FLATMEM
  #define pfn_valid(pfn)                ((pfn) < max_mapnr)

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/page_32.h powerpc.git/include/asm-powerpc/page_32.h
---- linux-2.6.25-rc9/include/asm-powerpc/page_32.h     2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/page_32.h  2008-04-19 16:40:57.000000000 +0200
+Index: linux-2.6.25.1/include/asm-powerpc/page_32.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/page_32.h
++++ linux-2.6.25.1/include/asm-powerpc/page_32.h

 @@ -3,8 +3,6 @@
  
  #define VM_DATA_DEFAULT_FLAGS VM_DATA_DEFAULT_FLAGS32
 @@ -3,8 +3,6 @@
  
  #define VM_DATA_DEFAULT_FLAGS VM_DATA_DEFAULT_FLAGS32


@@ -101755,9 +102185,10 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/page_32.h powerpc.git/inc
  #ifdef CONFIG_NOT_COHERENT_CACHE
  #define ARCH_KMALLOC_MINALIGN L1_CACHE_BYTES
  #endif
  #ifdef CONFIG_NOT_COHERENT_CACHE
  #define ARCH_KMALLOC_MINALIGN L1_CACHE_BYTES
  #endif

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/pasemi_dma.h powerpc.git/include/asm-powerpc/pasemi_dma.h
---- linux-2.6.25-rc9/include/asm-powerpc/pasemi_dma.h  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/pasemi_dma.h       2008-03-17 14:04:35.000000000 +0100
+Index: linux-2.6.25.1/include/asm-powerpc/pasemi_dma.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/pasemi_dma.h
++++ linux-2.6.25.1/include/asm-powerpc/pasemi_dma.h

 @@ -1,5 +1,5 @@
  /*
 - * Copyright (C) 2006 PA Semi, Inc
 @@ -1,5 +1,5 @@
  /*
 - * Copyright (C) 2006 PA Semi, Inc


@@ -101765,7 +102196,7 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/pasemi_dma.h powerpc.git/
   *
   * Hardware register layout and descriptor formats for the on-board
   * DMA engine on PA Semi PWRficient. Used by ethernet, function and security
   *
   * Hardware register layout and descriptor formats for the on-board
   * DMA engine on PA Semi PWRficient. Used by ethernet, function and security

-@@ -40,6 +40,11 @@
+@@ -40,6 +40,11 @@ enum {

        PAS_DMA_COM_TXSTA = 0x104,      /* Transmit Status Register   */
        PAS_DMA_COM_RXCMD = 0x108,      /* Receive Command Register   */
        PAS_DMA_COM_RXSTA = 0x10c,      /* Receive Status Register    */
        PAS_DMA_COM_TXSTA = 0x104,      /* Transmit Status Register   */
        PAS_DMA_COM_RXCMD = 0x108,      /* Receive Command Register   */
        PAS_DMA_COM_RXSTA = 0x10c,      /* Receive Status Register    */


@@ -101777,7 +102208,7 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/pasemi_dma.h powerpc.git/
  };
  
  
  };
  
  

-@@ -123,11 +128,16 @@
+@@ -123,11 +128,16 @@ enum {

  #define    PAS_DMA_TXCHAN_TCMDSTA_DA  0x00000100
  #define PAS_DMA_TXCHAN_CFG(c)     (0x304+(c)*_PAS_DMA_TXCHAN_STRIDE)
  #define    PAS_DMA_TXCHAN_CFG_TY_IFACE        0x00000000      /* Type = interface */
  #define    PAS_DMA_TXCHAN_TCMDSTA_DA  0x00000100
  #define PAS_DMA_TXCHAN_CFG(c)     (0x304+(c)*_PAS_DMA_TXCHAN_STRIDE)
  #define    PAS_DMA_TXCHAN_CFG_TY_IFACE        0x00000000      /* Type = interface */


@@ -101795,7 +102226,7 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/pasemi_dma.h powerpc.git/
  #define    PAS_DMA_TXCHAN_CFG_WT_S    6
  #define    PAS_DMA_TXCHAN_CFG_WT(x)   (((x) << PAS_DMA_TXCHAN_CFG_WT_S) & \
                                         PAS_DMA_TXCHAN_CFG_WT_M)
  #define    PAS_DMA_TXCHAN_CFG_WT_S    6
  #define    PAS_DMA_TXCHAN_CFG_WT(x)   (((x) << PAS_DMA_TXCHAN_CFG_WT_S) & \
                                         PAS_DMA_TXCHAN_CFG_WT_M)

-@@ -394,11 +404,62 @@
+@@ -394,11 +404,62 @@ enum {

                                 XCT_COPY_LLEN_M)
  #define XCT_COPY_SE           0x0000000000000001ull
  
                                 XCT_COPY_LLEN_M)
  #define XCT_COPY_SE           0x0000000000000001ull
  


@@ -101859,7 +102290,7 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/pasemi_dma.h powerpc.git/
  #define CTRL_CMD_REG_S                0
  #define CTRL_CMD_REG(x)               ((((long)(x)) << CTRL_CMD_REG_S) & \
                                 CTRL_CMD_REG_M)
  #define CTRL_CMD_REG_S                0
  #define CTRL_CMD_REG(x)               ((((long)(x)) << CTRL_CMD_REG_S) & \
                                 CTRL_CMD_REG_M)

-@@ -461,6 +522,16 @@
+@@ -461,6 +522,16 @@ extern void *pasemi_dma_alloc_buf(struct

  extern void pasemi_dma_free_buf(struct pasemi_dmachan *chan, int size,
                                dma_addr_t *handle);
  
  extern void pasemi_dma_free_buf(struct pasemi_dmachan *chan, int size,
                                dma_addr_t *handle);
  


@@ -101876,10 +102307,11 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/pasemi_dma.h powerpc.git/
  /* Initialize the library, must be called before any other functions */
  extern int pasemi_dma_init(void);
  
  /* Initialize the library, must be called before any other functions */
  extern int pasemi_dma_init(void);
  

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/pci-bridge.h powerpc.git/include/asm-powerpc/pci-bridge.h
---- linux-2.6.25-rc9/include/asm-powerpc/pci-bridge.h  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/pci-bridge.h       2008-04-19 16:40:57.000000000 +0200
-@@ -117,7 +117,7 @@
+Index: linux-2.6.25.1/include/asm-powerpc/pci-bridge.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/pci-bridge.h
++++ linux-2.6.25.1/include/asm-powerpc/pci-bridge.h
+@@ -117,7 +117,7 @@ struct pci_controller {

  
  #ifndef CONFIG_PPC64
  
  
  #ifndef CONFIG_PPC64
  


@@ -101888,7 +102320,7 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/pci-bridge.h powerpc.git/
  {
        return bus->sysdata;
  }
  {
        return bus->sysdata;
  }

-@@ -235,7 +235,7 @@
+@@ -235,7 +235,7 @@ extern void pcibios_fixup_new_pci_device

  
  extern int pcibios_remove_root_bus(struct pci_controller *phb);
  
  
  extern int pcibios_remove_root_bus(struct pci_controller *phb);
  


@@ -101897,10 +102329,11 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/pci-bridge.h powerpc.git/
  {
        struct device_node *busdn = bus->sysdata;
  
  {
        struct device_node *busdn = bus->sysdata;
  

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/pgtable-ppc32.h powerpc.git/include/asm-powerpc/pgtable-ppc32.h
---- linux-2.6.25-rc9/include/asm-powerpc/pgtable-ppc32.h       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/pgtable-ppc32.h    2008-04-19 16:40:57.000000000 +0200
-@@ -98,9 +98,6 @@
+Index: linux-2.6.25.1/include/asm-powerpc/pgtable-ppc32.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/pgtable-ppc32.h
++++ linux-2.6.25.1/include/asm-powerpc/pgtable-ppc32.h
+@@ -98,9 +98,6 @@ extern int icache_44x_need_flush;

  #define USER_PTRS_PER_PGD     (TASK_SIZE / PGDIR_SIZE)
  #define FIRST_USER_ADDRESS    0
  
  #define USER_PTRS_PER_PGD     (TASK_SIZE / PGDIR_SIZE)
  #define FIRST_USER_ADDRESS    0
  


@@ -101910,7 +102343,7 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/pgtable-ppc32.h powerpc.g
  #define pte_ERROR(e) \
        printk("%s:%d: bad pte %llx.\n", __FILE__, __LINE__, \
                (unsigned long long)pte_val(e))
  #define pte_ERROR(e) \
        printk("%s:%d: bad pte %llx.\n", __FILE__, __LINE__, \
                (unsigned long long)pte_val(e))

-@@ -420,7 +417,8 @@
+@@ -420,7 +417,8 @@ extern int icache_44x_need_flush;

  #define _PAGE_IO      (_PAGE_KERNEL | _PAGE_NO_CACHE | _PAGE_GUARDED)
  #define _PAGE_RAM     (_PAGE_KERNEL | _PAGE_HWEXEC)
  
  #define _PAGE_IO      (_PAGE_KERNEL | _PAGE_NO_CACHE | _PAGE_GUARDED)
  #define _PAGE_RAM     (_PAGE_KERNEL | _PAGE_HWEXEC)
  


@@ -101920,7 +102353,7 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/pgtable-ppc32.h powerpc.g
  /* We want the debuggers to be able to set breakpoints anywhere, so
   * don't write protect the kernel text */
  #define _PAGE_RAM_TEXT        _PAGE_RAM
  /* We want the debuggers to be able to set breakpoints anywhere, so
   * don't write protect the kernel text */
  #define _PAGE_RAM_TEXT        _PAGE_RAM

-@@ -692,7 +690,7 @@
+@@ -692,7 +690,7 @@ extern pgprot_t phys_mem_access_prot(str

  #define pmd_page_vaddr(pmd)   \
        ((unsigned long) (pmd_val(pmd) & PAGE_MASK))
  #define pmd_page(pmd)         \
  #define pmd_page_vaddr(pmd)   \
        ((unsigned long) (pmd_val(pmd) & PAGE_MASK))
  #define pmd_page(pmd)         \


@@ -101929,9 +102362,10 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/pgtable-ppc32.h powerpc.g
  #endif
  
  /* to find an entry in a kernel page-table-directory */
  #endif
  
  /* to find an entry in a kernel page-table-directory */

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/phyp_dump.h powerpc.git/include/asm-powerpc/phyp_dump.h
---- linux-2.6.25-rc9/include/asm-powerpc/phyp_dump.h   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/phyp_dump.h        2008-04-19 16:40:57.000000000 +0200
+Index: linux-2.6.25.1/include/asm-powerpc/phyp_dump.h
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/include/asm-powerpc/phyp_dump.h

 @@ -0,0 +1,47 @@
 +/*
 + * Hypervisor-assisted dump
 @@ -0,0 +1,47 @@
 +/*
 + * Hypervisor-assisted dump


@@ -101980,9 +102414,10 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/phyp_dump.h powerpc.git/i
 +
 +#endif /* CONFIG_PHYP_DUMP */
 +#endif /* _PPC64_PHYP_DUMP_H */
 +
 +#endif /* CONFIG_PHYP_DUMP */
 +#endif /* _PPC64_PHYP_DUMP_H */

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/pmi.h powerpc.git/include/asm-powerpc/pmi.h
---- linux-2.6.25-rc9/include/asm-powerpc/pmi.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/pmi.h      2008-04-19 16:40:57.000000000 +0200
+Index: linux-2.6.25.1/include/asm-powerpc/pmi.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/pmi.h
++++ linux-2.6.25.1/include/asm-powerpc/pmi.h

 @@ -29,8 +29,6 @@
  
  #ifdef __KERNEL__
 @@ -29,8 +29,6 @@
  
  #ifdef __KERNEL__


@@ -101992,9 +102427,10 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/pmi.h powerpc.git/include
  #define PMI_TYPE_FREQ_CHANGE  0x01
  #define PMI_READ_TYPE         0
  #define PMI_READ_DATA0                1
  #define PMI_TYPE_FREQ_CHANGE  0x01
  #define PMI_READ_TYPE         0
  #define PMI_READ_DATA0                1

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/ppc4xx.h powerpc.git/include/asm-powerpc/ppc4xx.h
---- linux-2.6.25-rc9/include/asm-powerpc/ppc4xx.h      1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/ppc4xx.h   2008-04-19 16:40:57.000000000 +0200
+Index: linux-2.6.25.1/include/asm-powerpc/ppc4xx.h
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/include/asm-powerpc/ppc4xx.h

 @@ -0,0 +1,18 @@
 +/*
 + * PPC4xx Prototypes and definitions
 @@ -0,0 +1,18 @@
 +/*
 + * PPC4xx Prototypes and definitions


@@ -102014,10 +102450,11 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/ppc4xx.h powerpc.git/incl
 +extern void ppc4xx_reset_system(char *cmd);
 +
 +#endif /* __ASM_POWERPC_PPC4xx_H__ */
 +extern void ppc4xx_reset_system(char *cmd);
 +
 +#endif /* __ASM_POWERPC_PPC4xx_H__ */

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/ps3.h powerpc.git/include/asm-powerpc/ps3.h
---- linux-2.6.25-rc9/include/asm-powerpc/ps3.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/ps3.h      2008-04-19 16:40:57.000000000 +0200
-@@ -434,8 +434,11 @@
+Index: linux-2.6.25.1/include/asm-powerpc/ps3.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/ps3.h
++++ linux-2.6.25.1/include/asm-powerpc/ps3.h
+@@ -434,8 +434,11 @@ struct ps3_sys_manager_ops {

  };
  
  void ps3_sys_manager_register_ops(const struct ps3_sys_manager_ops *ops);
  };
  
  void ps3_sys_manager_register_ops(const struct ps3_sys_manager_ops *ops);


@@ -102031,10 +102468,11 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/ps3.h powerpc.git/include
  
  struct ps3_prealloc {
      const char *name;
  
  struct ps3_prealloc {
      const char *name;

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/ptrace.h powerpc.git/include/asm-powerpc/ptrace.h
---- linux-2.6.25-rc9/include/asm-powerpc/ptrace.h      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/ptrace.h   2008-04-19 16:40:57.000000000 +0200
-@@ -58,6 +58,11 @@
+Index: linux-2.6.25.1/include/asm-powerpc/ptrace.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/ptrace.h
++++ linux-2.6.25.1/include/asm-powerpc/ptrace.h
+@@ -58,6 +58,11 @@ struct pt_regs {

  #define __ARCH_WANT_COMPAT_SYS_PTRACE
  
  #define STACK_FRAME_OVERHEAD  112     /* size of minimum stack frame */
  #define __ARCH_WANT_COMPAT_SYS_PTRACE
  
  #define STACK_FRAME_OVERHEAD  112     /* size of minimum stack frame */


@@ -102046,7 +102484,7 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/ptrace.h powerpc.git/incl
  
  /* Size of dummy stack frame allocated when calling signal handler. */
  #define __SIGNAL_FRAMESIZE    128
  
  /* Size of dummy stack frame allocated when calling signal handler. */
  #define __SIGNAL_FRAMESIZE    128

-@@ -66,6 +71,10 @@
+@@ -66,6 +71,10 @@ struct pt_regs {

  #else /* __powerpc64__ */
  
  #define STACK_FRAME_OVERHEAD  16      /* size of minimum stack frame */
  #else /* __powerpc64__ */
  
  #define STACK_FRAME_OVERHEAD  16      /* size of minimum stack frame */


@@ -102057,10 +102495,11 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/ptrace.h powerpc.git/incl
  
  /* Size of stack frame allocated when calling signal handler. */
  #define __SIGNAL_FRAMESIZE    64
  
  /* Size of stack frame allocated when calling signal handler. */
  #define __SIGNAL_FRAMESIZE    64

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/qe.h powerpc.git/include/asm-powerpc/qe.h
---- linux-2.6.25-rc9/include/asm-powerpc/qe.h  2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/qe.h       2008-04-19 16:40:57.000000000 +0200
-@@ -85,6 +85,7 @@
+Index: linux-2.6.25.1/include/asm-powerpc/qe.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/qe.h
++++ linux-2.6.25.1/include/asm-powerpc/qe.h
+@@ -85,6 +85,7 @@ 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);
  enum qe_clock qe_clock_source(const char *source);
  /* QE internal API */
  int qe_issue_cmd(u32 cmd, u32 device, u8 mcn_protocol, u32 cmd_input);
  enum qe_clock qe_clock_source(const char *source);


@@ -102068,7 +102507,7 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/qe.h powerpc.git/include/
  int qe_setbrg(enum qe_clock brg, unsigned int rate, unsigned int multiplier);
  int qe_get_snum(void);
  void qe_put_snum(u8 snum);
  int qe_setbrg(enum qe_clock brg, unsigned int rate, unsigned int multiplier);
  int qe_get_snum(void);
  void qe_put_snum(u8 snum);

-@@ -92,7 +93,16 @@
+@@ -92,7 +93,16 @@ unsigned long qe_muram_alloc(int size, i

  int qe_muram_free(unsigned long offset);
  unsigned long qe_muram_alloc_fixed(unsigned long offset, int size);
  void qe_muram_dump(void);
  int qe_muram_free(unsigned long offset);
  unsigned long qe_muram_alloc_fixed(unsigned long offset, int size);
  void qe_muram_dump(void);


@@ -102086,10 +102525,11 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/qe.h powerpc.git/include/
  
  /* Structure that defines QE firmware binary files.
   *
  
  /* Structure that defines QE firmware binary files.
   *

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/rwsem.h powerpc.git/include/asm-powerpc/rwsem.h
---- linux-2.6.25-rc9/include/asm-powerpc/rwsem.h       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/rwsem.h    2008-04-19 16:40:57.000000000 +0200
-@@ -32,11 +32,20 @@
+Index: linux-2.6.25.1/include/asm-powerpc/rwsem.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/rwsem.h
++++ linux-2.6.25.1/include/asm-powerpc/rwsem.h
+@@ -32,11 +32,20 @@ struct rw_semaphore {

  #define RWSEM_ACTIVE_WRITE_BIAS               (RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS)
        spinlock_t              wait_lock;
        struct list_head        wait_list;
  #define RWSEM_ACTIVE_WRITE_BIAS               (RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS)
        spinlock_t              wait_lock;
        struct list_head        wait_list;


@@ -102112,7 +102552,7 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/rwsem.h powerpc.git/inclu
  
  #define DECLARE_RWSEM(name)           \
        struct rw_semaphore name = __RWSEM_INITIALIZER(name)
  
  #define DECLARE_RWSEM(name)           \
        struct rw_semaphore name = __RWSEM_INITIALIZER(name)

-@@ -46,12 +55,15 @@
+@@ -46,12 +55,15 @@ extern struct rw_semaphore *rwsem_down_w

  extern struct rw_semaphore *rwsem_wake(struct rw_semaphore *sem);
  extern struct rw_semaphore *rwsem_downgrade_wake(struct rw_semaphore *sem);
  
  extern struct rw_semaphore *rwsem_wake(struct rw_semaphore *sem);
  extern struct rw_semaphore *rwsem_downgrade_wake(struct rw_semaphore *sem);
  


@@ -102134,7 +102574,7 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/rwsem.h powerpc.git/inclu
  
  /*
   * lock for reading
  
  /*
   * lock for reading

-@@ -78,7 +90,7 @@
+@@ -78,7 +90,7 @@ static inline int __down_read_trylock(st

  /*
   * lock for writing
   */
  /*
   * lock for writing
   */


@@ -102143,7 +102583,7 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/rwsem.h powerpc.git/inclu
  {
        int tmp;
  
  {
        int tmp;
  

-@@ -88,6 +100,11 @@
+@@ -88,6 +100,11 @@ static inline void __down_write(struct r

                rwsem_down_write_failed(sem);
  }
  
                rwsem_down_write_failed(sem);
  }
  


@@ -102155,9 +102595,10 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/rwsem.h powerpc.git/inclu
  static inline int __down_write_trylock(struct rw_semaphore *sem)
  {
        int tmp;
  static inline int __down_write_trylock(struct rw_semaphore *sem)
  {
        int tmp;

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/sparsemem.h powerpc.git/include/asm-powerpc/sparsemem.h
---- linux-2.6.25-rc9/include/asm-powerpc/sparsemem.h   2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/sparsemem.h        2008-04-19 16:40:57.000000000 +0200
+Index: linux-2.6.25.1/include/asm-powerpc/sparsemem.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/sparsemem.h
++++ linux-2.6.25.1/include/asm-powerpc/sparsemem.h

 @@ -15,6 +15,7 @@
  
  #ifdef CONFIG_MEMORY_HOTPLUG
 @@ -15,6 +15,7 @@
  
  #ifdef CONFIG_MEMORY_HOTPLUG


@@ -102166,9 +102607,10 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/sparsemem.h powerpc.git/i
  #ifdef CONFIG_NUMA
  extern int hot_add_scn_to_nid(unsigned long scn_addr);
  #else
  #ifdef CONFIG_NUMA
  extern int hot_add_scn_to_nid(unsigned long scn_addr);
  #else

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/spinlock.h powerpc.git/include/asm-powerpc/spinlock.h
---- linux-2.6.25-rc9/include/asm-powerpc/spinlock.h    2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/spinlock.h 2008-04-19 16:40:57.000000000 +0200
+Index: linux-2.6.25.1/include/asm-powerpc/spinlock.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/spinlock.h
++++ linux-2.6.25.1/include/asm-powerpc/spinlock.h

 @@ -19,6 +19,7 @@
   *
   * (the type definitions are in asm/spinlock_types.h)
 @@ -19,6 +19,7 @@
   *
   * (the type definitions are in asm/spinlock_types.h)


@@ -102177,9 +102619,10 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/spinlock.h powerpc.git/in
  #ifdef CONFIG_PPC64
  #include <asm/paca.h>
  #include <asm/hvcall.h>
  #ifdef CONFIG_PPC64
  #include <asm/paca.h>
  #include <asm/hvcall.h>

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/string.h powerpc.git/include/asm-powerpc/string.h
---- linux-2.6.25-rc9/include/asm-powerpc/string.h      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/string.h   2008-04-19 16:40:57.000000000 +0200
+Index: linux-2.6.25.1/include/asm-powerpc/string.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/string.h
++++ linux-2.6.25.1/include/asm-powerpc/string.h

 @@ -7,6 +7,7 @@
  #define __HAVE_ARCH_STRNCPY
  #define __HAVE_ARCH_STRLEN
 @@ -7,6 +7,7 @@
  #define __HAVE_ARCH_STRNCPY
  #define __HAVE_ARCH_STRLEN


@@ -102188,7 +102631,7 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/string.h powerpc.git/incl
  #define __HAVE_ARCH_STRCAT
  #define __HAVE_ARCH_MEMSET
  #define __HAVE_ARCH_MEMCPY
  #define __HAVE_ARCH_STRCAT
  #define __HAVE_ARCH_MEMSET
  #define __HAVE_ARCH_MEMCPY

-@@ -18,6 +19,7 @@
+@@ -18,6 +19,7 @@ extern char * strcpy(char *,const char *

  extern char * strncpy(char *,const char *, __kernel_size_t);
  extern __kernel_size_t strlen(const char *);
  extern int strcmp(const char *,const char *);
  extern char * strncpy(char *,const char *, __kernel_size_t);
  extern __kernel_size_t strlen(const char *);
  extern int strcmp(const char *,const char *);


@@ -102196,10 +102639,11 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/string.h powerpc.git/incl
  extern char * strcat(char *, const char *);
  extern void * memset(void *,int,__kernel_size_t);
  extern void * memcpy(void *,const void *,__kernel_size_t);
  extern char * strcat(char *, const char *);
  extern void * memset(void *,int,__kernel_size_t);
  extern void * memcpy(void *,const void *,__kernel_size_t);

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/types.h powerpc.git/include/asm-powerpc/types.h
---- linux-2.6.25-rc9/include/asm-powerpc/types.h       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/types.h    2008-04-19 16:40:57.000000000 +0200
-@@ -84,6 +84,13 @@
+Index: linux-2.6.25.1/include/asm-powerpc/types.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-powerpc/types.h
++++ linux-2.6.25.1/include/asm-powerpc/types.h
+@@ -84,6 +84,13 @@ typedef unsigned long long u64;

  
  typedef __vector128 vector128;
  
  
  typedef __vector128 vector128;
  


@@ -102213,9 +102657,10 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/types.h powerpc.git/inclu
  #ifdef __powerpc64__
  typedef u64 dma_addr_t;
  #else
  #ifdef __powerpc64__
  typedef u64 dma_addr_t;
  #else

-diff -x .git -Nur linux-2.6.25-rc9/include/asm-sparc64/lmb.h powerpc.git/include/asm-sparc64/lmb.h
---- linux-2.6.25-rc9/include/asm-sparc64/lmb.h 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/include/asm-sparc64/lmb.h      2008-03-17 14:04:36.000000000 +0100
+Index: linux-2.6.25.1/include/asm-sparc64/lmb.h
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/include/asm-sparc64/lmb.h

 @@ -0,0 +1,10 @@
 +#ifndef _SPARC64_LMB_H
 +#define _SPARC64_LMB_H
 @@ -0,0 +1,10 @@
 +#ifndef _SPARC64_LMB_H
 +#define _SPARC64_LMB_H


@@ -102227,9 +102672,10 @@ diff -x .git -Nur linux-2.6.25-rc9/include/asm-sparc64/lmb.h powerpc.git/include
 +#define LMB_REAL_LIMIT        0
 +
 +#endif /* !(_SPARC64_LMB_H) */
 +#define LMB_REAL_LIMIT        0
 +
 +#endif /* !(_SPARC64_LMB_H) */

-diff -x .git -Nur linux-2.6.25-rc9/include/linux/lmb.h powerpc.git/include/linux/lmb.h
---- linux-2.6.25-rc9/include/linux/lmb.h       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/include/linux/lmb.h    2008-04-19 16:40:57.000000000 +0200
+Index: linux-2.6.25.1/include/linux/lmb.h
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/include/linux/lmb.h

 @@ -0,0 +1,85 @@
 +#ifndef _LINUX_LMB_H
 +#define _LINUX_LMB_H
 @@ -0,0 +1,85 @@
 +#ifndef _LINUX_LMB_H
 +#define _LINUX_LMB_H


@@ -102316,10 +102762,11 @@ diff -x .git -Nur linux-2.6.25-rc9/include/linux/lmb.h powerpc.git/include/linux
 +#endif /* __KERNEL__ */
 +
 +#endif /* _LINUX_LMB_H */
 +#endif /* __KERNEL__ */
 +
 +#endif /* _LINUX_LMB_H */

-diff -x .git -Nur linux-2.6.25-rc9/include/linux/of.h powerpc.git/include/linux/of.h
---- linux-2.6.25-rc9/include/linux/of.h        2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/linux/of.h     2008-04-19 16:40:57.000000000 +0200
-@@ -62,6 +62,7 @@
+Index: linux-2.6.25.1/include/linux/of.h
+===================================================================
+--- linux-2.6.25.1.orig/include/linux/of.h
++++ linux-2.6.25.1/include/linux/of.h
+@@ -62,6 +62,7 @@ extern struct property *of_find_property

                                         int *lenp);
  extern int of_device_is_compatible(const struct device_node *device,
                                   const char *);
                                         int *lenp);
  extern int of_device_is_compatible(const struct device_node *device,
                                   const char *);


@@ -102327,9 +102774,10 @@ diff -x .git -Nur linux-2.6.25-rc9/include/linux/of.h powerpc.git/include/linux/
  extern const void *of_get_property(const struct device_node *node,
                                const char *name,
                                int *lenp);
  extern const void *of_get_property(const struct device_node *node,
                                const char *name,
                                int *lenp);

-diff -x .git -Nur linux-2.6.25-rc9/include/linux/of_gpio.h powerpc.git/include/linux/of_gpio.h
---- linux-2.6.25-rc9/include/linux/of_gpio.h   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/include/linux/of_gpio.h        2008-04-19 16:40:57.000000000 +0200
+Index: linux-2.6.25.1/include/linux/of_gpio.h
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/include/linux/of_gpio.h

 @@ -0,0 +1,69 @@
 +/*
 + * OF helpers for the GPIO API
 @@ -0,0 +1,69 @@
 +/*
 + * OF helpers for the GPIO API


@@ -102400,9 +102848,10 @@ diff -x .git -Nur linux-2.6.25-rc9/include/linux/of_gpio.h powerpc.git/include/l
 +#endif /* CONFIG_OF_GPIO */
 +
 +#endif /* __LINUX_OF_GPIO_H */
 +#endif /* CONFIG_OF_GPIO */
 +
 +#endif /* __LINUX_OF_GPIO_H */

-diff -x .git -Nur linux-2.6.25-rc9/include/linux/of_i2c.h powerpc.git/include/linux/of_i2c.h
---- linux-2.6.25-rc9/include/linux/of_i2c.h    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/include/linux/of_i2c.h 2008-04-19 16:40:57.000000000 +0200
+Index: linux-2.6.25.1/include/linux/of_i2c.h
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/include/linux/of_i2c.h

 @@ -0,0 +1,24 @@
 +/*
 + * Generic I2C API implementation for PowerPC.
 @@ -0,0 +1,24 @@
 +/*
 + * Generic I2C API implementation for PowerPC.


@@ -102428,10 +102877,11 @@ diff -x .git -Nur linux-2.6.25-rc9/include/linux/of_i2c.h powerpc.git/include/li
 +#endif /* CONFIG_OF_I2C */
 +
 +#endif /* __LINUX_OF_I2C_H */
 +#endif /* CONFIG_OF_I2C */
 +
 +#endif /* __LINUX_OF_I2C_H */

-diff -x .git -Nur linux-2.6.25-rc9/lib/Kconfig powerpc.git/lib/Kconfig
---- linux-2.6.25-rc9/lib/Kconfig       2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/lib/Kconfig    2008-03-17 14:04:43.000000000 +0100
-@@ -141,4 +141,7 @@
+Index: linux-2.6.25.1/lib/Kconfig
+===================================================================
+--- linux-2.6.25.1.orig/lib/Kconfig
++++ linux-2.6.25.1/lib/Kconfig
+@@ -141,4 +141,7 @@ config HAS_DMA

  config CHECK_SIGNATURE
        bool
  
  config CHECK_SIGNATURE
        bool
  


@@ -102439,10 +102889,11 @@ diff -x .git -Nur linux-2.6.25-rc9/lib/Kconfig powerpc.git/lib/Kconfig
 +      boolean
 +
  endmenu
 +      boolean
 +
  endmenu

-diff -x .git -Nur linux-2.6.25-rc9/lib/Makefile powerpc.git/lib/Makefile
---- linux-2.6.25-rc9/lib/Makefile      2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/lib/Makefile   2008-03-17 14:04:43.000000000 +0100
-@@ -70,6 +70,8 @@
+Index: linux-2.6.25.1/lib/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/lib/Makefile
++++ linux-2.6.25.1/lib/Makefile
+@@ -70,6 +70,8 @@ obj-$(CONFIG_FAULT_INJECTION) += fault-i

  
  lib-$(CONFIG_GENERIC_BUG) += bug.o
  
  
  lib-$(CONFIG_GENERIC_BUG) += bug.o
  


@@ -102451,9 +102902,10 @@ diff -x .git -Nur linux-2.6.25-rc9/lib/Makefile powerpc.git/lib/Makefile
  hostprogs-y   := gen_crc32table
  clean-files   := crc32table.h
  
  hostprogs-y   := gen_crc32table
  clean-files   := crc32table.h
  

-diff -x .git -Nur linux-2.6.25-rc9/lib/lmb.c powerpc.git/lib/lmb.c
---- linux-2.6.25-rc9/lib/lmb.c 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/lib/lmb.c      2008-04-19 16:40:59.000000000 +0200
+Index: linux-2.6.25.1/lib/lmb.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/lib/lmb.c

 @@ -0,0 +1,428 @@
 +/*
 + * Procedures for maintaining information about logical memory blocks.
 @@ -0,0 +1,428 @@
 +/*
 + * Procedures for maintaining information about logical memory blocks.

diff --git a/target/linux/generic-2.6/patches-2.6.25/801-usb_serial_endpoint_size.patch b/target/linux/generic-2.6/patches-2.6.25/801-usb_serial_endpoint_size.patch
index 5b61c73bac66b09050633f465a7af355a2cc705a..b81c2a65f77621da1bd0f9fa720c1e8c4efd1a34 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/801-usb_serial_endpoint_size.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/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.25.1/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.25.1.orig/drivers/usb/serial/usb-serial.c
++++ linux-2.6.25.1/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 @@
+@@ -904,7 +905,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 @@
+@@ -1316,3 +1317,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.25/840-unable_to_open_console.patch b/target/linux/generic-2.6/patches-2.6.25/840-unable_to_open_console.patch
index 332f5a5cd7374aecd57f9804df15deaf8e5edabe..c1a5b9631896c6e1d9751a1a18490d71d231b0f1 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/840-unable_to_open_console.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/840-unable_to_open_console.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23.14/init/main.c
+Index: linux-2.6.25.1/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.25.1.orig/init/main.c
++++ linux-2.6.25.1/init/main.c
+@@ -775,7 +775,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.25/850-jffs2_erase_progress_indicator.patch b/target/linux/generic-2.6/patches-2.6.25/850-jffs2_erase_progress_indicator.patch
index 89b1ca266d918ae5e5980a4e460ba38f73ea3782..667e27637744377f2f22bde3383902a52a345b42 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/850-jffs2_erase_progress_indicator.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/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.25.1/fs/jffs2/erase.c
+===================================================================
+--- linux-2.6.25.1.orig/fs/jffs2/erase.c
++++ linux-2.6.25.1/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.25/900-headers_type_and_time.patch b/target/linux/generic-2.6/patches-2.6.25/900-headers_type_and_time.patch
index aef479576ef8fd1ca27303508541b800909f85d5..d8c75c312880d0b5d8edaf43dd94b7345efe1136 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/900-headers_type_and_time.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/900-headers_type_and_time.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.23-rc6/include/linux/time.h
+Index: linux-2.6.25.1/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.25.1.orig/include/linux/time.h
++++ linux-2.6.25.1/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 @@
+@@ -232,4 +236,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.25.1/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.25.1.orig/include/linux/types.h
++++ linux-2.6.25.1/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.25/902-darwin_scripts_include.patch b/target/linux/generic-2.6/patches-2.6.25/902-darwin_scripts_include.patch
index 2a3a1e06ea370b4a75377583e3d4b2117ebb48c7..68f1f7afb9dda1a2a641d6988034cf35a0b2e0e2 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/902-darwin_scripts_include.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/902-darwin_scripts_include.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23-rc6/scripts/genksyms/parse.c_shipped
+Index: linux-2.6.25.1/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.25.1.orig/scripts/genksyms/parse.c_shipped
++++ linux-2.6.25.1/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.25.1/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.25.1.orig/scripts/genksyms/parse.y
++++ linux-2.6.25.1/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.25.1/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.25.1.orig/scripts/kallsyms.c
++++ linux-2.6.25.1/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.25.1/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.25.1.orig/scripts/kconfig/Makefile
++++ linux-2.6.25.1/scripts/kconfig/Makefile
+@@ -93,6 +93,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.25.1/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.25.1.orig/scripts/mod/mk_elfconfig.c
++++ linux-2.6.25.1/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.25.1/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.25.1.orig/scripts/mod/modpost.h
++++ linux-2.6.25.1/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.25/903-hostap_txpower.patch b/target/linux/generic-2.6/patches-2.6.25/903-hostap_txpower.patch
index 6f82cdb0330ae236108ceddced60bd58b1cb7ce5..0125a85c3d9a5a9529795386fce693cfb5b55f94 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/903-hostap_txpower.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/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.25.1/drivers/net/wireless/hostap/hostap_ap.c
+===================================================================
+--- linux-2.6.25.1.orig/drivers/net/wireless/hostap/hostap_ap.c
++++ linux-2.6.25.1/drivers/net/wireless/hostap/hostap_ap.c
+@@ -2397,13 +2397,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 @@
+@@ -2468,13 +2468,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.25.1/drivers/net/wireless/hostap/hostap_config.h
+===================================================================
+--- linux-2.6.25.1.orig/drivers/net/wireless/hostap/hostap_config.h
++++ linux-2.6.25.1/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.25.1/drivers/net/wireless/hostap/hostap.h
+===================================================================
+--- linux-2.6.25.1.orig/drivers/net/wireless/hostap/hostap.h
++++ linux-2.6.25.1/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.25.1/drivers/net/wireless/hostap/hostap_hw.c
+===================================================================
+--- linux-2.6.25.1.orig/drivers/net/wireless/hostap/hostap_hw.c
++++ linux-2.6.25.1/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.25.1/drivers/net/wireless/hostap/hostap_info.c
+===================================================================
+--- linux-2.6.25.1.orig/drivers/net/wireless/hostap/hostap_info.c
++++ linux-2.6.25.1/drivers/net/wireless/hostap/hostap_info.c
+@@ -434,6 +434,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.25.1/drivers/net/wireless/hostap/hostap_ioctl.c
+===================================================================
+--- linux-2.6.25.1.orig/drivers/net/wireless/hostap/hostap_ioctl.c
++++ linux-2.6.25.1/drivers/net/wireless/hostap/hostap_ioctl.c
+@@ -1500,23 +1500,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 @@
+@@ -4076,3 +4073,35 @@ int hostap_ioctl(struct net_device *dev,

  
        return ret;
  }
  
        return ret;
  }

diff --git a/target/linux/generic-2.6/patches-2.6.25/903-stddef_include.patch b/target/linux/generic-2.6/patches-2.6.25/903-stddef_include.patch
index 9b1f1b267d28fe42ffc8692f4484af4cf6e9bcf5..79896f24193bfcd3e48838afd262676c5768c965 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/903-stddef_include.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/903-stddef_include.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23-rc6/include/linux/stddef.h
+Index: linux-2.6.25.1/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.25.1.orig/include/linux/stddef.h
++++ linux-2.6.25.1/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.25/904-ls_time_locale.patch b/target/linux/generic-2.6/patches-2.6.25/904-ls_time_locale.patch
index 3b419c390dc863864b98bd1cac2ae205bb3b8bb1..fb1a30d8236c91e2e8a1811c1e589a6363ed68ba 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/904-ls_time_locale.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/904-ls_time_locale.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23-rc6/scripts/gen_initramfs_list.sh
+Index: linux-2.6.25.1/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.25.1.orig/scripts/gen_initramfs_list.sh
++++ linux-2.6.25.1/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.25/905-i386_build.patch b/target/linux/generic-2.6/patches-2.6.25/905-i386_build.patch
index 420111f04317bfeabe0083c2eb1e22a6798f2bb5..18a8f5e9cc7d1f674d0ba640cbb9bfa55be6c32c 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/905-i386_build.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/905-i386_build.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.23.9/arch/i386/boot/tools/build.c
+Index: linux-2.6.25.1/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.25.1.orig/arch/x86/boot/tools/build.c
++++ linux-2.6.25.1/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.25/921-gpio_spi_driver.patch b/target/linux/generic-2.6/patches-2.6.25/921-gpio_spi_driver.patch
index aa4e6ee0ac0f7654e3370a3ede12e6c928443d59..547f39b32f4944e53f60f4bd73904b269c21a6b9 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/921-gpio_spi_driver.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/921-gpio_spi_driver.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.23.16/drivers/spi/Kconfig
+Index: linux-2.6.25.1/drivers/spi/Kconfig

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

---- linux-2.6.23.16.orig/drivers/spi/Kconfig
-+++ linux-2.6.23.16/drivers/spi/Kconfig
+--- linux-2.6.25.1.orig/drivers/spi/Kconfig
++++ linux-2.6.25.1/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.25.1/drivers/spi/Makefile

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

---- linux-2.6.23.16.orig/drivers/spi/Makefile
-+++ linux-2.6.23.16/drivers/spi/Makefile
+--- linux-2.6.25.1.orig/drivers/spi/Makefile
++++ linux-2.6.25.1/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.25/930-ppc_big_endian_io_memory_accessors.patch b/target/linux/generic-2.6/patches-2.6.25/930-ppc_big_endian_io_memory_accessors.patch
index 939e590a1815001ff65e21e92e4051598fc9810b..2a68457cb907188297e6c84510200a5091b908fa 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/930-ppc_big_endian_io_memory_accessors.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/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.25.1/include/asm-ppc/io.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-ppc/io.h
++++ linux-2.6.25.1/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.25/940-arm_mach_types.patch b/target/linux/generic-2.6/patches-2.6.25/940-arm_mach_types.patch
index a691496521ec2ee801b26ec48a00cb4a34819e18..898b2fd849f095dc99d158739e74e62e7a783449 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/940-arm_mach_types.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/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.25.1/arch/arm/tools/mach-types
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/tools/mach-types
++++ linux-2.6.25.1/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
  #

-@@ -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


@@ -25,7 +27,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

-@@ -1463,7 +1463,7 @@
+@@ -1463,7 +1463,7 @@ artemis                  MACH_ARTEMIS            ARTEMIS                 1462

  htctitan              MACH_HTCTITAN           HTCTITAN                1463
  qranium                       MACH_QRANIUM            QRANIUM                 1464
  adx_wsc2              MACH_ADX_WSC2           ADX_WSC2                1465
  htctitan              MACH_HTCTITAN           HTCTITAN                1463
  qranium                       MACH_QRANIUM            QRANIUM                 1464
  adx_wsc2              MACH_ADX_WSC2           ADX_WSC2                1465


@@ -34,7 +36,7 @@
  bboard                        MACH_BBOARD             BBOARD                  1467
  cambria                       MACH_CAMBRIA            CAMBRIA                 1468
  mt7xxx                        MACH_MT7XXX             MT7XXX                  1469
  bboard                        MACH_BBOARD             BBOARD                  1467
  cambria                       MACH_CAMBRIA            CAMBRIA                 1468
  mt7xxx                        MACH_MT7XXX             MT7XXX                  1469

-@@ -1611,3 +1611,112 @@
+@@ -1611,3 +1611,112 @@ kb9263                 MACH_KB9263             KB9263                  1612

  mt7108                        MACH_MT7108             MT7108                  1613
  smtr2440              MACH_SMTR2440           SMTR2440                1614
  manao                 MACH_MANAO              MANAO                   1615
  mt7108                        MACH_MT7108             MT7108                  1613
  smtr2440              MACH_SMTR2440           SMTR2440                1614
  manao                 MACH_MANAO              MANAO                   1615

diff --git a/target/linux/generic-2.6/patches-2.6.25/950-revert_conntrack_optimization.patch b/target/linux/generic-2.6/patches-2.6.25/950-revert_conntrack_optimization.patch
index c146809f477a4d6f3c992e322565649578f12f3b..851cf6ceac7d13682be97da869a34ec75fb0d95c 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/950-revert_conntrack_optimization.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/950-revert_conntrack_optimization.patch
@@ -1,6 +1,8 @@
---- linux-2.6.25/net/netfilter/nf_conntrack_core.c     2008-04-17 04:49:44.000000000 +0200
-+++ linux-2.6.25-owrt/net/netfilter/nf_conntrack_core.c        2008-04-30 12:36:55.000000000 +0200
-@@ -73,19 +73,15 @@
+Index: linux-2.6.25.1/net/netfilter/nf_conntrack_core.c
+===================================================================
+--- linux-2.6.25.1.orig/net/netfilter/nf_conntrack_core.c
++++ linux-2.6.25.1/net/netfilter/nf_conntrack_core.c
+@@ -73,19 +73,15 @@ static unsigned int nf_conntrack_hash_rn

  static u_int32_t __hash_conntrack(const struct nf_conntrack_tuple *tuple,
                                  unsigned int size, unsigned int rnd)
  {
  static u_int32_t __hash_conntrack(const struct nf_conntrack_tuple *tuple,
                                  unsigned int size, unsigned int rnd)
  {

diff --git a/target/linux/ixp4xx/Makefile b/target/linux/ixp4xx/Makefile
index e0797749c181a89280375f7038ea40b56c2323ad..b02e749cd1dc0a6458538a054472eeabb5b47767 100644 (file)
--- a/target/linux/ixp4xx/Makefile
+++ b/target/linux/ixp4xx/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=Intel IXP4xx
 FEATURES:=squashfs
 SUBTARGETS=generic harddisk
 
 FEATURES:=squashfs
 SUBTARGETS=generic harddisk
 

-LINUX_VERSION:=2.6.25
+LINUX_VERSION:=2.6.25.1

 
 include $(INCLUDE_DIR)/target.mk
 
 
 include $(INCLUDE_DIR)/target.mk
 

diff --git a/target/linux/ixp4xx/patches-2.6.25/010-rtc_isl1208_new_style.patch b/target/linux/ixp4xx/patches-2.6.25/010-rtc_isl1208_new_style.patch
index a99bebc37d3da1c874de28175e2635be6d499d5f..29cafd26f34dba57016074316a27f022e46aa7b4 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/010-rtc_isl1208_new_style.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/010-rtc_isl1208_new_style.patch
@@ -2,10 +2,10 @@
  drivers/rtc/rtc-isl1208.c |  357 +++++++++++++++++++++-------------------------
  1 file changed, 170 insertions(+), 187 deletions(-)
 
  drivers/rtc/rtc-isl1208.c |  357 +++++++++++++++++++++-------------------------
  1 file changed, 170 insertions(+), 187 deletions(-)
 

-Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c
+Index: linux-2.6.25.1/drivers/rtc/rtc-isl1208.c

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

---- linux-2.6.25-rc6-armeb.orig/drivers/rtc/rtc-isl1208.c      2008-03-20 10:26:41.000000000 +1030
-+++ linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c   2008-03-20 10:26:53.000000000 +1030
+--- linux-2.6.25.1.orig/drivers/rtc/rtc-isl1208.c
++++ linux-2.6.25.1/drivers/rtc/rtc-isl1208.c

 @@ -15,16 +15,15 @@
  #include <linux/bcd.h>
  #include <linux/rtc.h>
 @@ -15,16 +15,15 @@
  #include <linux/bcd.h>
  #include <linux/rtc.h>


@@ -93,7 +93,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c
        BUG_ON(reg > ISL1208_REG_USR2);
        BUG_ON(reg + len > ISL1208_REG_USR2 + 1);
  
        BUG_ON(reg > ISL1208_REG_USR2);
        BUG_ON(reg + len > ISL1208_REG_USR2 + 1);
  

-@@ -103,15 +84,14 @@
+@@ -103,15 +84,14 @@ isl1208_i2c_read_regs(struct i2c_client 

  /* block write */
  static int
  isl1208_i2c_set_regs(struct i2c_client *client, u8 reg, u8 const buf[],
  /* block write */
  static int
  isl1208_i2c_set_regs(struct i2c_client *client, u8 reg, u8 const buf[],


@@ -111,7 +111,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c
        BUG_ON(reg > ISL1208_REG_USR2);
        BUG_ON(reg + len > ISL1208_REG_USR2 + 1);
  
        BUG_ON(reg > ISL1208_REG_USR2);
        BUG_ON(reg + len > ISL1208_REG_USR2 + 1);
  

-@@ -125,7 +105,8 @@
+@@ -125,7 +105,8 @@ isl1208_i2c_set_regs(struct i2c_client *

  }
  
  /* simple check to see wether we have a isl1208 */
  }
  
  /* simple check to see wether we have a isl1208 */


@@ -121,7 +121,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c
  {
        u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, };
        u8 zero_mask[ISL1208_RTC_SECTION_LEN] = {
  {
        u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, };
        u8 zero_mask[ISL1208_RTC_SECTION_LEN] = {

-@@ -139,24 +120,29 @@
+@@ -139,24 +120,29 @@ static int isl1208_i2c_validate_client(s

                return ret;
  
        for (i = 0; i < ISL1208_RTC_SECTION_LEN; ++i) {
                return ret;
  
        for (i = 0; i < ISL1208_RTC_SECTION_LEN; ++i) {


@@ -157,7 +157,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c
  
        /* The 6bit value in the ATR register controls the load
         * capacitance C_load * in steps of 0.25pF
  
        /* The 6bit value in the ATR register controls the load
         * capacitance C_load * in steps of 0.25pF

-@@ -169,51 +155,54 @@
+@@ -169,51 +155,54 @@ static int isl1208_i2c_get_atr(struct i2

         *
         */
  
         *
         */
  


@@ -225,7 +225,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c
  {
        struct i2c_client *const client = to_i2c_client(dev);
        int sr, dtr, atr, usr;
  {
        struct i2c_client *const client = to_i2c_client(dev);
        int sr, dtr, atr, usr;

-@@ -230,20 +219,19 @@
+@@ -230,20 +219,19 @@ static int isl1208_rtc_proc(struct devic

                   (sr & ISL1208_REG_SR_ALM) ? " ALM" : "",
                   (sr & ISL1208_REG_SR_WRTC) ? " WRTC" : "",
                   (sr & ISL1208_REG_SR_XTOSCB) ? " XTOSCB" : "",
                   (sr & ISL1208_REG_SR_ALM) ? " ALM" : "",
                   (sr & ISL1208_REG_SR_WRTC) ? " WRTC" : "",
                   (sr & ISL1208_REG_SR_XTOSCB) ? " XTOSCB" : "",


@@ -249,7 +249,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c
  
        usr = isl1208_i2c_get_usr(client);
        if (usr >= 0)
  
        usr = isl1208_i2c_get_usr(client);
        if (usr >= 0)

-@@ -252,9 +240,8 @@
+@@ -252,9 +240,8 @@ static int isl1208_rtc_proc(struct devic

        return 0;
  }
  
        return 0;
  }
  


@@ -261,7 +261,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c
  {
        int sr;
        u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, };
  {
        int sr;
        u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, };

-@@ -274,27 +261,30 @@
+@@ -274,27 +261,30 @@ static int isl1208_i2c_read_time(struct 

  
        tm->tm_sec = BCD2BIN(regs[ISL1208_REG_SC]);
        tm->tm_min = BCD2BIN(regs[ISL1208_REG_MN]);
  
        tm->tm_sec = BCD2BIN(regs[ISL1208_REG_SC]);
        tm->tm_min = BCD2BIN(regs[ISL1208_REG_MN]);


@@ -299,7 +299,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c
  {
        struct rtc_time *const tm = &alarm->time;
        u8 regs[ISL1208_ALARM_SECTION_LEN] = { 0, };
  {
        struct rtc_time *const tm = &alarm->time;
        u8 regs[ISL1208_ALARM_SECTION_LEN] = { 0, };

-@@ -307,7 +297,7 @@
+@@ -307,7 +297,7 @@ static int isl1208_i2c_read_alarm(struct

        }
  
        sr = isl1208_i2c_read_regs(client, ISL1208_REG_SCA, regs,
        }
  
        sr = isl1208_i2c_read_regs(client, ISL1208_REG_SCA, regs,


@@ -308,7 +308,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c
        if (sr < 0) {
                dev_err(&client->dev, "%s: reading alarm section failed\n",
                        __func__);
        if (sr < 0) {
                dev_err(&client->dev, "%s: reading alarm section failed\n",
                        __func__);

-@@ -315,23 +305,25 @@
+@@ -315,23 +305,25 @@ static int isl1208_i2c_read_alarm(struct

        }
  
        /* MSB of each alarm register is an enable bit */
        }
  
        /* MSB of each alarm register is an enable bit */


@@ -343,7 +343,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c
  {
        int sr;
        u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, };
  {
        int sr;
        u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, };

-@@ -353,7 +345,7 @@
+@@ -353,7 +345,7 @@ static int isl1208_i2c_set_time(struct i

        }
  
        /* set WRTC */
        }
  
        /* set WRTC */


@@ -352,7 +352,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c
                                       sr | ISL1208_REG_SR_WRTC);
        if (sr < 0) {
                dev_err(&client->dev, "%s: writing SR failed\n", __func__);
                                       sr | ISL1208_REG_SR_WRTC);
        if (sr < 0) {
                dev_err(&client->dev, "%s: writing SR failed\n", __func__);

-@@ -369,7 +361,7 @@
+@@ -369,7 +361,7 @@ static int isl1208_i2c_set_time(struct i

        }
  
        /* clear WRTC again */
        }
  
        /* clear WRTC again */


@@ -361,7 +361,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c
                                       sr & ~ISL1208_REG_SR_WRTC);
        if (sr < 0) {
                dev_err(&client->dev, "%s: writing SR failed\n", __func__);
                                       sr & ~ISL1208_REG_SR_WRTC);
        if (sr < 0) {
                dev_err(&client->dev, "%s: writing SR failed\n", __func__);

-@@ -380,70 +372,69 @@
+@@ -380,70 +372,69 @@ static int isl1208_i2c_set_time(struct i

  }
  
  
  }
  
  


@@ -460,7 +460,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c
  {
        int usr = -1;
  
  {
        int usr = -1;
  

-@@ -460,124 +451,116 @@
+@@ -460,124 +451,116 @@ static ssize_t isl1208_sysfs_store_usr(s

  
        return isl1208_i2c_set_usr(to_i2c_client(dev), usr) ? -EIO : count;
  }
  
        return isl1208_i2c_set_usr(to_i2c_client(dev), usr) ? -EIO : count;
  }

diff --git a/target/linux/ixp4xx/patches-2.6.25/011-rtc_pcf8563_new_style.patch b/target/linux/ixp4xx/patches-2.6.25/011-rtc_pcf8563_new_style.patch
index 54b244c5f0dca617bcb0065fcf67889c44adf35a..25f60b42dd09ba81c83a7a487891df21a7d085ed 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/011-rtc_pcf8563_new_style.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/011-rtc_pcf8563_new_style.patch
@@ -2,10 +2,10 @@
  drivers/rtc/rtc-pcf8563.c |  109 +++++++++++++---------------------------------
  1 file changed, 32 insertions(+), 77 deletions(-)
 
  drivers/rtc/rtc-pcf8563.c |  109 +++++++++++++---------------------------------
  1 file changed, 32 insertions(+), 77 deletions(-)
 

-Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-pcf8563.c
+Index: linux-2.6.25.1/drivers/rtc/rtc-pcf8563.c

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

---- linux-2.6.25-rc6-armeb.orig/drivers/rtc/rtc-pcf8563.c      2008-03-20 10:26:43.000000000 +1030
-+++ linux-2.6.25-rc6-armeb/drivers/rtc/rtc-pcf8563.c   2008-03-20 10:26:51.000000000 +1030
+--- linux-2.6.25.1.orig/drivers/rtc/rtc-pcf8563.c
++++ linux-2.6.25.1/drivers/rtc/rtc-pcf8563.c

 @@ -18,17 +18,7 @@
  #include <linux/bcd.h>
  #include <linux/rtc.h>
 @@ -18,17 +18,7 @@
  #include <linux/bcd.h>
  #include <linux/rtc.h>


@@ -25,7 +25,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-pcf8563.c
  
  #define PCF8563_REG_ST1               0x00 /* status */
  #define PCF8563_REG_ST2               0x01
  
  #define PCF8563_REG_ST1               0x00 /* status */
  #define PCF8563_REG_ST2               0x01

-@@ -53,8 +43,10 @@
+@@ -53,8 +43,10 @@ I2C_CLIENT_INSMOD;

  #define PCF8563_SC_LV         0x80 /* low voltage */
  #define PCF8563_MO_C          0x80 /* century */
  
  #define PCF8563_SC_LV         0x80 /* low voltage */
  #define PCF8563_MO_C          0x80 /* century */
  


@@ -37,7 +37,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-pcf8563.c
        /*
         * The meaning of MO_C bit varies by the chip type.
         * From PCF8563 datasheet: this bit is toggled when the years
        /*
         * The meaning of MO_C bit varies by the chip type.
         * From PCF8563 datasheet: this bit is toggled when the years

-@@ -72,16 +64,13 @@
+@@ -72,16 +64,13 @@ struct pcf8563 {

        int c_polarity; /* 0: MO_C=1 means 19xx, otherwise MO_C=1 means 20xx */
  };
  
        int c_polarity; /* 0: MO_C=1 means 19xx, otherwise MO_C=1 means 20xx */
  };
  


@@ -55,7 +55,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-pcf8563.c
        unsigned char buf[13] = { PCF8563_REG_ST1 };
  
        struct i2c_msg msgs[] = {
        unsigned char buf[13] = { PCF8563_REG_ST1 };
  
        struct i2c_msg msgs[] = {

-@@ -138,7 +127,7 @@
+@@ -138,7 +127,7 @@ static int pcf8563_get_datetime(struct i

  
  static int pcf8563_set_datetime(struct i2c_client *client, struct rtc_time *tm)
  {
  
  static int pcf8563_set_datetime(struct i2c_client *client, struct rtc_time *tm)
  {


@@ -64,7 +64,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-pcf8563.c
        int i, err;
        unsigned char buf[9];
  
        int i, err;
        unsigned char buf[9];
  

-@@ -257,100 +246,66 @@
+@@ -257,100 +246,66 @@ static const struct rtc_class_ops pcf856

        .set_time       = pcf8563_rtc_set_time,
  };
  
        .set_time       = pcf8563_rtc_set_time,
  };
  

diff --git a/target/linux/ixp4xx/patches-2.6.25/012-rtc_x1205_new_style.patch b/target/linux/ixp4xx/patches-2.6.25/012-rtc_x1205_new_style.patch
index d81a570eaae0e0b0dfc0c1c69f9dae2ee265c487..cea2e63591199af98e104746422ab0de6dd9bdc8 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/012-rtc_x1205_new_style.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/012-rtc_x1205_new_style.patch
@@ -2,10 +2,10 @@
  drivers/rtc/rtc-x1205.c |  128 ++++++++++++++++--------------------------------
  1 file changed, 43 insertions(+), 85 deletions(-)
 
  drivers/rtc/rtc-x1205.c |  128 ++++++++++++++++--------------------------------
  1 file changed, 43 insertions(+), 85 deletions(-)
 

-Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-x1205.c
+Index: linux-2.6.25.1/drivers/rtc/rtc-x1205.c

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

---- linux-2.6.25-rc6-armeb.orig/drivers/rtc/rtc-x1205.c        2008-03-20 10:24:13.000000000 +1030
-+++ linux-2.6.25-rc6-armeb/drivers/rtc/rtc-x1205.c     2008-03-20 10:24:23.000000000 +1030
+--- linux-2.6.25.1.orig/drivers/rtc/rtc-x1205.c
++++ linux-2.6.25.1/drivers/rtc/rtc-x1205.c

 @@ -22,20 +22,7 @@
  #include <linux/rtc.h>
  #include <linux/delay.h>
 @@ -22,20 +22,7 @@
  #include <linux/rtc.h>
  #include <linux/delay.h>


@@ -28,7 +28,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-x1205.c
  
  /* offsets into CCR area */
  
  
  /* offsets into CCR area */
  

-@@ -91,19 +78,7 @@
+@@ -91,19 +78,7 @@ I2C_CLIENT_INSMOD;

  
  #define X1205_HR_MIL          0x80    /* Set in ccr.hour for 24 hr mode */
  
  
  #define X1205_HR_MIL          0x80    /* Set in ccr.hour for 24 hr mode */
  


@@ -49,7 +49,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-x1205.c
  
  /*
   * In the routines that deal directly with the x1205 hardware, we use
  
  /*
   * In the routines that deal directly with the x1205 hardware, we use

-@@ -497,58 +472,51 @@
+@@ -497,58 +472,51 @@ static ssize_t x1205_sysfs_show_dtrim(st

  }
  static DEVICE_ATTR(dtrim, S_IRUGO, x1205_sysfs_show_dtrim, NULL);
  
  }
  static DEVICE_ATTR(dtrim, S_IRUGO, x1205_sysfs_show_dtrim, NULL);
  


@@ -135,7 +135,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-x1205.c
  
        i2c_set_clientdata(client, rtc);
  
  
        i2c_set_clientdata(client, rtc);
  

-@@ -565,45 +533,35 @@
+@@ -565,45 +533,35 @@ static int x1205_probe(struct i2c_adapte

        else
                dev_err(&client->dev, "couldn't read status\n");
  
        else
                dev_err(&client->dev, "couldn't read status\n");
  

diff --git a/target/linux/ixp4xx/patches-2.6.25/030-ixp4xx_fsg_board_support.patch b/target/linux/ixp4xx/patches-2.6.25/030-ixp4xx_fsg_board_support.patch
index de874e44ad53a1ed7fd890c8e451c621ecf25c0b..5a2fb4ca03307a4c908f0bb6a54067ad68286ac7 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/030-ixp4xx_fsg_board_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/030-ixp4xx_fsg_board_support.patch
@@ -45,10 +45,10 @@ now calls machine_restart() directly.
  create mode 100644 arch/arm/mach-ixp4xx/fsg-setup.c
  create mode 100644 include/asm-arm/arch-ixp4xx/fsg.h
 
  create mode 100644 arch/arm/mach-ixp4xx/fsg-setup.c
  create mode 100644 include/asm-arm/arch-ixp4xx/fsg.h
 

-diff --git a/arch/arm/configs/ixp4xx_defconfig b/arch/arm/configs/ixp4xx_defconfig
-index efa0485..fc14932 100644
---- a/arch/arm/configs/ixp4xx_defconfig
-+++ b/arch/arm/configs/ixp4xx_defconfig
+Index: linux-2.6.25.1/arch/arm/configs/ixp4xx_defconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/configs/ixp4xx_defconfig
++++ linux-2.6.25.1/arch/arm/configs/ixp4xx_defconfig

 @@ -165,6 +165,7 @@ CONFIG_ARCH_PRPMC1100=y
  CONFIG_MACH_NAS100D=y
  CONFIG_MACH_DSMG600=y
 @@ -165,6 +165,7 @@ CONFIG_ARCH_PRPMC1100=y
  CONFIG_MACH_NAS100D=y
  CONFIG_MACH_DSMG600=y


@@ -94,10 +94,10 @@ index efa0485..fc14932 100644
  CONFIG_RTC_DRV_X1205=y
  CONFIG_RTC_DRV_PCF8563=y
  # CONFIG_RTC_DRV_PCF8583 is not set
  CONFIG_RTC_DRV_X1205=y
  CONFIG_RTC_DRV_PCF8563=y
  # CONFIG_RTC_DRV_PCF8583 is not set

-diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig
-index e774447..db8b5fe 100644
---- a/arch/arm/mach-ixp4xx/Kconfig
-+++ b/arch/arm/mach-ixp4xx/Kconfig
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig

 @@ -125,6 +125,15 @@ config    ARCH_IXDP4XX
        depends on ARCH_IXDP425 || MACH_IXDP465 || MACH_KIXRP435
        default y
 @@ -125,6 +125,15 @@ config    ARCH_IXDP4XX
        depends on ARCH_IXDP425 || MACH_IXDP465 || MACH_KIXRP435
        default y


@@ -114,11 +114,11 @@ index e774447..db8b5fe 100644
  #
  # Certain registers and IRQs are only enabled if supporting IXP465 CPUs
  #
  #
  # Certain registers and IRQs are only enabled if supporting IXP465 CPUs
  #

-diff --git a/arch/arm/mach-ixp4xx/Makefile b/arch/arm/mach-ixp4xx/Makefile
-index c195688..2e6bbf9 100644
---- a/arch/arm/mach-ixp4xx/Makefile
-+++ b/arch/arm/mach-ixp4xx/Makefile
-@@ -15,6 +15,7 @@ obj-pci-$(CONFIG_MACH_NAS100D)               += nas100d-pci.o
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+@@ -15,6 +15,7 @@ obj-pci-$(CONFIG_MACH_NAS100D)               += nas10

  obj-pci-$(CONFIG_MACH_DSMG600)                += dsmg600-pci.o
  obj-pci-$(CONFIG_MACH_GATEWAY7001)    += gateway7001-pci.o
  obj-pci-$(CONFIG_MACH_WG302V2)                += wg302v2-pci.o
  obj-pci-$(CONFIG_MACH_DSMG600)                += dsmg600-pci.o
  obj-pci-$(CONFIG_MACH_GATEWAY7001)    += gateway7001-pci.o
  obj-pci-$(CONFIG_MACH_WG302V2)                += wg302v2-pci.o


@@ -126,7 +126,7 @@ index c195688..2e6bbf9 100644
  
  obj-y += common.o
  
  
  obj-y += common.o
  

-@@ -28,6 +29,7 @@ obj-$(CONFIG_MACH_NAS100D)   += nas100d-setup.o
+@@ -28,6 +29,7 @@ obj-$(CONFIG_MACH_NAS100D)   += nas100d-se

  obj-$(CONFIG_MACH_DSMG600)      += dsmg600-setup.o
  obj-$(CONFIG_MACH_GATEWAY7001)        += gateway7001-setup.o
  obj-$(CONFIG_MACH_WG302V2)    += wg302v2-setup.o
  obj-$(CONFIG_MACH_DSMG600)      += dsmg600-setup.o
  obj-$(CONFIG_MACH_GATEWAY7001)        += gateway7001-setup.o
  obj-$(CONFIG_MACH_WG302V2)    += wg302v2-setup.o


@@ -134,11 +134,10 @@ index c195688..2e6bbf9 100644
  
  obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o
  obj-$(CONFIG_IXP4XX_QMGR)     += ixp4xx_qmgr.o
  
  obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o
  obj-$(CONFIG_IXP4XX_QMGR)     += ixp4xx_qmgr.o

-diff --git a/arch/arm/mach-ixp4xx/fsg-pci.c b/arch/arm/mach-ixp4xx/fsg-pci.c
-new file mode 100644
-index 0000000..f19f3f6
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/fsg-pci.c
+===================================================================

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

-+++ b/arch/arm/mach-ixp4xx/fsg-pci.c
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/fsg-pci.c

 @@ -0,0 +1,71 @@
 +/*
 + * arch/arch/mach-ixp4xx/fsg-pci.c
 @@ -0,0 +1,71 @@
 +/*
 + * arch/arch/mach-ixp4xx/fsg-pci.c


@@ -211,11 +210,10 @@ index 0000000..f19f3f6
 +}
 +
 +subsys_initcall(fsg_pci_init);
 +}
 +
 +subsys_initcall(fsg_pci_init);

-diff --git a/arch/arm/mach-ixp4xx/fsg-setup.c b/arch/arm/mach-ixp4xx/fsg-setup.c
-new file mode 100644
-index 0000000..0db3a90
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/fsg-setup.c
+===================================================================

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

-+++ b/arch/arm/mach-ixp4xx/fsg-setup.c
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/fsg-setup.c

 @@ -0,0 +1,276 @@
 +/*
 + * arch/arm/mach-ixp4xx/fsg-setup.c
 @@ -0,0 +1,276 @@
 +/*
 + * arch/arm/mach-ixp4xx/fsg-setup.c


@@ -493,11 +491,10 @@ index 0000000..0db3a90
 +      .init_machine   = fsg_init,
 +MACHINE_END
 +
 +      .init_machine   = fsg_init,
 +MACHINE_END
 +

-diff --git a/include/asm-arm/arch-ixp4xx/fsg.h b/include/asm-arm/arch-ixp4xx/fsg.h
-new file mode 100644
-index 0000000..c0100cc
+Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/fsg.h
+===================================================================

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

-+++ b/include/asm-arm/arch-ixp4xx/fsg.h
++++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/fsg.h

 @@ -0,0 +1,50 @@
 +/*
 + * include/asm-arm/arch-ixp4xx/fsg.h
 @@ -0,0 +1,50 @@
 +/*
 + * include/asm-arm/arch-ixp4xx/fsg.h


@@ -549,10 +546,10 @@ index 0000000..c0100cc
 +#define FSG_LED_USB_BIT               4
 +#define FSG_LED_RING_BIT      5
 +#define FSG_LED_SYNC_BIT      7
 +#define FSG_LED_USB_BIT               4
 +#define FSG_LED_RING_BIT      5
 +#define FSG_LED_SYNC_BIT      7

-diff --git a/include/asm-arm/arch-ixp4xx/hardware.h b/include/asm-arm/arch-ixp4xx/hardware.h
-index 73e8dc3..fa723a6 100644
---- a/include/asm-arm/arch-ixp4xx/hardware.h
-+++ b/include/asm-arm/arch-ixp4xx/hardware.h
+Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/hardware.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/hardware.h
++++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/hardware.h

 @@ -45,5 +45,6 @@
  #include "nslu2.h"
  #include "nas100d.h"
 @@ -45,5 +45,6 @@
  #include "nslu2.h"
  #include "nas100d.h"


@@ -560,10 +557,10 @@ index 73e8dc3..fa723a6 100644
 +#include "fsg.h"
  
  #endif  /* _ASM_ARCH_HARDWARE_H */
 +#include "fsg.h"
  
  #endif  /* _ASM_ARCH_HARDWARE_H */

-diff --git a/include/asm-arm/arch-ixp4xx/irqs.h b/include/asm-arm/arch-ixp4xx/irqs.h
-index 1180160..674af4a 100644
---- a/include/asm-arm/arch-ixp4xx/irqs.h
-+++ b/include/asm-arm/arch-ixp4xx/irqs.h
+Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/irqs.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/irqs.h
++++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/irqs.h

 @@ -128,4 +128,11 @@
  #define        IRQ_DSMG600_PCI_INTE    IRQ_IXP4XX_GPIO7
  #define        IRQ_DSMG600_PCI_INTF    IRQ_IXP4XX_GPIO6
 @@ -128,4 +128,11 @@
  #define        IRQ_DSMG600_PCI_INTE    IRQ_IXP4XX_GPIO7
  #define        IRQ_DSMG600_PCI_INTF    IRQ_IXP4XX_GPIO6


@@ -576,6 +573,3 @@ index 1180160..674af4a 100644
 +#define        IRQ_FSG_PCI_INTC        IRQ_IXP4XX_GPIO5
 +
  #endif
 +#define        IRQ_FSG_PCI_INTC        IRQ_IXP4XX_GPIO5
 +
  #endif

--- 
-1.5.2.5
-

diff --git a/target/linux/ixp4xx/patches-2.6.25/031-ixp4xx_fsg_led_driver.patch b/target/linux/ixp4xx/patches-2.6.25/031-ixp4xx_fsg_led_driver.patch
index 5e82d1f57e59efc7b5fc5b89df097402b41e7d4e..4830b198051f610fafaf2b4f5a453807a1ab7b58 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/031-ixp4xx_fsg_led_driver.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/031-ixp4xx_fsg_led_driver.patch
@@ -18,10 +18,10 @@ KernelVersion: v2.6.25-rc6-117-g457fb60
  3 files changed, 268 insertions(+), 0 deletions(-)
  create mode 100644 drivers/leds/leds-fsg.c
 
  3 files changed, 268 insertions(+), 0 deletions(-)
  create mode 100644 drivers/leds/leds-fsg.c
 

-diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
-index 859814f..aefbe04 100644
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
+Index: linux-2.6.25.1/drivers/leds/Kconfig
+===================================================================
+--- linux-2.6.25.1.orig/drivers/leds/Kconfig
++++ linux-2.6.25.1/drivers/leds/Kconfig

 @@ -46,6 +46,12 @@ config LEDS_SPITZ
          This option enables support for the LEDs on Sharp Zaurus
          SL-Cxx00 series (C1000, C3000, C3100).
 @@ -46,6 +46,12 @@ config LEDS_SPITZ
          This option enables support for the LEDs on Sharp Zaurus
          SL-Cxx00 series (C1000, C3000, C3100).


@@ -35,11 +35,11 @@ index 859814f..aefbe04 100644
  config LEDS_TOSA
        tristate "LED Support for the Sharp SL-6000 series"
        depends on LEDS_CLASS && PXA_SHARPSL
  config LEDS_TOSA
        tristate "LED Support for the Sharp SL-6000 series"
        depends on LEDS_CLASS && PXA_SHARPSL

-diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
-index 84ced3b..b17bd91 100644
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -21,6 +21,7 @@ obj-$(CONFIG_LEDS_GPIO)                      += leds-gpio.o
+Index: linux-2.6.25.1/drivers/leds/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/drivers/leds/Makefile
++++ linux-2.6.25.1/drivers/leds/Makefile
+@@ -22,6 +22,7 @@ obj-$(CONFIG_LEDS_GPIO)                      += leds-gpio.o

  obj-$(CONFIG_LEDS_CM_X270)              += leds-cm-x270.o
  obj-$(CONFIG_LEDS_CLEVO_MAIL)         += leds-clevo-mail.o
  obj-$(CONFIG_LEDS_HP6XX)              += leds-hp6xx.o
  obj-$(CONFIG_LEDS_CM_X270)              += leds-cm-x270.o
  obj-$(CONFIG_LEDS_CLEVO_MAIL)         += leds-clevo-mail.o
  obj-$(CONFIG_LEDS_HP6XX)              += leds-hp6xx.o


@@ -47,11 +47,10 @@ index 84ced3b..b17bd91 100644
  
  # LED Triggers
  obj-$(CONFIG_LEDS_TRIGGER_TIMER)      += ledtrig-timer.o
  
  # LED Triggers
  obj-$(CONFIG_LEDS_TRIGGER_TIMER)      += ledtrig-timer.o

-diff --git a/drivers/leds/leds-fsg.c b/drivers/leds/leds-fsg.c
-new file mode 100644
-index 0000000..a7421b8
+Index: linux-2.6.25.1/drivers/leds/leds-fsg.c
+===================================================================

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

-+++ b/drivers/leds/leds-fsg.c
++++ linux-2.6.25.1/drivers/leds/leds-fsg.c

 @@ -0,0 +1,261 @@
 +/*
 + * LED Driver for the Freecom FSG-3
 @@ -0,0 +1,261 @@
 +/*
 + * LED Driver for the Freecom FSG-3


@@ -314,6 +313,3 @@ index 0000000..a7421b8
 +MODULE_AUTHOR("Rod Whitby <rod@whitby.id.au>");
 +MODULE_DESCRIPTION("Freecom FSG-3 LED driver");
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Rod Whitby <rod@whitby.id.au>");
 +MODULE_DESCRIPTION("Freecom FSG-3 LED driver");
 +MODULE_LICENSE("GPL");

--- 
-1.5.2.5
-

diff --git a/target/linux/ixp4xx/patches-2.6.25/090-increase_entropy_pools.patch b/target/linux/ixp4xx/patches-2.6.25/090-increase_entropy_pools.patch
index 9a322a714a5b5bfe7eb9adaa17affcf3eac05f2f..492b84c0d953b738b4fd7719790824e39593c7b5 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/090-increase_entropy_pools.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/090-increase_entropy_pools.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.19/drivers/char/random.c
+Index: linux-2.6.25.1/drivers/char/random.c

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

---- linux-2.6.19.orig/drivers/char/random.c
-+++ linux-2.6.19/drivers/char/random.c
+--- linux-2.6.25.1.orig/drivers/char/random.c
++++ linux-2.6.25.1/drivers/char/random.c

 @@ -248,9 +248,9 @@
  /*
   * Configuration information
 @@ -248,9 +248,9 @@
  /*
   * Configuration information

diff --git a/target/linux/ixp4xx/patches-2.6.25/100-gateway7001_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/100-gateway7001_mac_plat_info.patch
index c7169ce2fb86de0a5dfe1b766c877ab85e9dad67..a32cb7067bae37ea6f06e1616b6dc658f1e7e08d 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/100-gateway7001_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/100-gateway7001_mac_plat_info.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/gateway7001-setup.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/gateway7001-setup.c
---- linux-2.6.23/arch/arm/mach-ixp4xx/gateway7001-setup.c      2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/gateway7001-setup.c 2007-10-22 15:09:33.000000000 +0200
-@@ -76,9 +76,36 @@
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/gateway7001-setup.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/gateway7001-setup.c
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/gateway7001-setup.c
+@@ -76,9 +76,36 @@ static struct platform_device gateway700

        .resource       = &gateway7001_uart_resource,
  };
  
        .resource       = &gateway7001_uart_resource,
  };
  

diff --git a/target/linux/ixp4xx/patches-2.6.25/101-wg302_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/101-wg302_mac_plat_info.patch
index 5209e72d5ca08ddb66b18de347eaece3062538aa..7b279e0c20269c6a2c8faea2b49f6db5d6435b36 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/101-wg302_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/101-wg302_mac_plat_info.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/wg302v2-setup.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/wg302v2-setup.c
---- linux-2.6.23/arch/arm/mach-ixp4xx/wg302v2-setup.c  2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/wg302v2-setup.c     2007-10-22 15:02:20.000000000 +0200
-@@ -77,9 +77,27 @@
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v2-setup.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/wg302v2-setup.c
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v2-setup.c
+@@ -77,9 +77,27 @@ static struct platform_device wg302v2_ua

        .resource       = &wg302v2_uart_resource,
  };
  
        .resource       = &wg302v2_uart_resource,
  };
  

diff --git a/target/linux/ixp4xx/patches-2.6.25/110-pronghorn_metro_support.patch b/target/linux/ixp4xx/patches-2.6.25/110-pronghorn_metro_support.patch
index fb895e02344f7c90fab44101077fc73804a34f4d..156fcb1adecb9111f66aed4eca6ad4cae12d7402 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/110-pronghorn_metro_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/110-pronghorn_metro_support.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig

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

---- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Kconfig     2008-03-12 21:21:23.000000000 +1030
-+++ linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig  2008-03-12 21:21:26.000000000 +1030
-@@ -57,6 +57,14 @@
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+@@ -57,6 +57,14 @@ config MACH_WG302V2

          WG302 v2 or WAG302 v2 Access Points. For more information
          on this platform, see http://openwrt.org
  
          WG302 v2 or WAG302 v2 Access Points. For more information
          on this platform, see http://openwrt.org
  


@@ -17,11 +17,11 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig
  config ARCH_IXDP425
        bool "IXDP425"
        help
  config ARCH_IXDP425
        bool "IXDP425"
        help

-Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile

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

---- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Makefile    2008-03-12 21:21:23.000000000 +1030
-+++ linux-2.6.24/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:26.000000000 +1030
-@@ -16,6 +16,7 @@
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+@@ -16,6 +16,7 @@ obj-pci-$(CONFIG_MACH_DSMG600)               += dsmg6

  obj-pci-$(CONFIG_MACH_GATEWAY7001)    += gateway7001-pci.o
  obj-pci-$(CONFIG_MACH_WG302V2)                += wg302v2-pci.o
  obj-pci-$(CONFIG_MACH_FSG)            += fsg-pci.o
  obj-pci-$(CONFIG_MACH_GATEWAY7001)    += gateway7001-pci.o
  obj-pci-$(CONFIG_MACH_WG302V2)                += wg302v2-pci.o
  obj-pci-$(CONFIG_MACH_FSG)            += fsg-pci.o


@@ -29,17 +29,18 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile
  
  obj-y += common.o
  
  
  obj-y += common.o
  

-@@ -30,5 +31,6 @@
+@@ -30,6 +31,7 @@ obj-$(CONFIG_MACH_DSMG600)      += dsmg6

  obj-$(CONFIG_MACH_GATEWAY7001)        += gateway7001-setup.o
  obj-$(CONFIG_MACH_WG302V2)    += wg302v2-setup.o
  obj-$(CONFIG_MACH_FSG)                += fsg-setup.o
 +obj-$(CONFIG_MACH_PRONGHORNMETRO)     += pronghornmetro-setup.o
  
  obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o
  obj-$(CONFIG_MACH_GATEWAY7001)        += gateway7001-setup.o
  obj-$(CONFIG_MACH_WG302V2)    += wg302v2-setup.o
  obj-$(CONFIG_MACH_FSG)                += fsg-setup.o
 +obj-$(CONFIG_MACH_PRONGHORNMETRO)     += pronghornmetro-setup.o
  
  obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o

-Index: linux-2.6.24/arch/arm/mach-ixp4xx/pronghornmetro-pci.c
+ obj-$(CONFIG_IXP4XX_QMGR)     += ixp4xx_qmgr.o
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-pci.c

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

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.24/arch/arm/mach-ixp4xx/pronghornmetro-pci.c     2008-03-12 21:21:26.000000000 +1030
+--- /dev/null
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-pci.c

 @@ -0,0 +1,74 @@
 +/*
 + * arch/arch/mach-ixp4xx/pronghornmetro-pci.c
 @@ -0,0 +1,74 @@
 +/*
 + * arch/arch/mach-ixp4xx/pronghornmetro-pci.c


@@ -115,10 +116,10 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/pronghornmetro-pci.c
 +}
 +
 +subsys_initcall(pronghornmetro_pci_init);
 +}
 +
 +subsys_initcall(pronghornmetro_pci_init);

-Index: linux-2.6.24/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c

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

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.24/arch/arm/mach-ixp4xx/pronghornmetro-setup.c   2008-03-12 21:21:26.000000000 +1030
+--- /dev/null
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c

 @@ -0,0 +1,147 @@
 +/*
 + * arch/arm/mach-ixp4xx/pronghornmetro-setup.c
 @@ -0,0 +1,147 @@
 +/*
 + * arch/arm/mach-ixp4xx/pronghornmetro-setup.c


@@ -267,11 +268,11 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
 +      .init_machine   = pronghornmetro_init,
 +MACHINE_END
 +#endif
 +      .init_machine   = pronghornmetro_init,
 +MACHINE_END
 +#endif

-Index: linux-2.6.24/Documentation/arm/IXP4xx
+Index: linux-2.6.25.1/Documentation/arm/IXP4xx

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

---- linux-2.6.24.orig/Documentation/arm/IXP4xx 2008-03-12 21:20:48.000000000 +1030
-+++ linux-2.6.24/Documentation/arm/IXP4xx      2008-03-12 21:21:26.000000000 +1030
-@@ -111,6 +111,9 @@
+--- linux-2.6.25.1.orig/Documentation/arm/IXP4xx
++++ linux-2.6.25.1/Documentation/arm/IXP4xx
+@@ -111,6 +111,9 @@ http://www.adiengineering.com/productsCo

     the platform has two mini-PCI slots used for 802.11[bga] cards.
     Finally, there is an IDE port hanging off the expansion bus.
  
     the platform has two mini-PCI slots used for 802.11[bga] cards.
     Finally, there is an IDE port hanging off the expansion bus.
  


@@ -281,11 +282,11 @@ Index: linux-2.6.24/Documentation/arm/IXP4xx
  Gateworks Avila Network Platform
  http://www.gateworks.com/avila_sbc.htm
  
  Gateworks Avila Network Platform
  http://www.gateworks.com/avila_sbc.htm
  

-Index: linux-2.6.24/include/asm-arm/arch-ixp4xx/uncompress.h
+Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/uncompress.h

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

---- linux-2.6.24.orig/include/asm-arm/arch-ixp4xx/uncompress.h 2008-03-12 21:20:48.000000000 +1030
-+++ linux-2.6.24/include/asm-arm/arch-ixp4xx/uncompress.h      2008-03-12 21:21:26.000000000 +1030
-@@ -41,7 +41,8 @@
+--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/uncompress.h
++++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/uncompress.h
+@@ -41,7 +41,8 @@ static __inline__ void __arch_decomp_set

         * Some boards are using UART2 as console
         */
        if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
         * Some boards are using UART2 as console
         */
        if (machine_is_adi_coyote() || machine_is_gtwx5715() ||

diff --git a/target/linux/ixp4xx/patches-2.6.25/111-pronghorn_metro_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/111-pronghorn_metro_mac_plat_info.patch
index 2fb376982a4128723499433091072ab7eae21efb..3a523d190b9eaa7de49718770e5e7ca43056f766 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/111-pronghorn_metro_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/111-pronghorn_metro_mac_plat_info.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/pronghornmetro-setup.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
---- linux-2.6.23/arch/arm/mach-ixp4xx/pronghornmetro-setup.c   2007-10-22 15:41:27.000000000 +0200
-+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c      2007-10-22 15:43:30.000000000 +0200
-@@ -104,9 +104,36 @@
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
+@@ -104,9 +104,36 @@ static struct platform_device pronghornm

        .resource               = pronghornmetro_pata_resources,
  };
  
        .resource               = pronghornmetro_pata_resources,
  };
  

diff --git a/target/linux/ixp4xx/patches-2.6.25/120-compex_support.patch b/target/linux/ixp4xx/patches-2.6.25/120-compex_support.patch
index c029ceda1b1152f7b8bf22a4a1d8aa22c1784d57..c0efcb01a84edacb2e5cafb6ea54657e4d9992c5 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/120-compex_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/120-compex_support.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig

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

---- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Kconfig     2008-03-12 21:21:26.000000000 +1030
-+++ linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig  2008-03-12 21:21:26.000000000 +1030
-@@ -65,6 +65,14 @@
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+@@ -65,6 +65,14 @@ config MACH_PRONGHORNMETRO

          Engineering Pronghorn Metro Platform. For more
          information on this platform, see <file:Documentation/arm/IXP4xx>.
  
          Engineering Pronghorn Metro Platform. For more
          information on this platform, see <file:Documentation/arm/IXP4xx>.
  


@@ -17,11 +17,11 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig
  config ARCH_IXDP425
        bool "IXDP425"
        help
  config ARCH_IXDP425
        bool "IXDP425"
        help

-Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile

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

---- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Makefile    2008-03-12 21:21:26.000000000 +1030
-+++ linux-2.6.24/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:26.000000000 +1030
-@@ -17,6 +17,7 @@
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+@@ -17,6 +17,7 @@ obj-pci-$(CONFIG_MACH_GATEWAY7001)   += ga

  obj-pci-$(CONFIG_MACH_WG302V2)                += wg302v2-pci.o
  obj-pci-$(CONFIG_MACH_FSG)            += fsg-pci.o
  obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
  obj-pci-$(CONFIG_MACH_WG302V2)                += wg302v2-pci.o
  obj-pci-$(CONFIG_MACH_FSG)            += fsg-pci.o
  obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o


@@ -29,17 +29,18 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile
  
  obj-y += common.o
  
  
  obj-y += common.o
  

-@@ -32,5 +33,6 @@
+@@ -32,6 +33,7 @@ obj-$(CONFIG_MACH_GATEWAY7001)       += gatewa

  obj-$(CONFIG_MACH_WG302V2)    += wg302v2-setup.o
  obj-$(CONFIG_MACH_FSG)                += fsg-setup.o
  obj-$(CONFIG_MACH_PRONGHORNMETRO)     += pronghornmetro-setup.o
 +obj-$(CONFIG_MACH_COMPEX)     += compex-setup.o
  
  obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o
  obj-$(CONFIG_MACH_WG302V2)    += wg302v2-setup.o
  obj-$(CONFIG_MACH_FSG)                += fsg-setup.o
  obj-$(CONFIG_MACH_PRONGHORNMETRO)     += pronghornmetro-setup.o
 +obj-$(CONFIG_MACH_COMPEX)     += compex-setup.o
  
  obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o

-Index: linux-2.6.24/arch/arm/mach-ixp4xx/compex-setup.c
+ obj-$(CONFIG_IXP4XX_QMGR)     += ixp4xx_qmgr.o
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/compex-setup.c

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

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.24/arch/arm/mach-ixp4xx/compex-setup.c   2008-03-12 21:21:26.000000000 +1030
+--- /dev/null
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/compex-setup.c

 @@ -0,0 +1,120 @@
 +/*
 + * arch/arm/mach-ixp4xx/compex-setup.c
 @@ -0,0 +1,120 @@
 +/*
 + * arch/arm/mach-ixp4xx/compex-setup.c


@@ -161,11 +162,11 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/compex-setup.c
 +      .init_machine   = compex_init,
 +MACHINE_END
 +#endif
 +      .init_machine   = compex_init,
 +MACHINE_END
 +#endif

-Index: linux-2.6.24/arch/arm/mach-ixp4xx/ixdp425-pci.c
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixdp425-pci.c

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

---- linux-2.6.24.orig/arch/arm/mach-ixp4xx/ixdp425-pci.c       2008-03-12 21:20:48.000000000 +1030
-+++ linux-2.6.24/arch/arm/mach-ixp4xx/ixdp425-pci.c    2008-03-12 21:21:26.000000000 +1030
-@@ -66,7 +66,7 @@
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/ixdp425-pci.c
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ixdp425-pci.c
+@@ -66,7 +66,7 @@ struct hw_pci ixdp425_pci __initdata = {

  int __init ixdp425_pci_init(void)
  {
        if (machine_is_ixdp425() || machine_is_ixcdp1100() ||
  int __init ixdp425_pci_init(void)
  {
        if (machine_is_ixdp425() || machine_is_ixcdp1100() ||


@@ -174,11 +175,11 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/ixdp425-pci.c
                pci_common_init(&ixdp425_pci);
        return 0;
  }
                pci_common_init(&ixdp425_pci);
        return 0;
  }

-Index: linux-2.6.24/arch/arm/tools/mach-types
+Index: linux-2.6.25.1/arch/arm/tools/mach-types

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

---- linux-2.6.24.orig/arch/arm/tools/mach-types        2008-03-12 21:20:48.000000000 +1030
-+++ linux-2.6.24/arch/arm/tools/mach-types     2008-03-12 21:21:26.000000000 +1030
-@@ -1278,7 +1278,7 @@
+--- linux-2.6.25.1.orig/arch/arm/tools/mach-types
++++ linux-2.6.25.1/arch/arm/tools/mach-types
+@@ -1276,7 +1276,7 @@ oiab                     MACH_OIAB               OIAB                    1269

  smdk6400              MACH_SMDK6400           SMDK6400                1270
  nokia_n800            MACH_NOKIA_N800         NOKIA_N800              1271
  greenphone            MACH_GREENPHONE         GREENPHONE              1272
  smdk6400              MACH_SMDK6400           SMDK6400                1270
  nokia_n800            MACH_NOKIA_N800         NOKIA_N800              1271
  greenphone            MACH_GREENPHONE         GREENPHONE              1272

diff --git a/target/linux/ixp4xx/patches-2.6.25/121-compex_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/121-compex_mac_plat_info.patch
index 081349ad3d597ff669053e39605c475e67aa922d..ffca727f2a6344c4e2bd0ba800717505d93a449b 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/121-compex_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/121-compex_mac_plat_info.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/compex-setup.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/compex-setup.c
---- linux-2.6.23/arch/arm/mach-ixp4xx/compex-setup.c   2007-10-23 18:39:29.000000000 +0200
-+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/compex-setup.c      2007-10-23 18:45:34.000000000 +0200
-@@ -90,9 +90,36 @@
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/compex-setup.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/compex-setup.c
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/compex-setup.c
+@@ -90,9 +90,36 @@ static struct platform_device compex_uar

        .resource               = compex_uart_resources,
  };
  
        .resource               = compex_uart_resources,
  };
  

diff --git a/target/linux/ixp4xx/patches-2.6.25/130-wrt300nv2_support.patch b/target/linux/ixp4xx/patches-2.6.25/130-wrt300nv2_support.patch
index 30a7c55ae0cad829eac869b2be52c8db68c40ad3..dfb2546d7cd1290e4c61a01f66ad76f9fbd17fdf 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/130-wrt300nv2_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/130-wrt300nv2_support.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig

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

---- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Kconfig     2008-03-12 21:21:26.000000000 +1030
-+++ linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig  2008-03-12 21:21:27.000000000 +1030
-@@ -73,6 +73,14 @@
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+@@ -73,6 +73,14 @@ config MACH_COMPEX

          WP18 or NP18A boards. For more information on this
          platform, see http://openwrt.org
  
          WP18 or NP18A boards. For more information on this
          platform, see http://openwrt.org
  


@@ -17,11 +17,11 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig
  config ARCH_IXDP425
        bool "IXDP425"
        help
  config ARCH_IXDP425
        bool "IXDP425"
        help

-Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile

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

---- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Makefile    2008-03-12 21:21:26.000000000 +1030
-+++ linux-2.6.24/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:27.000000000 +1030
-@@ -18,6 +18,7 @@
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+@@ -18,6 +18,7 @@ obj-pci-$(CONFIG_MACH_WG302V2)               += wg302

  obj-pci-$(CONFIG_MACH_FSG)            += fsg-pci.o
  obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
  obj-pci-$(CONFIG_MACH_COMPEX)         += ixdp425-pci.o
  obj-pci-$(CONFIG_MACH_FSG)            += fsg-pci.o
  obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
  obj-pci-$(CONFIG_MACH_COMPEX)         += ixdp425-pci.o


@@ -29,17 +29,18 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile
  
  obj-y += common.o
  
  
  obj-y += common.o
  

-@@ -34,5 +35,6 @@
+@@ -34,6 +35,7 @@ obj-$(CONFIG_MACH_WG302V2)   += wg302v2-se

  obj-$(CONFIG_MACH_FSG)                += fsg-setup.o
  obj-$(CONFIG_MACH_PRONGHORNMETRO)     += pronghornmetro-setup.o
  obj-$(CONFIG_MACH_COMPEX)     += compex-setup.o
 +obj-$(CONFIG_MACH_WRT300NV2)  += wrt300nv2-setup.o
  
  obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o
  obj-$(CONFIG_MACH_FSG)                += fsg-setup.o
  obj-$(CONFIG_MACH_PRONGHORNMETRO)     += pronghornmetro-setup.o
  obj-$(CONFIG_MACH_COMPEX)     += compex-setup.o
 +obj-$(CONFIG_MACH_WRT300NV2)  += wrt300nv2-setup.o
  
  obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o

-Index: linux-2.6.24/arch/arm/mach-ixp4xx/wrt300nv2-pci.c
+ obj-$(CONFIG_IXP4XX_QMGR)     += ixp4xx_qmgr.o
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-pci.c

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

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.24/arch/arm/mach-ixp4xx/wrt300nv2-pci.c  2008-03-12 21:21:27.000000000 +1030
+--- /dev/null
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-pci.c

 @@ -0,0 +1,65 @@
 +/*
 + * arch/arch/mach-ixp4xx/wrt300nv2-pci.c
 @@ -0,0 +1,65 @@
 +/*
 + * arch/arch/mach-ixp4xx/wrt300nv2-pci.c


@@ -106,10 +107,10 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/wrt300nv2-pci.c
 +}
 +
 +subsys_initcall(wrt300nv2_pci_init);
 +}
 +
 +subsys_initcall(wrt300nv2_pci_init);

-Index: linux-2.6.24/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-setup.c

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

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.24/arch/arm/mach-ixp4xx/wrt300nv2-setup.c        2008-03-12 21:21:27.000000000 +1030
+--- /dev/null
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-setup.c

 @@ -0,0 +1,108 @@
 +/*
 + * arch/arm/mach-ixp4xx/wrt300nv2-setup.c
 @@ -0,0 +1,108 @@
 +/*
 + * arch/arm/mach-ixp4xx/wrt300nv2-setup.c


@@ -219,11 +220,11 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
 +      .init_machine   = wrt300nv2_init,
 +MACHINE_END
 +#endif
 +      .init_machine   = wrt300nv2_init,
 +MACHINE_END
 +#endif

-Index: linux-2.6.24/include/asm-arm/arch-ixp4xx/uncompress.h
+Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/uncompress.h

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

---- linux-2.6.24.orig/include/asm-arm/arch-ixp4xx/uncompress.h 2008-03-12 21:21:26.000000000 +1030
-+++ linux-2.6.24/include/asm-arm/arch-ixp4xx/uncompress.h      2008-03-12 21:21:27.000000000 +1030
-@@ -42,7 +42,7 @@
+--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/uncompress.h
++++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/uncompress.h
+@@ -42,7 +42,7 @@ static __inline__ void __arch_decomp_set

         */
        if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
                         machine_is_gateway7001() || machine_is_wg302v2() ||
         */
        if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
                         machine_is_gateway7001() || machine_is_wg302v2() ||

diff --git a/target/linux/ixp4xx/patches-2.6.25/131-wrt300nv2_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/131-wrt300nv2_mac_plat_info.patch
index 24dad0aea935092161e0fb419c11fd6025bb39b4..69f5246173257422ffd68ba62c017b4e5bba2d1f 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/131-wrt300nv2_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/131-wrt300nv2_mac_plat_info.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/wrt300nv2-setup.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
---- linux-2.6.23/arch/arm/mach-ixp4xx/wrt300nv2-setup.c        2007-10-23 19:20:08.000000000 +0200
-+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/wrt300nv2-setup.c   2007-10-23 19:22:19.000000000 +0200
-@@ -76,9 +76,36 @@
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
+@@ -76,9 +76,36 @@ static struct platform_device wrt300nv2_

        .resource       = &wrt300nv2_uart_resource,
  };
  
        .resource       = &wrt300nv2_uart_resource,
  };
  

diff --git a/target/linux/ixp4xx/patches-2.6.25/140-sidewinder_support.patch b/target/linux/ixp4xx/patches-2.6.25/140-sidewinder_support.patch
index a83c421cbf7f276854d24fc5792b44d63e7baf5a..507007ee85ae81ccd2cf0fc5ef84b2de539db682 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/140-sidewinder_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/140-sidewinder_support.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Kconfig linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Kconfig
---- linux-2.6.23/arch/arm/mach-ixp4xx/Kconfig  2007-10-23 19:20:08.000000000 +0200
-+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Kconfig     2007-10-23 19:26:46.000000000 +0200
-@@ -65,6 +65,14 @@
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+@@ -65,6 +65,14 @@ config MACH_PRONGHORNMETRO

          Engineering Pronghorn Metro Platform. For more
          information on this platform, see <file:Documentation/arm/IXP4xx>.
  
          Engineering Pronghorn Metro Platform. For more
          information on this platform, see <file:Documentation/arm/IXP4xx>.
  


@@ -16,7 +17,7 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Kconfig linux-2.6.23-owrt/arch/arm/m
  config MACH_COMPEX
        bool "Compex WP18 / NP18A"
        select PCI
  config MACH_COMPEX
        bool "Compex WP18 / NP18A"
        select PCI

-@@ -163,7 +171,7 @@
+@@ -163,7 +171,7 @@ config MACH_FSG

  #
  config CPU_IXP46X
        bool
  #
  config CPU_IXP46X
        bool


@@ -25,10 +26,11 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Kconfig linux-2.6.23-owrt/arch/arm/m
        default y
  
  config CPU_IXP43X
        default y
  
  config CPU_IXP43X

-diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Makefile linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Makefile
---- linux-2.6.23/arch/arm/mach-ixp4xx/Makefile 2007-10-23 19:20:08.000000000 +0200
-+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Makefile    2007-10-23 19:23:52.000000000 +0200
-@@ -19,6 +19,7 @@
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+@@ -19,6 +19,7 @@ obj-pci-$(CONFIG_MACH_FSG)           += fsg-pci.o

  obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
  obj-pci-$(CONFIG_MACH_COMPEX)         += ixdp425-pci.o
  obj-pci-$(CONFIG_MACH_WRT300NV2)              += wrt300nv2-pci.o
  obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
  obj-pci-$(CONFIG_MACH_COMPEX)         += ixdp425-pci.o
  obj-pci-$(CONFIG_MACH_WRT300NV2)              += wrt300nv2-pci.o


@@ -36,7 +38,7 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Makefile linux-2.6.23-owrt/arch/arm/
  
  obj-y += common.o
  
  
  obj-y += common.o
  

-@@ -36,6 +37,7 @@
+@@ -36,6 +37,7 @@ obj-$(CONFIG_MACH_FSG)               += fsg-setup.o

  obj-$(CONFIG_MACH_PRONGHORNMETRO)     += pronghornmetro-setup.o
  obj-$(CONFIG_MACH_COMPEX)     += compex-setup.o
  obj-$(CONFIG_MACH_WRT300NV2)  += wrt300nv2-setup.o
  obj-$(CONFIG_MACH_PRONGHORNMETRO)     += pronghornmetro-setup.o
  obj-$(CONFIG_MACH_COMPEX)     += compex-setup.o
  obj-$(CONFIG_MACH_WRT300NV2)  += wrt300nv2-setup.o


@@ -44,9 +46,10 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Makefile linux-2.6.23-owrt/arch/arm/
  
  obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o
  obj-$(CONFIG_IXP4XX_QMGR)     += ixp4xx_qmgr.o
  
  obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o
  obj-$(CONFIG_IXP4XX_QMGR)     += ixp4xx_qmgr.o

-diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/sidewinder-pci.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/sidewinder-pci.c
---- linux-2.6.23/arch/arm/mach-ixp4xx/sidewinder-pci.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/sidewinder-pci.c    2007-10-23 19:23:52.000000000 +0200
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/sidewinder-pci.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/sidewinder-pci.c

 @@ -0,0 +1,71 @@
 +/*
 + * arch/arch/mach-ixp4xx/pronghornmetro-pci.c
 @@ -0,0 +1,71 @@
 +/*
 + * arch/arch/mach-ixp4xx/pronghornmetro-pci.c


@@ -119,9 +122,10 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/sidewinder-pci.c linux-2.6.23-owrt/a
 +}
 +
 +subsys_initcall(sidewinder_pci_init);
 +}
 +
 +subsys_initcall(sidewinder_pci_init);

-diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/sidewinder-setup.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/sidewinder-setup.c
---- linux-2.6.23/arch/arm/mach-ixp4xx/sidewinder-setup.c       1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/sidewinder-setup.c  2007-10-23 19:23:52.000000000 +0200
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/sidewinder-setup.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/sidewinder-setup.c

 @@ -0,0 +1,115 @@
 +/*
 + * arch/arm/mach-ixp4xx/sidewinder-setup.c
 @@ -0,0 +1,115 @@
 +/*
 + * arch/arm/mach-ixp4xx/sidewinder-setup.c

diff --git a/target/linux/ixp4xx/patches-2.6.25/150-lanready_ap1000_support.patch b/target/linux/ixp4xx/patches-2.6.25/150-lanready_ap1000_support.patch
index 953ce3c4124a9525dcba20e495f526576b591eee..6cfc5beb51eabf84e4d5709bf794c23093698cff 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/150-lanready_ap1000_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/150-lanready_ap1000_support.patch
@@ -1,6 +1,7 @@
-diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/ap1000-setup.c linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/ap1000-setup.c
---- linux-2.6.23.1/arch/arm/mach-ixp4xx/ap1000-setup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/ap1000-setup.c    2007-11-14 13:58:58.000000000 +0100
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ap1000-setup.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ap1000-setup.c

 @@ -0,0 +1,151 @@
 +/*
 + * arch/arm/mach-ixp4xx/ap1000-setup.c
 @@ -0,0 +1,151 @@
 +/*
 + * arch/arm/mach-ixp4xx/ap1000-setup.c


@@ -153,10 +154,11 @@ diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/ap1000-setup.c linux-2.6.23.1-owrt
 +      .init_machine   = ap1000_init,
 +MACHINE_END
 +#endif
 +      .init_machine   = ap1000_init,
 +MACHINE_END
 +#endif

-diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/ixdp425-pci.c linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/ixdp425-pci.c
---- linux-2.6.23.1/arch/arm/mach-ixp4xx/ixdp425-pci.c  2007-11-14 13:15:50.000000000 +0100
-+++ linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/ixdp425-pci.c     2007-11-14 13:27:16.000000000 +0100
-@@ -66,7 +66,8 @@
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixdp425-pci.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/ixdp425-pci.c
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ixdp425-pci.c
+@@ -66,7 +66,8 @@ struct hw_pci ixdp425_pci __initdata = {

  int __init ixdp425_pci_init(void)
  {
        if (machine_is_ixdp425() || machine_is_ixcdp1100() ||
  int __init ixdp425_pci_init(void)
  {
        if (machine_is_ixdp425() || machine_is_ixcdp1100() ||


@@ -166,10 +168,11 @@ diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/ixdp425-pci.c linux-2.6.23.1-owrt/
                pci_common_init(&ixdp425_pci);
        return 0;
  }
                pci_common_init(&ixdp425_pci);
        return 0;
  }

-diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/Kconfig linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/Kconfig
---- linux-2.6.23.1/arch/arm/mach-ixp4xx/Kconfig        2007-11-14 13:15:50.000000000 +0100
-+++ linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/Kconfig   2007-11-14 13:25:07.000000000 +0100
-@@ -89,6 +89,14 @@
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+@@ -89,6 +89,14 @@ config MACH_WRT300NV2

          WRT300N v2 router. For more information on this
          platform, see http://openwrt.org
  
          WRT300N v2 router. For more information on this
          platform, see http://openwrt.org
  


@@ -184,10 +187,11 @@ diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/Kconfig linux-2.6.23.1-owrt/arch/a
  config ARCH_IXDP425
        bool "IXDP425"
        help
  config ARCH_IXDP425
        bool "IXDP425"
        help

-diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/Makefile linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/Makefile
---- linux-2.6.23.1/arch/arm/mach-ixp4xx/Makefile       2007-11-14 13:15:50.000000000 +0100
-+++ linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/Makefile  2007-11-14 13:31:29.000000000 +0100
-@@ -20,6 +20,7 @@
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+@@ -20,6 +20,7 @@ obj-pci-$(CONFIG_MACH_PRONGHORNMETRO)        +=

  obj-pci-$(CONFIG_MACH_COMPEX)         += ixdp425-pci.o
  obj-pci-$(CONFIG_MACH_WRT300NV2)              += wrt300nv2-pci.o
  obj-pci-$(CONFIG_MACH_SIDEWINDER)             += sidewinder-pci.o
  obj-pci-$(CONFIG_MACH_COMPEX)         += ixdp425-pci.o
  obj-pci-$(CONFIG_MACH_WRT300NV2)              += wrt300nv2-pci.o
  obj-pci-$(CONFIG_MACH_SIDEWINDER)             += sidewinder-pci.o


@@ -195,10 +199,11 @@ diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/Makefile linux-2.6.23.1-owrt/arch/
  
  obj-y += common.o
  
  
  obj-y += common.o
  

-@@ -38,5 +39,6 @@
+@@ -38,6 +39,7 @@ obj-$(CONFIG_MACH_PRONGHORNMETRO)    += pro

  obj-$(CONFIG_MACH_COMPEX)     += compex-setup.o
  obj-$(CONFIG_MACH_WRT300NV2)  += wrt300nv2-setup.o
  obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
 +obj-$(CONFIG_MACH_AP1000)     += ap1000-setup.o
  
  obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o
  obj-$(CONFIG_MACH_COMPEX)     += compex-setup.o
  obj-$(CONFIG_MACH_WRT300NV2)  += wrt300nv2-setup.o
  obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
 +obj-$(CONFIG_MACH_AP1000)     += ap1000-setup.o
  
  obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o

+ obj-$(CONFIG_IXP4XX_QMGR)     += ixp4xx_qmgr.o

diff --git a/target/linux/ixp4xx/patches-2.6.25/151-lanready_ap1000_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/151-lanready_ap1000_mac_plat_info.patch
index 2ab59ff066a06d907aa2cd57350b54c045da5daf..2d1a5f2a2928f23b7a54b576315136410fa7403f 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/151-lanready_ap1000_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/151-lanready_ap1000_mac_plat_info.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/ap1000-setup.c linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/ap1000-setup.c
---- linux-2.6.23.1/arch/arm/mach-ixp4xx/ap1000-setup.c 2007-11-14 14:11:10.000000000 +0100
-+++ linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/ap1000-setup.c    2007-11-14 14:09:30.000000000 +0100
-@@ -90,9 +90,37 @@
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ap1000-setup.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/ap1000-setup.c
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ap1000-setup.c
+@@ -90,9 +90,37 @@ static struct platform_device ap1000_uar

        .resource               = ap1000_uart_resources
  };
  
        .resource               = ap1000_uart_resources
  };
  

diff --git a/target/linux/ixp4xx/patches-2.6.25/160-wg302v1_support.patch b/target/linux/ixp4xx/patches-2.6.25/160-wg302v1_support.patch
index 379b5aa578e02ed2009be6fd296832640c2086cb..0b54355a7b659be59ceb611cb73ea9269acf3508 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/160-wg302v1_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/160-wg302v1_support.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig

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

---- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Kconfig     2008-03-12 21:21:28.000000000 +1030
-+++ linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig  2008-03-12 21:21:29.000000000 +1030
-@@ -49,6 +49,14 @@
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+@@ -49,6 +49,14 @@ config MACH_GATEWAY7001

          7001 Access Point. For more information on this platform,
          see http://openwrt.org
  
          7001 Access Point. For more information on this platform,
          see http://openwrt.org
  


@@ -17,11 +17,11 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig
  config MACH_WG302V2
        bool "Netgear WG302 v2 / WAG302 v2"
        select PCI
  config MACH_WG302V2
        bool "Netgear WG302 v2 / WAG302 v2"
        select PCI

-Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile

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

---- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Makefile    2008-03-12 21:21:28.000000000 +1030
-+++ linux-2.6.24/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:29.000000000 +1030
-@@ -14,6 +14,7 @@
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+@@ -14,6 +14,7 @@ obj-pci-$(CONFIG_MACH_NSLU2)         += nslu2-p

  obj-pci-$(CONFIG_MACH_NAS100D)                += nas100d-pci.o
  obj-pci-$(CONFIG_MACH_DSMG600)                += dsmg600-pci.o
  obj-pci-$(CONFIG_MACH_GATEWAY7001)    += gateway7001-pci.o
  obj-pci-$(CONFIG_MACH_NAS100D)                += nas100d-pci.o
  obj-pci-$(CONFIG_MACH_DSMG600)                += dsmg600-pci.o
  obj-pci-$(CONFIG_MACH_GATEWAY7001)    += gateway7001-pci.o


@@ -29,18 +29,18 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile
  obj-pci-$(CONFIG_MACH_WG302V2)                += wg302v2-pci.o
  obj-pci-$(CONFIG_MACH_FSG)            += fsg-pci.o
  obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
  obj-pci-$(CONFIG_MACH_WG302V2)                += wg302v2-pci.o
  obj-pci-$(CONFIG_MACH_FSG)            += fsg-pci.o
  obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o

-@@ -33,6 +34,7 @@
- obj-$(CONFIG_MACH_NAS100D)    += nas100d-setup.o nas100d-power.o
- obj-$(CONFIG_MACH_DSMG600)      += dsmg600-setup.o dsmg600-power.o
+@@ -33,6 +34,7 @@ obj-$(CONFIG_MACH_NSLU2)     += nslu2-setup.
+ obj-$(CONFIG_MACH_NAS100D)    += nas100d-setup.o
+ obj-$(CONFIG_MACH_DSMG600)      += dsmg600-setup.o

  obj-$(CONFIG_MACH_GATEWAY7001)        += gateway7001-setup.o
 +obj-$(CONFIG_MACH_WG302V1)    += wg302v1-setup.o
  obj-$(CONFIG_MACH_WG302V2)    += wg302v2-setup.o
  obj-$(CONFIG_MACH_FSG)                += fsg-setup.o
  obj-$(CONFIG_MACH_PRONGHORNMETRO)     += pronghornmetro-setup.o
  obj-$(CONFIG_MACH_GATEWAY7001)        += gateway7001-setup.o
 +obj-$(CONFIG_MACH_WG302V1)    += wg302v1-setup.o
  obj-$(CONFIG_MACH_WG302V2)    += wg302v2-setup.o
  obj-$(CONFIG_MACH_FSG)                += fsg-setup.o
  obj-$(CONFIG_MACH_PRONGHORNMETRO)     += pronghornmetro-setup.o

-Index: linux-2.6.24/arch/arm/mach-ixp4xx/wg302v1-pci.c
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-pci.c

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

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.24/arch/arm/mach-ixp4xx/wg302v1-pci.c    2008-03-12 21:21:29.000000000 +1030
+--- /dev/null
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-pci.c

 @@ -0,0 +1,63 @@
 +/*
 + * arch/arch/mach-ixp4xx/wg302v1-pci.c
 @@ -0,0 +1,63 @@
 +/*
 + * arch/arch/mach-ixp4xx/wg302v1-pci.c


@@ -105,10 +105,10 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/wg302v1-pci.c
 +}
 +
 +subsys_initcall(wg302v1_pci_init);
 +}
 +
 +subsys_initcall(wg302v1_pci_init);

-Index: linux-2.6.24/arch/arm/mach-ixp4xx/wg302v1-setup.c
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c

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

---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.24/arch/arm/mach-ixp4xx/wg302v1-setup.c  2008-03-12 21:21:29.000000000 +1030
+--- /dev/null
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c

 @@ -0,0 +1,109 @@
 +/*
 + * arch/arm/mach-ixp4xx/wg302v1-setup.c
 @@ -0,0 +1,109 @@
 +/*
 + * arch/arm/mach-ixp4xx/wg302v1-setup.c

diff --git a/target/linux/ixp4xx/patches-2.6.25/161-wg302v1_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/161-wg302v1_mac_plat_info.patch
index 250d85e6d9af85d3f3eef23ecdd93967ae56f135..03314b54577ab3b46774f63d1f4ddcb4ec46abbf 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/161-wg302v1_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/161-wg302v1_mac_plat_info.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.23.12/arch/arm/mach-ixp4xx/wg302v1-setup.c linux-2.6.23.12-owrt/arch/arm/mach-ixp4xx/wg302v1-setup.c
---- linux-2.6.23.12/arch/arm/mach-ixp4xx/wg302v1-setup.c       2008-01-14 23:06:42.000000000 +0100
-+++ linux-2.6.23.12-owrt/arch/arm/mach-ixp4xx/wg302v1-setup.c  2008-01-14 23:03:16.000000000 +0100
-@@ -77,9 +77,27 @@
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/wg302v1-setup.c
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c
+@@ -77,9 +77,27 @@ static struct platform_device wg302v1_ua

        .resource       = &wg302v1_uart_resource,
  };
  
        .resource       = &wg302v1_uart_resource,
  };
  

diff --git a/target/linux/ixp4xx/patches-2.6.25/162-wg302v1_mem_fixup.patch b/target/linux/ixp4xx/patches-2.6.25/162-wg302v1_mem_fixup.patch
index b370088aec433d0725529ad7990b2089cb34148d..db8923d36c085536291e3fad74899d1895cc8b49 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/162-wg302v1_mem_fixup.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/162-wg302v1_mem_fixup.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.23.12/arch/arm/mach-ixp4xx/wg302v1-setup.c linux-2.6.23.12-owrt/arch/arm/mach-ixp4xx/wg302v1-setup.c
---- linux-2.6.23.12/arch/arm/mach-ixp4xx/wg302v1-setup.c       2008-01-14 23:12:03.000000000 +0100
-+++ linux-2.6.23.12-owrt/arch/arm/mach-ixp4xx/wg302v1-setup.c  2008-01-14 23:11:34.000000000 +0100
-@@ -100,6 +100,36 @@
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/wg302v1-setup.c
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c
+@@ -100,6 +100,36 @@ static struct platform_device *wg302v1_d

        &wg302_eth[0],
  };
  
        &wg302_eth[0],
  };
  


@@ -38,7 +39,7 @@ diff -Nur linux-2.6.23.12/arch/arm/mach-ixp4xx/wg302v1-setup.c linux-2.6.23.12-o
  static void __init wg302v1_init(void)
  {
        ixp4xx_sys_init();
  static void __init wg302v1_init(void)
  {
        ixp4xx_sys_init();

-@@ -118,6 +148,7 @@
+@@ -118,6 +148,7 @@ MACHINE_START(WG302V1, "Netgear WG302 v1

        /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
        .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
        .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
        /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
        .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
        .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,

diff --git a/target/linux/ixp4xx/patches-2.6.25/170-ixdpg425_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/170-ixdpg425_mac_plat_info.patch
index cb6551680cb1699233302409ec43bb8d4c7a7d0b..ec72314a88b6f1adb0dac7948a25454d4b9d0f12 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/170-ixdpg425_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/170-ixdpg425_mac_plat_info.patch
@@ -1,6 +1,8 @@
---- linux-2.6.24.2/arch/arm/mach-ixp4xx/coyote-setup.c 2008-02-11 06:51:11.000000000 +0100
-+++ linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/coyote-setup.c    2008-04-07 12:39:48.000000000 +0200
-@@ -73,9 +73,37 @@
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/coyote-setup.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/coyote-setup.c
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/coyote-setup.c
+@@ -73,9 +73,37 @@ static struct platform_device coyote_uar

        .resource       = &coyote_uart_resource,
  };
  
        .resource       = &coyote_uart_resource,
  };
  

diff --git a/target/linux/ixp4xx/patches-2.6.25/180-tw5334_support.patch b/target/linux/ixp4xx/patches-2.6.25/180-tw5334_support.patch
index c02866b597a080721f75ba64738c0ed1e9284b15..3b7ad83c969999d38dd08f31f54d8e1a1b43d656 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/180-tw5334_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/180-tw5334_support.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/Kconfig linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/Kconfig
---- linux-2.6.24.2/arch/arm/mach-ixp4xx/Kconfig        2008-04-09 01:34:46.000000000 +0200
-+++ linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/Kconfig   2008-04-09 00:06:48.000000000 +0200
-@@ -150,6 +150,14 @@
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+@@ -150,6 +150,14 @@ config ARCH_PRPMC1100

          PrPCM1100 Processor Mezanine Module. For more information on
          this platform, see <file:Documentation/arm/IXP4xx>.
  
          PrPCM1100 Processor Mezanine Module. For more information on
          this platform, see <file:Documentation/arm/IXP4xx>.
  


@@ -16,10 +17,11 @@ diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/Kconfig linux-2.6.24.2-owrt/arch/a
  config MACH_NAS100D
        bool
        prompt "NAS100D"
  config MACH_NAS100D
        bool
        prompt "NAS100D"

-diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/Makefile linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/Makefile
---- linux-2.6.24.2/arch/arm/mach-ixp4xx/Makefile       2008-04-09 01:34:46.000000000 +0200
-+++ linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/Makefile  2008-04-09 00:07:45.000000000 +0200
-@@ -22,6 +22,7 @@
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+@@ -22,6 +22,7 @@ obj-pci-$(CONFIG_MACH_COMPEX)                += ixdp42

  obj-pci-$(CONFIG_MACH_WRT300NV2)              += wrt300nv2-pci.o
  obj-pci-$(CONFIG_MACH_SIDEWINDER)             += sidewinder-pci.o
  obj-pci-$(CONFIG_MACH_AP1000)         += ixdp425-pci.o
  obj-pci-$(CONFIG_MACH_WRT300NV2)              += wrt300nv2-pci.o
  obj-pci-$(CONFIG_MACH_SIDEWINDER)             += sidewinder-pci.o
  obj-pci-$(CONFIG_MACH_AP1000)         += ixdp425-pci.o


@@ -27,7 +29,7 @@ diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/Makefile linux-2.6.24.2-owrt/arch/
  
  obj-y += common.o
  
  
  obj-y += common.o
  

-@@ -42,6 +43,7 @@
+@@ -42,6 +43,7 @@ obj-$(CONFIG_MACH_COMPEX)    += compex-setu

  obj-$(CONFIG_MACH_WRT300NV2)  += wrt300nv2-setup.o
  obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
  obj-$(CONFIG_MACH_AP1000)     += ap1000-setup.o
  obj-$(CONFIG_MACH_WRT300NV2)  += wrt300nv2-setup.o
  obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
  obj-$(CONFIG_MACH_AP1000)     += ap1000-setup.o


@@ -35,9 +37,10 @@ diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/Makefile linux-2.6.24.2-owrt/arch/
  
  obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o
  obj-$(CONFIG_IXP4XX_QMGR)     += ixp4xx_qmgr.o
  
  obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o
  obj-$(CONFIG_IXP4XX_QMGR)     += ixp4xx_qmgr.o

-diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/tw5334-setup.c linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/tw5334-setup.c
---- linux-2.6.24.2/arch/arm/mach-ixp4xx/tw5334-setup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/tw5334-setup.c    2008-04-09 01:58:52.000000000 +0200
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/tw5334-setup.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/tw5334-setup.c

 @@ -0,0 +1,162 @@
 +/*
 + * arch/arm/mach-ixp4xx/tw5334-setup.c
 @@ -0,0 +1,162 @@
 +/*
 + * arch/arm/mach-ixp4xx/tw5334-setup.c


@@ -201,9 +204,10 @@ diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/tw5334-setup.c linux-2.6.24.2-owrt
 +      .init_machine   = tw5334_init,
 +MACHINE_END
 +#endif
 +      .init_machine   = tw5334_init,
 +MACHINE_END
 +#endif

-diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/tw5334-pci.c linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/tw5334-pci.c
---- linux-2.6.24.2/arch/arm/mach-ixp4xx/tw5334-pci.c   1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/tw5334-pci.c      2008-04-09 00:35:32.000000000 +0200
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/tw5334-pci.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/tw5334-pci.c

 @@ -0,0 +1,69 @@
 +/*
 + * arch/arch/mach-ixp4xx/tw5334-pci.c
 @@ -0,0 +1,69 @@
 +/*
 + * arch/arch/mach-ixp4xx/tw5334-pci.c


@@ -274,9 +278,11 @@ diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/tw5334-pci.c linux-2.6.24.2-owrt/a
 +}
 +
 +subsys_initcall(tw5334_pci_init);
 +}
 +
 +subsys_initcall(tw5334_pci_init);

---- linux-2.6.24.2/include/asm-arm/arch-ixp4xx/uncompress.h    2008-04-07 08:59:19.000000000 +0200
-+++ linux-2.6.24.2-owrt/include/asm-arm/arch-ixp4xx/uncompress.h       2008-04-09 13:22:42.000000000 +0200
-@@ -42,7 +42,8 @@
+Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/uncompress.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/uncompress.h
++++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/uncompress.h
+@@ -42,7 +42,8 @@ static __inline__ void __arch_decomp_set

         */
        if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
                         machine_is_gateway7001() || machine_is_wg302v2() ||
         */
        if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
                         machine_is_gateway7001() || machine_is_wg302v2() ||

diff --git a/target/linux/ixp4xx/patches-2.6.25/190-cambria_support.patch b/target/linux/ixp4xx/patches-2.6.25/190-cambria_support.patch
index 4fbc1de8a6e7ef8fed92330f3441f9a47a892d99..ccd4045a8a4fdf53ec39f070ce99c298729c2a79 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/190-cambria_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/190-cambria_support.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/Kconfig linux-2.6.24.5-owrt/arch/arm/mach-ixp4xx/Kconfig
---- linux-2.6.24.5/arch/arm/mach-ixp4xx/Kconfig        2008-04-28 20:22:27.000000000 +0200
-+++ linux-2.6.24.5-owrt/arch/arm/mach-ixp4xx/Kconfig   2008-04-28 20:26:44.000000000 +0200
-@@ -25,6 +25,14 @@
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+@@ -25,6 +25,14 @@ config MACH_AVILA

          Avila Network Platform. For more information on this platform,
          see <file:Documentation/arm/IXP4xx>.
  
          Avila Network Platform. For more information on this platform,
          see <file:Documentation/arm/IXP4xx>.
  


@@ -16,7 +17,7 @@ diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/Kconfig linux-2.6.24.5-owrt/arch/a
  config MACH_LOFT
      bool "Loft"
      depends on MACH_AVILA
  config MACH_LOFT
      bool "Loft"
      depends on MACH_AVILA

-@@ -200,7 +208,7 @@
+@@ -200,7 +208,7 @@ config CPU_IXP46X

  
  config CPU_IXP43X
        bool
  
  config CPU_IXP43X
        bool


@@ -25,10 +26,11 @@ diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/Kconfig linux-2.6.24.5-owrt/arch/a
        default y
  
  config MACH_GTWX5715
        default y
  
  config MACH_GTWX5715

-diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/Makefile linux-2.6.24.5-owrt/arch/arm/mach-ixp4xx/Makefile
---- linux-2.6.24.5/arch/arm/mach-ixp4xx/Makefile       2008-04-28 20:22:27.000000000 +0200
-+++ linux-2.6.24.5-owrt/arch/arm/mach-ixp4xx/Makefile  2008-04-28 20:26:44.000000000 +0200
-@@ -7,6 +7,7 @@
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+@@ -7,6 +7,7 @@ obj-pci-n      :=

  
  obj-pci-$(CONFIG_ARCH_IXDP4XX)                += ixdp425-pci.o
  obj-pci-$(CONFIG_MACH_AVILA)          += avila-pci.o
  
  obj-pci-$(CONFIG_ARCH_IXDP4XX)                += ixdp425-pci.o
  obj-pci-$(CONFIG_MACH_AVILA)          += avila-pci.o


@@ -36,7 +38,7 @@ diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/Makefile linux-2.6.24.5-owrt/arch/
  obj-pci-$(CONFIG_MACH_IXDPG425)               += ixdpg425-pci.o
  obj-pci-$(CONFIG_ARCH_ADI_COYOTE)     += coyote-pci.o
  obj-pci-$(CONFIG_MACH_GTWX5715)               += gtwx5715-pci.o
  obj-pci-$(CONFIG_MACH_IXDPG425)               += ixdpg425-pci.o
  obj-pci-$(CONFIG_ARCH_ADI_COYOTE)     += coyote-pci.o
  obj-pci-$(CONFIG_MACH_GTWX5715)               += gtwx5715-pci.o

-@@ -28,6 +29,7 @@
+@@ -28,6 +29,7 @@ obj-y        += common.o

  
  obj-$(CONFIG_ARCH_IXDP4XX)    += ixdp425-setup.o
  obj-$(CONFIG_MACH_AVILA)      += avila-setup.o
  
  obj-$(CONFIG_ARCH_IXDP4XX)    += ixdp425-setup.o
  obj-$(CONFIG_MACH_AVILA)      += avila-setup.o


@@ -44,9 +46,10 @@ diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/Makefile linux-2.6.24.5-owrt/arch/
  obj-$(CONFIG_MACH_IXDPG425)   += coyote-setup.o
  obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-setup.o
  obj-$(CONFIG_MACH_GTWX5715)   += gtwx5715-setup.o
  obj-$(CONFIG_MACH_IXDPG425)   += coyote-setup.o
  obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-setup.o
  obj-$(CONFIG_MACH_GTWX5715)   += gtwx5715-setup.o

-diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/cambria-pci.c linux-2.6.24.5-owrt/arch/arm/mach-ixp4xx/cambria-pci.c
---- linux-2.6.24.5/arch/arm/mach-ixp4xx/cambria-pci.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.24.5-owrt/arch/arm/mach-ixp4xx/cambria-pci.c     2008-04-28 20:30:35.000000000 +0200
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/cambria-pci.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/cambria-pci.c

 @@ -0,0 +1,74 @@
 +/*
 + * arch/arch/mach-ixp4xx/cambria-pci.c
 @@ -0,0 +1,74 @@
 +/*
 + * arch/arch/mach-ixp4xx/cambria-pci.c


@@ -122,9 +125,10 @@ diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/cambria-pci.c linux-2.6.24.5-owrt/
 +}
 +
 +subsys_initcall(cambria_pci_init);
 +}
 +
 +subsys_initcall(cambria_pci_init);

-diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/cambria-setup.c linux-2.6.24.5-owrt/arch/arm/mach-ixp4xx/cambria-setup.c
---- linux-2.6.24.5/arch/arm/mach-ixp4xx/cambria-setup.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.24.5-owrt/arch/arm/mach-ixp4xx/cambria-setup.c   2008-04-28 21:07:16.000000000 +0200
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/cambria-setup.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/cambria-setup.c

 @@ -0,0 +1,250 @@
 +/*
 + * arch/arm/mach-ixp4xx/cambria-setup.c
 @@ -0,0 +1,250 @@
 +/*
 + * arch/arm/mach-ixp4xx/cambria-setup.c


@@ -376,9 +380,10 @@ diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/cambria-setup.c linux-2.6.24.5-owr
 +      .init_machine   = cambria_init,
 +MACHINE_END
 +#endif
 +      .init_machine   = cambria_init,
 +MACHINE_END
 +#endif

-diff -Nur linux-2.6.24.5/include/asm-arm/arch-ixp4xx/hardware.h linux-2.6.24.5-owrt/include/asm-arm/arch-ixp4xx/hardware.h
---- linux-2.6.24.5/include/asm-arm/arch-ixp4xx/hardware.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.24.5-owrt/include/asm-arm/arch-ixp4xx/hardware.h 2008-04-28 21:07:16.000000000 +0200
+Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/hardware.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/hardware.h
++++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/hardware.h

 @@ -18,7 +18,7 @@
  #define __ASM_ARCH_HARDWARE_H__
  
 @@ -18,7 +18,7 @@
  #define __ASM_ARCH_HARDWARE_H__
  

diff --git a/target/linux/ixp4xx/patches-2.6.25/200-npe_driver.patch b/target/linux/ixp4xx/patches-2.6.25/200-npe_driver.patch
index f2f53a0bc775903025a7483dc62ceaa3773c3439..4faad529ae0c4425ba0db452032ec9e9aa91e6f5 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/200-npe_driver.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/200-npe_driver.patch
@@ -1,7 +1,7 @@
-diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig
-index f9cc2b6..8eda6ee 100644
---- a/drivers/net/arm/Kconfig
-+++ b/drivers/net/arm/Kconfig
+Index: linux-2.6.25.1/drivers/net/arm/Kconfig
+===================================================================
+--- linux-2.6.25.1.orig/drivers/net/arm/Kconfig
++++ linux-2.6.25.1/drivers/net/arm/Kconfig

 @@ -47,3 +47,11 @@ config EP93XX_ETH
        help
          This is a driver for the ethernet hardware included in EP93xx CPUs.
 @@ -47,3 +47,11 @@ config EP93XX_ETH
        help
          This is a driver for the ethernet hardware included in EP93xx CPUs.


@@ -14,20 +14,19 @@ index f9cc2b6..8eda6ee 100644
 +      help
 +        Say Y here if you want to use built-in Ethernet ports
 +        on IXP4xx processor.
 +      help
 +        Say Y here if you want to use built-in Ethernet ports
 +        on IXP4xx processor.

-diff --git a/drivers/net/arm/Makefile b/drivers/net/arm/Makefile
-index a4c8682..7c812ac 100644
---- a/drivers/net/arm/Makefile
-+++ b/drivers/net/arm/Makefile
+Index: linux-2.6.25.1/drivers/net/arm/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/drivers/net/arm/Makefile
++++ linux-2.6.25.1/drivers/net/arm/Makefile

 @@ -9,3 +9,4 @@ obj-$(CONFIG_ARM_ETHER3)       += ether3.o
  obj-$(CONFIG_ARM_ETHER1)      += ether1.o
  obj-$(CONFIG_ARM_AT91_ETHER)  += at91_ether.o
  obj-$(CONFIG_EP93XX_ETH)      += ep93xx_eth.o
 +obj-$(CONFIG_IXP4XX_ETH)      += ixp4xx_eth.o
 @@ -9,3 +9,4 @@ obj-$(CONFIG_ARM_ETHER3)       += ether3.o
  obj-$(CONFIG_ARM_ETHER1)      += ether1.o
  obj-$(CONFIG_ARM_AT91_ETHER)  += at91_ether.o
  obj-$(CONFIG_EP93XX_ETH)      += ep93xx_eth.o
 +obj-$(CONFIG_IXP4XX_ETH)      += ixp4xx_eth.o

-diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c
-new file mode 100644
-index 0000000..c617b64
+Index: linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c
+===================================================================

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

-+++ b/drivers/net/arm/ixp4xx_eth.c
++++ linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c

 @@ -0,0 +1,1265 @@
 +/*
 + * Intel IXP4xx Ethernet driver for Linux
 @@ -0,0 +1,1265 @@
 +/*
 + * Intel IXP4xx Ethernet driver for Linux


@@ -1294,11 +1293,11 @@ index 0000000..c617b64
 +MODULE_ALIAS("platform:ixp4xx_eth");
 +module_init(eth_init_module);
 +module_exit(eth_cleanup_module);
 +MODULE_ALIAS("platform:ixp4xx_eth");
 +module_init(eth_init_module);
 +module_exit(eth_cleanup_module);

-diff --git a/arch/arm/mach-ixp4xx/ixp4xx_npe.c b/arch/arm/mach-ixp4xx/ixp4xx_npe.c
-index 83c137e..63a23fa 100644
---- a/arch/arm/mach-ixp4xx/ixp4xx_npe.c
-+++ b/arch/arm/mach-ixp4xx/ixp4xx_npe.c
-@@ -448,7 +448,9 @@ int npe_send_message(struct npe *npe, const void *msg, const char *what)
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/ixp4xx_npe.c
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c
+@@ -448,7 +448,9 @@ int npe_send_message(struct npe *npe, co

                return -ETIMEDOUT;
        }
  
                return -ETIMEDOUT;
        }
  


@@ -1308,7 +1307,7 @@ index 83c137e..63a23fa 100644
        return 0;
  }
  
        return 0;
  }
  

-@@ -484,7 +486,9 @@ int npe_recv_message(struct npe *npe, void *msg, const char *what)
+@@ -484,7 +486,9 @@ int npe_recv_message(struct npe *npe, vo

                return -ETIMEDOUT;
        }
  
                return -ETIMEDOUT;
        }
  


@@ -1318,11 +1317,11 @@ index 83c137e..63a23fa 100644
        return 0;
  }
  
        return 0;
  }
  

-diff --git a/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c b/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
-index e833013..fab94ea 100644
---- a/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
-+++ b/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
-@@ -184,6 +184,8 @@ void qmgr_release_queue(unsigned int queue)
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
+@@ -184,6 +184,8 @@ void qmgr_release_queue(unsigned int que

        case 3: mask[0] = 0xFF; break;
        }
  
        case 3: mask[0] = 0xFF; break;
        }
  

diff --git a/target/linux/ixp4xx/patches-2.6.25/201-npe_driver_print_license_location.patch b/target/linux/ixp4xx/patches-2.6.25/201-npe_driver_print_license_location.patch
index fad40334196cc8f89c4c393e1ec3aba5ab152d5a..dce76554acaa800423db7566c4d8e5d5ad529576 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/201-npe_driver_print_license_location.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/201-npe_driver_print_license_location.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/ixp4xx_npe.c linux-2.6.23-openwrt/arch/arm/mach-ixp4xx/ixp4xx_npe.c
---- linux-2.6.23/arch/arm/mach-ixp4xx/ixp4xx_npe.c     2007-10-22 22:18:15.000000000 +0200
-+++ linux-2.6.23-openwrt/arch/arm/mach-ixp4xx/ixp4xx_npe.c     2007-10-22 22:32:48.000000000 +0200
-@@ -585,6 +585,8 @@
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/ixp4xx_npe.c
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c
+@@ -592,6 +592,8 @@ int npe_load_firmware(struct npe *npe, c

        npe_reset(npe);
  #endif
  
        npe_reset(npe);
  #endif
  

diff --git a/target/linux/ixp4xx/patches-2.6.25/202-npe_driver_switch_support.patch b/target/linux/ixp4xx/patches-2.6.25/202-npe_driver_switch_support.patch
index 4e6c959d92fc7d420563537fd46bfb81a9a42509..93a5d2d1fca2c87f861aa0feadca3131640c99eb 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/202-npe_driver_switch_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/202-npe_driver_switch_support.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
+Index: linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c

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

---- linux-2.6.24.2.orig/drivers/net/arm/ixp4xx_eth.c
-+++ linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
+--- linux-2.6.25.1.orig/drivers/net/arm/ixp4xx_eth.c
++++ linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c

 @@ -165,14 +165,15 @@ struct port {
        struct net_device *netdev;
        struct napi_struct napi;
 @@ -165,14 +165,15 @@ struct port {
        struct net_device *netdev;
        struct napi_struct napi;


@@ -20,7 +20,7 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
  };
  
  /* NPE message structure */
  };
  
  /* NPE message structure */

-@@ -316,13 +317,14 @@ static void mdio_write(struct net_device
+@@ -316,12 +317,13 @@ static void mdio_write(struct net_device

        spin_unlock_irqrestore(&mdio_lock, flags);
  }
  
        spin_unlock_irqrestore(&mdio_lock, flags);
  }
  


@@ -32,12 +32,10 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
        int cycles = 0;
  
 -      mdio_write(dev, phy_id, MII_BMCR, port->mii_bmcr | BMCR_RESET);
        int cycles = 0;
  
 -      mdio_write(dev, phy_id, MII_BMCR, port->mii_bmcr | BMCR_RESET);

--

 +      mdio_write(dev, phy_id, MII_BMCR, port->mii_bmcr[idx] | BMCR_RESET);
 +      mdio_write(dev, phy_id, MII_BMCR, port->mii_bmcr[idx] | BMCR_RESET);

-+
+ 

        while (cycles < MAX_MII_RESET_RETRIES) {
                if (!(mdio_read(dev, phy_id, MII_BMCR) & BMCR_RESET)) {
        while (cycles < MAX_MII_RESET_RETRIES) {
                if (!(mdio_read(dev, phy_id, MII_BMCR) & BMCR_RESET)) {

- #if DEBUG_MDIO

 @@ -335,12 +337,12 @@ static void phy_reset(struct net_device 
                cycles++;
        }
 @@ -335,12 +337,12 @@ static void phy_reset(struct net_device 
                cycles++;
        }


@@ -107,7 +105,7 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
 +      }
 +}
 +#endif
 +      }
 +}
 +#endif

- 
++

 +static void phy_power_down(struct net_device *dev, int idx)
 +{
 +      struct port *port = netdev_priv(dev);
 +static void phy_power_down(struct net_device *dev, int idx)
 +{
 +      struct port *port = netdev_priv(dev);


@@ -121,13 +119,13 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
 +static void phy_power_up(struct net_device *dev, int idx)
 +{
 +      struct port *port = netdev_priv(dev);
 +static void phy_power_up(struct net_device *dev, int idx)
 +{
 +      struct port *port = netdev_priv(dev);

-+
+ 

 +      mdio_write(dev, port->mii[idx].phy_id, MII_BMCR, port->mii_bmcr[idx]);
 +}
  
  static void mdio_thread(struct work_struct *work)
  {
 +      mdio_write(dev, port->mii[idx].phy_id, MII_BMCR, port->mii_bmcr[idx]);
 +}
  
  static void mdio_thread(struct work_struct *work)
  {

-@@ -790,9 +848,12 @@ static int eth_ioctl(struct net_device *
+@@ -792,9 +850,12 @@ static int eth_ioctl(struct net_device *

  
        if (!netif_running(dev))
                return -EINVAL;
  
        if (!netif_running(dev))
                return -EINVAL;


@@ -142,7 +140,7 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
        return err;
  }
  
        return err;
  }
  

-@@ -944,7 +1005,8 @@ static int eth_open(struct net_device *d
+@@ -947,7 +1008,8 @@ static int eth_open(struct net_device *d

                }
        }
  
                }
        }
  


@@ -152,7 +150,7 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
  
        memset(&msg, 0, sizeof(msg));
        msg.cmd = NPE_VLAN_SETRXQOSENTRY;
  
        memset(&msg, 0, sizeof(msg));
        msg.cmd = NPE_VLAN_SETRXQOSENTRY;

-@@ -1103,10 +1165,8 @@ static int eth_close(struct net_device *
+@@ -1107,10 +1169,8 @@ static int eth_close(struct net_device *

                printk(KERN_CRIT "%s: unable to disable loopback\n",
                       dev->name);
  
                printk(KERN_CRIT "%s: unable to disable loopback\n",
                       dev->name);
  


@@ -165,7 +163,7 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
  
        if (!ports_open)
                qmgr_disable_irq(TXDONE_QUEUE);
  
        if (!ports_open)
                qmgr_disable_irq(TXDONE_QUEUE);

-@@ -1117,6 +1177,42 @@ static int eth_close(struct net_device *
+@@ -1120,6 +1180,42 @@ static int eth_close(struct net_device *

        return 0;
  }
  
        return 0;
  }
  


@@ -208,7 +206,7 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
  static int __devinit eth_init_one(struct platform_device *pdev)
  {
        struct port *port;
  static int __devinit eth_init_one(struct platform_device *pdev)
  {
        struct port *port;

-@@ -1189,20 +1285,7 @@ static int __devinit eth_init_one(struct
+@@ -1192,20 +1288,7 @@ static int __devinit eth_init_one(struct

        __raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control);
        udelay(50);
  
        __raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control);
        udelay(50);
  


@@ -230,11 +228,11 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
  
        INIT_DELAYED_WORK(&port->mdio_thread, mdio_thread);
        return 0;
  
        INIT_DELAYED_WORK(&port->mdio_thread, mdio_thread);
        return 0;

-Index: linux-2.6.24.2/include/asm-arm/arch-ixp4xx/platform.h
+Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/platform.h

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

---- linux-2.6.24.2.orig/include/asm-arm/arch-ixp4xx/platform.h
-+++ linux-2.6.24.2/include/asm-arm/arch-ixp4xx/platform.h
-@@ -106,12 +106,15 @@ struct sys_timer;
+--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/platform.h
++++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/platform.h
+@@ -95,12 +95,15 @@ struct sys_timer;

  #define IXP4XX_ETH_NPEB               0x10
  #define IXP4XX_ETH_NPEC               0x20
  
  #define IXP4XX_ETH_NPEB               0x10
  #define IXP4XX_ETH_NPEC               0x20
  

diff --git a/target/linux/ixp4xx/patches-2.6.25/203-npe_driver_phy_reset_autoneg.patch b/target/linux/ixp4xx/patches-2.6.25/203-npe_driver_phy_reset_autoneg.patch
index 6e1056e55d48db28595c0eea29cdef0f97678aef..7d635deac5f62a4fbe0b32f0edb57bf33b47982c 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/203-npe_driver_phy_reset_autoneg.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/203-npe_driver_phy_reset_autoneg.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
+Index: linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c

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

---- linux-2.6.24.2.orig/drivers/net/arm/ixp4xx_eth.c
-+++ linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
+--- linux-2.6.25.1.orig/drivers/net/arm/ixp4xx_eth.c
++++ linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c

 @@ -322,8 +322,12 @@ static void phy_reset(struct net_device 
        struct port *port = netdev_priv(dev);
        int phy_id = port->mii[idx].phy_id;
 @@ -322,8 +322,12 @@ static void phy_reset(struct net_device 
        struct port *port = netdev_priv(dev);
        int phy_id = port->mii[idx].phy_id;

diff --git a/target/linux/ixp4xx/patches-2.6.25/204-npe_driver_ixp43x_support.patch b/target/linux/ixp4xx/patches-2.6.25/204-npe_driver_ixp43x_support.patch
index c0b55aa11833d69ac65de000f747043cf5cef4a2..18d5d87371b08b0e1bac8ac9fe0a37feb4a896bf 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/204-npe_driver_ixp43x_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/204-npe_driver_ixp43x_support.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/ixp4xx_npe.c linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/ixp4xx_npe.c
---- linux-2.6.24.2/arch/arm/mach-ixp4xx/ixp4xx_npe.c   2008-04-22 12:24:29.000000000 +0200
-+++ linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/ixp4xx_npe.c      2008-04-24 13:26:56.000000000 +0200
-@@ -571,8 +571,8 @@
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/ixp4xx_npe.c
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c
+@@ -575,8 +575,8 @@ int npe_load_firmware(struct npe *npe, c

                for (i = 0; i < image->size; i++)
                        image->data[i] = swab32(image->data[i]);
  
                for (i = 0; i < image->size; i++)
                        image->data[i] = swab32(image->data[i]);
  


@@ -12,7 +13,7 @@ diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/ixp4xx_npe.c linux-2.6.24.2-owrt/a
                          "IXP42x\n");
                goto err;
        }
                          "IXP42x\n");
                goto err;
        }

-@@ -594,7 +594,7 @@
+@@ -598,7 +598,7 @@ int npe_load_firmware(struct npe *npe, c

                  "revision 0x%X:%X\n", (image->id >> 16) & 0xFF,
                  (image->id >> 8) & 0xFF, image->id & 0xFF);
  
                  "revision 0x%X:%X\n", (image->id >> 16) & 0xFF,
                  (image->id >> 8) & 0xFF, image->id & 0xFF);
  


@@ -21,9 +22,10 @@ diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/ixp4xx_npe.c linux-2.6.24.2-owrt/a
                if (!npe->id)
                        instr_size = NPE_A_42X_INSTR_SIZE;
                else
                if (!npe->id)
                        instr_size = NPE_A_42X_INSTR_SIZE;
                else

-diff -Nur linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c linux-2.6.24.2-owrt/drivers/net/arm/ixp4xx_eth.c
---- linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c        2008-04-22 12:24:29.000000000 +0200
-+++ linux-2.6.24.2-owrt/drivers/net/arm/ixp4xx_eth.c   2008-04-24 18:23:24.000000000 +0200
+Index: linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c
+===================================================================
+--- linux-2.6.25.1.orig/drivers/net/arm/ixp4xx_eth.c
++++ linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c

 @@ -32,6 +32,7 @@
  #include <linux/kernel.h>
  #include <linux/mii.h>
 @@ -32,6 +32,7 @@
  #include <linux/kernel.h>
  #include <linux/mii.h>


@@ -32,7 +34,7 @@ diff -Nur linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c linux-2.6.24.2-owrt/driver
  #include <asm/arch/npe.h>
  #include <asm/arch/qmgr.h>
  
  #include <asm/arch/npe.h>
  #include <asm/arch/qmgr.h>
  

-@@ -1238,12 +1239,16 @@
+@@ -1338,12 +1339,16 @@ static struct platform_driver drv = {

  
  static int __init eth_init_module(void)
  {
  
  static int __init eth_init_module(void)
  {


@@ -53,10 +55,11 @@ diff -Nur linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c linux-2.6.24.2-owrt/driver
        __raw_writel(DEFAULT_CORE_CNTRL, &mdio_regs->core_control);
  
        return platform_driver_register(&drv);
        __raw_writel(DEFAULT_CORE_CNTRL, &mdio_regs->core_control);
  
        return platform_driver_register(&drv);

-diff -Nur linux-2.6.24.2/include/asm-arm/arch-ixp4xx/cpu.h linux-2.6.24.2-owrt/include/asm-arm/arch-ixp4xx/cpu.h
---- linux-2.6.24.2/include/asm-arm/arch-ixp4xx/cpu.h   2008-04-22 12:24:29.000000000 +0200
-+++ linux-2.6.24.2-owrt/include/asm-arm/arch-ixp4xx/cpu.h      2008-04-24 18:15:29.000000000 +0200
-@@ -34,6 +34,8 @@
+Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/cpu.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/cpu.h
++++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/cpu.h
+@@ -34,6 +34,8 @@ static inline u32 ixp4xx_read_feature_bi

        val &= ~IXP4XX_FEATURE_RESERVED;
        if (!cpu_is_ixp46x())
                val &= ~IXP4XX_FEATURE_IXP46X_ONLY;
        val &= ~IXP4XX_FEATURE_RESERVED;
        if (!cpu_is_ixp46x())
                val &= ~IXP4XX_FEATURE_IXP46X_ONLY;


@@ -65,9 +68,10 @@ diff -Nur linux-2.6.24.2/include/asm-arm/arch-ixp4xx/cpu.h linux-2.6.24.2-owrt/i
  
        return val;
  }
  
        return val;
  }

-diff -Nur linux-2.6.24.2/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h linux-2.6.24.2-owrt/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
---- linux-2.6.24.2/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h   2008-04-22 12:24:29.000000000 +0200
-+++ linux-2.6.24.2-owrt/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h      2008-04-24 18:15:13.000000000 +0200
+Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
++++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h

 @@ -628,11 +628,12 @@
  #define IXP4XX_FEATURE_XSCALE_MAX_FREQ        (3 << 22)
  #define IXP4XX_FEATURE_RESERVED               (0xFF << 24)
 @@ -628,11 +628,12 @@
  #define IXP4XX_FEATURE_XSCALE_MAX_FREQ        (3 << 22)
  #define IXP4XX_FEATURE_RESERVED               (0xFF << 24)

diff --git a/target/linux/ixp4xx/patches-2.6.25/210-npe_hss.patch b/target/linux/ixp4xx/patches-2.6.25/210-npe_hss.patch
index 3950456bdbe03a0288e1b50670241d4036d3e21a..c3349f158a4867dcb63760e99113c767bd067d7f 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/210-npe_hss.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/210-npe_hss.patch
@@ -1,8 +1,8 @@
-diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
-index a3df09e..94e7aa7 100644
---- a/drivers/net/wan/Kconfig
-+++ b/drivers/net/wan/Kconfig
-@@ -334,6 +334,15 @@ config DSCC4_PCI_RST
+Index: linux-2.6.25.1/drivers/net/wan/Kconfig
+===================================================================
+--- linux-2.6.25.1.orig/drivers/net/wan/Kconfig
++++ linux-2.6.25.1/drivers/net/wan/Kconfig
+@@ -338,6 +338,15 @@ config DSCC4_PCI_RST

  
          Say Y if your card supports this feature.
  
  
          Say Y if your card supports this feature.
  


@@ -18,10 +18,10 @@ index a3df09e..94e7aa7 100644
  config DLCI
        tristate "Frame Relay DLCI support"
        ---help---
  config DLCI
        tristate "Frame Relay DLCI support"
        ---help---

-diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile
-index d61fef3..1b1d116 100644
---- a/drivers/net/wan/Makefile
-+++ b/drivers/net/wan/Makefile
+Index: linux-2.6.25.1/drivers/net/wan/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/drivers/net/wan/Makefile
++++ linux-2.6.25.1/drivers/net/wan/Makefile

 @@ -42,6 +42,7 @@ obj-$(CONFIG_C101)           += c101.o
  obj-$(CONFIG_WANXL)           += wanxl.o
  obj-$(CONFIG_PCI200SYN)               += pci200syn.o
 @@ -42,6 +42,7 @@ obj-$(CONFIG_C101)           += c101.o
  obj-$(CONFIG_WANXL)           += wanxl.o
  obj-$(CONFIG_PCI200SYN)               += pci200syn.o


@@ -30,11 +30,10 @@ index d61fef3..1b1d116 100644
  
  clean-files := wanxlfw.inc
  $(obj)/wanxl.o:       $(obj)/wanxlfw.inc
  
  clean-files := wanxlfw.inc
  $(obj)/wanxl.o:       $(obj)/wanxlfw.inc

-diff --git a/drivers/net/wan/ixp4xx_hss.c b/drivers/net/wan/ixp4xx_hss.c
-new file mode 100644
-index 0000000..cf971b3
+Index: linux-2.6.25.1/drivers/net/wan/ixp4xx_hss.c
+===================================================================

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

-+++ b/drivers/net/wan/ixp4xx_hss.c
++++ linux-2.6.25.1/drivers/net/wan/ixp4xx_hss.c

 @@ -0,0 +1,2886 @@
 +/*
 + * Intel IXP4xx HSS (synchronous serial port) driver for Linux
 @@ -0,0 +1,2886 @@
 +/*
 + * Intel IXP4xx HSS (synchronous serial port) driver for Linux

diff --git a/target/linux/ixp4xx/patches-2.6.25/294-eeprom_new_notifier.patch b/target/linux/ixp4xx/patches-2.6.25/294-eeprom_new_notifier.patch
index 4aa7a988bed26ce99254acdf7e276df8730cbe04..e8e59dfb270d6123caade594531b624c584ce34b 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/294-eeprom_new_notifier.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/294-eeprom_new_notifier.patch
@@ -1,6 +1,7 @@
-diff -uprN linux-2.6.23.orig/drivers/i2c/chips/eeprom.c linux-2.6.23/drivers/i2c/chips/eeprom.c
---- linux-2.6.23.orig/drivers/i2c/chips/eeprom.c       2007-10-09 15:31:38.000000000 -0500
-+++ linux-2.6.23/drivers/i2c/chips/eeprom.c    2007-10-11 00:57:25.000000000 -0500
+Index: linux-2.6.25.1/drivers/i2c/chips/eeprom.c
+===================================================================
+--- linux-2.6.25.1.orig/drivers/i2c/chips/eeprom.c
++++ linux-2.6.25.1/drivers/i2c/chips/eeprom.c

 @@ -33,6 +33,8 @@
  #include <linux/jiffies.h>
  #include <linux/i2c.h>
 @@ -33,6 +33,8 @@
  #include <linux/jiffies.h>
  #include <linux/i2c.h>


@@ -9,8 +10,8 @@ diff -uprN linux-2.6.23.orig/drivers/i2c/chips/eeprom.c linux-2.6.23/drivers/i2c
 +#include <linux/eeprom.h>
  
  /* Addresses to scan */
 +#include <linux/eeprom.h>
  
  /* Addresses to scan */

- static unsigned short normal_i2c[] = { 0x50, 0x51, 0x52, 0x53, 0x54,
-@@ -41,26 +43,7 @@ static unsigned short normal_i2c[] = { 0
+ static const unsigned short normal_i2c[] = { 0x50, 0x51, 0x52, 0x53, 0x54,
+@@ -41,26 +43,7 @@ static const unsigned short normal_i2c[]

  /* Insmod parameters */
  I2C_CLIENT_INSMOD_1(eeprom);
  
  /* Insmod parameters */
  I2C_CLIENT_INSMOD_1(eeprom);
  


@@ -38,7 +39,7 @@ diff -uprN linux-2.6.23.orig/drivers/i2c/chips/eeprom.c linux-2.6.23/drivers/i2c
  
  static int eeprom_attach_adapter(struct i2c_adapter *adapter);
  static int eeprom_detect(struct i2c_adapter *adapter, int address, int kind);
  
  static int eeprom_attach_adapter(struct i2c_adapter *adapter);
  static int eeprom_detect(struct i2c_adapter *adapter, int address, int kind);

-@@ -191,6 +174,7 @@ static int eeprom_detect(struct i2c_adap
+@@ -197,6 +180,7 @@ static int eeprom_detect(struct i2c_adap

        data->valid = 0;
        mutex_init(&data->update_lock);
        data->nature = UNKNOWN;
        data->valid = 0;
        mutex_init(&data->update_lock);
        data->nature = UNKNOWN;


@@ -46,7 +47,7 @@ diff -uprN linux-2.6.23.orig/drivers/i2c/chips/eeprom.c linux-2.6.23/drivers/i2c
  
        /* Tell the I2C layer a new client has arrived */
        if ((err = i2c_attach_client(new_client)))
  
        /* Tell the I2C layer a new client has arrived */
        if ((err = i2c_attach_client(new_client)))

-@@ -214,6 +198,9 @@ static int eeprom_detect(struct i2c_adap
+@@ -224,6 +208,9 @@ static int eeprom_detect(struct i2c_adap

        if (err)
                goto exit_detach;
  
        if (err)
                goto exit_detach;
  


@@ -56,7 +57,7 @@ diff -uprN linux-2.6.23.orig/drivers/i2c/chips/eeprom.c linux-2.6.23/drivers/i2c
        return 0;
  
  exit_detach:
        return 0;
  
  exit_detach:

-@@ -239,6 +226,41 @@ static int eeprom_detach_client(struct i
+@@ -249,6 +236,41 @@ static int eeprom_detach_client(struct i

        return 0;
  }
  
        return 0;
  }
  


@@ -98,9 +99,10 @@ diff -uprN linux-2.6.23.orig/drivers/i2c/chips/eeprom.c linux-2.6.23/drivers/i2c
  static int __init eeprom_init(void)
  {
        return i2c_add_driver(&eeprom_driver);
  static int __init eeprom_init(void)
  {
        return i2c_add_driver(&eeprom_driver);

-diff -uprN linux-2.6.23.orig/include/linux/eeprom.h linux-2.6.23/include/linux/eeprom.h
---- linux-2.6.23.orig/include/linux/eeprom.h   1969-12-31 18:00:00.000000000 -0600
-+++ linux-2.6.23/include/linux/eeprom.h        2007-10-11 00:57:25.000000000 -0500
+Index: linux-2.6.25.1/include/linux/eeprom.h
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/include/linux/eeprom.h

 @@ -0,0 +1,71 @@
 +#ifndef _LINUX_EEPROM_H
 +#define _LINUX_EEPROM_H
 @@ -0,0 +1,71 @@
 +#ifndef _LINUX_EEPROM_H
 +#define _LINUX_EEPROM_H


@@ -173,12 +175,13 @@ diff -uprN linux-2.6.23.orig/include/linux/eeprom.h linux-2.6.23/include/linux/e
 +extern int unregister_eeprom_notifier(struct notifier_block *nb);
 +
 +#endif /* _LINUX_EEPROM_H */
 +extern int unregister_eeprom_notifier(struct notifier_block *nb);
 +
 +#endif /* _LINUX_EEPROM_H */

-diff -uprN linux-2.6.23.orig/include/linux/notifier.h linux-2.6.23/include/linux/notifier.h
---- linux-2.6.23.orig/include/linux/notifier.h 2007-10-09 15:31:38.000000000 -0500
-+++ linux-2.6.23/include/linux/notifier.h      2007-10-11 00:57:25.000000000 -0500
-@@ -231,5 +231,8 @@ static inline int notifier_to_errno(int 
- #define PM_SUSPEND_PREPARE    0x0003 /* Going to suspend the system */
- #define PM_POST_SUSPEND               0x0004 /* Suspend finished */
+Index: linux-2.6.25.1/include/linux/notifier.h
+===================================================================
+--- linux-2.6.25.1.orig/include/linux/notifier.h
++++ linux-2.6.25.1/include/linux/notifier.h
+@@ -248,5 +248,8 @@ extern struct blocking_notifier_head reb
+ #define VT_WRITE              0x0003 /* A char got output */
+ #define VT_UPDATE             0x0004 /* A bigger update occurred */

  
 +/* eeprom notifier chain */
 +#define EEPROM_REGISTER               0x0001
  
 +/* eeprom notifier chain */
 +#define EEPROM_REGISTER               0x0001

diff --git a/target/linux/ixp4xx/patches-2.6.25/296-avila_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/296-avila_mac_plat_info.patch
index 0c18956e34b40c63aad0bcf94847dba884444a55..4c103acce4cda44e3bc975506d591e04d55f9fe4 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/296-avila_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/296-avila_mac_plat_info.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c

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

---- linux-2.6.24.2.orig/arch/arm/mach-ixp4xx/avila-setup.c
-+++ linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/avila-setup.c
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c

 @@ -132,6 +132,31 @@ static struct platform_device avila_pata
        .resource               = avila_pata_resources,
  };
 @@ -132,6 +132,31 @@ static struct platform_device avila_pata
        .resource               = avila_pata_resources,
  };

diff --git a/target/linux/ixp4xx/patches-2.6.25/300-avila_fetch_mac.patch b/target/linux/ixp4xx/patches-2.6.25/300-avila_fetch_mac.patch
index e35ddbe334879362734b052b9b6870df461bc98e..7f2d611aa48a4aa4d67f873511f84c34319cdacc 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/300-avila_fetch_mac.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/300-avila_fetch_mac.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c

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

---- linux-2.6.24.2.orig/arch/arm/mach-ixp4xx/avila-setup.c
-+++ linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/avila-setup.c
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c

 @@ -14,10 +14,18 @@
  #include <linux/kernel.h>
  #include <linux/init.h>
 @@ -14,10 +14,18 @@
  #include <linux/kernel.h>
  #include <linux/init.h>


@@ -35,9 +35,9 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
  static struct flash_platform_data avila_flash_data = {
        .map_name       = "cfi_probe",
        .width          = 2,
  static struct flash_platform_data avila_flash_data = {
        .map_name       = "cfi_probe",
        .width          = 2,

-@@ -192,10 +207,160 @@ static void __init avila_fixup(struct ma
-       t->hdr.size = 0;
- }
+@@ -163,10 +178,160 @@ static struct platform_device *avila_dev
+       &avila_uart
+ };

  
 +static void __init avila_gw23xx_setup(void)
 +{
  
 +static void __init avila_gw23xx_setup(void)
 +{


@@ -196,7 +196,7 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
        avila_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
        avila_flash_resource.end =
                IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1;
        avila_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
        avila_flash_resource.end =
                IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1;

-@@ -213,9 +378,28 @@ static void __init avila_init(void)
+@@ -184,9 +349,28 @@ static void __init avila_init(void)

  
        platform_device_register(&avila_pata);
  
  
        platform_device_register(&avila_pata);
  

diff --git a/target/linux/ixp4xx/patches-2.6.25/301-avila_led.patch b/target/linux/ixp4xx/patches-2.6.25/301-avila_led.patch
index 825773900a7bf42e6a47cab707197c575a3c1a18..14be023f775aa22017ef4b95c4cfd3f34ab91a12 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/301-avila_led.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/301-avila_led.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.24.2/include/asm-arm/arch-ixp4xx/avila.h
+Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/avila.h

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

---- linux-2.6.24.2.orig/include/asm-arm/arch-ixp4xx/avila.h
-+++ linux-2.6.24.2/include/asm-arm/arch-ixp4xx/avila.h
+--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/avila.h
++++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/avila.h

 @@ -36,4 +36,6 @@
  #define AVILA_PCI_INTC_PIN    9
  #define AVILA_PCI_INTD_PIN    8
 @@ -36,4 +36,6 @@
  #define AVILA_PCI_INTC_PIN    9
  #define AVILA_PCI_INTD_PIN    8


@@ -10,10 +10,10 @@ Index: linux-2.6.24.2/include/asm-arm/arch-ixp4xx/avila.h
 +/* User LEDs */
 +#define AVILA_GW23XX_LED_USER_GPIO    3
 +#define AVILA_GW23X7_LED_USER_GPIO    4
 +/* User LEDs */
 +#define AVILA_GW23XX_LED_USER_GPIO    3
 +#define AVILA_GW23X7_LED_USER_GPIO    4

-Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c

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

---- linux-2.6.24.2.orig/arch/arm/mach-ixp4xx/avila-setup.c
-+++ linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/avila-setup.c
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c

 @@ -26,6 +26,7 @@
  # include <linux/eeprom.h>
  #endif
 @@ -26,6 +26,7 @@
  # include <linux/eeprom.h>
  #endif


@@ -48,7 +48,7 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
  static struct platform_device *avila_devices[] __initdata = {
        &avila_i2c_gpio,
        &avila_flash,
  static struct platform_device *avila_devices[] __initdata = {
        &avila_i2c_gpio,
        &avila_flash,

-@@ -211,6 +231,8 @@ static void __init avila_gw23xx_setup(vo
+@@ -182,6 +202,8 @@ static void __init avila_gw23xx_setup(vo

  {
        platform_device_register(&avila_npeb_device);
        platform_device_register(&avila_npec_device);
  {
        platform_device_register(&avila_npeb_device);
        platform_device_register(&avila_npec_device);


@@ -57,7 +57,7 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
  }
  
  #ifdef CONFIG_SENSORS_EEPROM
  }
  
  #ifdef CONFIG_SENSORS_EEPROM

-@@ -218,6 +240,8 @@ static void __init avila_gw2342_setup(vo
+@@ -189,6 +211,8 @@ static void __init avila_gw2342_setup(vo

  {
        platform_device_register(&avila_npeb_device);
        platform_device_register(&avila_npec_device);
  {
        platform_device_register(&avila_npeb_device);
        platform_device_register(&avila_npec_device);


@@ -66,7 +66,7 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
  }
  
  static void __init avila_gw2345_setup(void)
  }
  
  static void __init avila_gw2345_setup(void)

-@@ -228,22 +252,30 @@ static void __init avila_gw2345_setup(vo
+@@ -199,22 +223,30 @@ static void __init avila_gw2345_setup(vo

  
        avila_npec_data.phy = 5; /* port 5 of the KS8995 switch */
        platform_device_register(&avila_npec_device);
  
        avila_npec_data.phy = 5; /* port 5 of the KS8995 switch */
        platform_device_register(&avila_npec_device);


@@ -97,9 +97,9 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
  }
  
  static void __init avila_gw2355_setup(void)
  }
  
  static void __init avila_gw2355_setup(void)

-@@ -254,11 +286,16 @@ static void __init avila_gw2355_setup(vo
+@@ -225,11 +257,16 @@ static void __init avila_gw2355_setup(vo

  
  

-       avila_npec_data.phy = 5;
+       avila_npec_data.phy = 16;

        platform_device_register(&avila_npec_device);
 +
 +      platform_device_register(&avila_leds_device);
        platform_device_register(&avila_npec_device);
 +
 +      platform_device_register(&avila_leds_device);

diff --git a/target/linux/ixp4xx/patches-2.6.25/302-avila_gpio_device.patch b/target/linux/ixp4xx/patches-2.6.25/302-avila_gpio_device.patch
index aee0eeeeca2c4541846f021639f41e36c1bcc3c1..8c91f0d0b89156668687318c7970f1c1202d42e2 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/302-avila_gpio_device.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/302-avila_gpio_device.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c

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

---- linux-2.6.24.2.orig/arch/arm/mach-ixp4xx/avila-setup.c
-+++ linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/avila-setup.c
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c

 @@ -192,10 +192,28 @@ static struct platform_device avila_leds
        .dev.platform_data      = &avila_leds_data,
  };
 @@ -192,10 +192,28 @@ static struct platform_device avila_leds
        .dev.platform_data      = &avila_leds_data,
  };


@@ -31,11 +31,11 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
 +      &avila_gpio,
  };
  
 +      &avila_gpio,
  };
  

- static char avila_rtc_probe[] __initdata = "rtc-ds1672.probe=0,0x68 ";
-Index: linux-2.6.24.2/include/asm-arm/arch-ixp4xx/avila.h
+ static void __init avila_gw23xx_setup(void)
+Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/avila.h

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

---- linux-2.6.24.2.orig/include/asm-arm/arch-ixp4xx/avila.h
-+++ linux-2.6.24.2/include/asm-arm/arch-ixp4xx/avila.h
+--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/avila.h
++++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/avila.h

 @@ -39,3 +39,6 @@
  /* User LEDs */
  #define AVILA_GW23XX_LED_USER_GPIO    3
 @@ -39,3 +39,6 @@
  /* User LEDs */
  #define AVILA_GW23XX_LED_USER_GPIO    3

diff --git a/target/linux/ixp4xx/patches-2.6.25/303-avila_gw23x7_phy_quirk.patch b/target/linux/ixp4xx/patches-2.6.25/303-avila_gw23x7_phy_quirk.patch
index ffba2bb390019c0682eadd51d5e146f9b6e150b1..fa91b38f2d756f15b17a795c19845b8dc0fa245a 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/303-avila_gw23x7_phy_quirk.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/303-avila_gw23x7_phy_quirk.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c

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

---- linux-2.6.24.2.orig/arch/arm/mach-ixp4xx/avila-setup.c
-+++ linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
-@@ -276,6 +276,7 @@ static void __init avila_gw2345_setup(vo
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/avila-setup.c
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c
+@@ -247,6 +247,7 @@ static void __init avila_gw2345_setup(vo

  
  static void __init avila_gw2347_setup(void)
  {
  
  static void __init avila_gw2347_setup(void)
  {


@@ -10,7 +10,7 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
        platform_device_register(&avila_npeb_device);
  
        avila_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO;
        platform_device_register(&avila_npeb_device);
  
        avila_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO;

-@@ -310,6 +311,7 @@ static void __init avila_gw2355_setup(vo
+@@ -281,6 +282,7 @@ static void __init avila_gw2355_setup(vo

  
  static void __init avila_gw2357_setup(void)
  {
  
  static void __init avila_gw2357_setup(void)
  {


@@ -18,11 +18,11 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
        platform_device_register(&avila_npeb_device);
  
        avila_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO;
        platform_device_register(&avila_npeb_device);
  
        avila_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO;

-Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
+Index: linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c

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

---- linux-2.6.24.2.orig/drivers/net/arm/ixp4xx_eth.c
-+++ linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
-@@ -347,6 +347,14 @@ static void phy_reset(struct net_device 
+--- linux-2.6.25.1.orig/drivers/net/arm/ixp4xx_eth.c
++++ linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c
+@@ -348,6 +348,14 @@ static void phy_reset(struct net_device 

                return;
        }
  
                return;
        }
  


@@ -37,11 +37,11 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
        /* restart auto negotiation */
        bmcr = mdio_read(dev, phy_id, MII_BMCR);
        bmcr |= (BMCR_ANENABLE | BMCR_ANRESTART);
        /* restart auto negotiation */
        bmcr = mdio_read(dev, phy_id, MII_BMCR);
        bmcr |= (BMCR_ANENABLE | BMCR_ANRESTART);

-Index: linux-2.6.24.2/include/asm-arm/arch-ixp4xx/platform.h
+Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/platform.h

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

---- linux-2.6.24.2.orig/include/asm-arm/arch-ixp4xx/platform.h
-+++ linux-2.6.24.2/include/asm-arm/arch-ixp4xx/platform.h
-@@ -115,6 +115,8 @@ struct eth_plat_info {
+--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/platform.h
++++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/platform.h
+@@ -104,6 +104,8 @@ struct eth_plat_info {

        u8 txreadyq;
        u8 hwaddr[6];
        u32 phy_mask;
        u8 txreadyq;
        u8 hwaddr[6];
        u32 phy_mask;

diff --git a/target/linux/ixp4xx/patches-2.6.25/400-dmabounce.patch b/target/linux/ixp4xx/patches-2.6.25/400-dmabounce.patch
index f4910261e3cc37ae5ffa4e66a527286e974d8b3c..2b7cd76eb1e1c065795c310c6709da363f5b8d8a 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/400-dmabounce.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/400-dmabounce.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23.14/arch/arm/common/dmabounce.c
+Index: linux-2.6.25.1/arch/arm/common/dmabounce.c

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

---- linux-2.6.23.14.orig/arch/arm/common/dmabounce.c   2008-01-24 22:03:28.475500801 +0100
-+++ linux-2.6.23.14/arch/arm/common/dmabounce.c        2008-01-24 22:17:36.415822168 +0100
-@@ -116,6 +116,10 @@
+--- linux-2.6.25.1.orig/arch/arm/common/dmabounce.c
++++ linux-2.6.25.1/arch/arm/common/dmabounce.c
+@@ -117,6 +117,10 @@ alloc_safe_buffer(struct dmabounce_devic

        } else if (size <= device_info->large.size) {
                pool = &device_info->large;
        } else {
        } else if (size <= device_info->large.size) {
                pool = &device_info->large;
        } else {


@@ -13,11 +13,11 @@ Index: linux-2.6.23.14/arch/arm/common/dmabounce.c
                pool = NULL;
        }
  
                pool = NULL;
        }
  

-Index: linux-2.6.23.14/arch/arm/mach-ixp4xx/Kconfig
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig

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

---- linux-2.6.23.14.orig/arch/arm/mach-ixp4xx/Kconfig  2008-01-24 22:10:29.331484012 +0100
-+++ linux-2.6.23.14/arch/arm/mach-ixp4xx/Kconfig       2008-01-24 22:11:42.891675973 +0100
-@@ -220,6 +220,11 @@
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+@@ -236,6 +236,11 @@ config DMABOUNCE

        default y
        depends on PCI
  
        default y
        depends on PCI
  

diff --git a/target/linux/ixp4xx/patches-2.6.25/401-avila_pci_dev.patch b/target/linux/ixp4xx/patches-2.6.25/401-avila_pci_dev.patch
index db76d15da4b2a811f8210656cbed72bc524d4ddd..0ec214918a1316f88807088643041631f9389e4e 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/401-avila_pci_dev.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/401-avila_pci_dev.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.23.14/include/asm-arm/arch-ixp4xx/avila.h
+Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/avila.h

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

---- linux-2.6.23.14.orig/include/asm-arm/arch-ixp4xx/avila.h   2008-01-31 17:40:36.000000000 +0100
-+++ linux-2.6.23.14/include/asm-arm/arch-ixp4xx/avila.h        2008-01-31 17:40:42.000000000 +0100
+--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/avila.h
++++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/avila.h

 @@ -25,7 +25,7 @@
  /*
   * AVILA PCI IRQs
 @@ -25,7 +25,7 @@
  /*
   * AVILA PCI IRQs

diff --git a/target/linux/ps3/Makefile b/target/linux/ps3/Makefile
index c1e1d63887986ef399f939628ede441b15cacb3a..5bec1f58051b4a46561dc6588b4717e24d1b0067 100644 (file)
--- a/target/linux/ps3/Makefile
+++ b/target/linux/ps3/Makefile
@@ -10,7 +10,7 @@ ARCH:=powerpc
 BOARD:=ps3
 BOARDNAME:=Sony PS3 Game Console
 
 BOARD:=ps3
 BOARDNAME:=Sony PS3 Game Console
 

-LINUX_VERSION:=2.6.25
+LINUX_VERSION:=2.6.25.1

 
 KERNEL_CC:=
 
 
 KERNEL_CC:=