aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-05-18 20:26:43 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-05-18 20:26:43 +0000
commit4503efda2da6e5868bbbd274c042622dc03edd8e (patch)
tree3678d3fa5a554dcf4f4295ab9dcb5ab026240683 /target/linux/generic-2.6
parente582f614b6e15517a9207b0a96a72b68f7a254df (diff)
downloadupstream-4503efda2da6e5868bbbd274c042622dc03edd8e.tar.gz
upstream-4503efda2da6e5868bbbd274c042622dc03edd8e.tar.bz2
upstream-4503efda2da6e5868bbbd274c042622dc03edd8e.zip
refresh generic 2.6.25 patches
SVN-Revision: 11189
Diffstat (limited to 'target/linux/generic-2.6')
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/001-squashfs.patch52
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/002-lzma_decompress.patch14
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/003-squashfs_lzma.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/004-extra_optimization.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/005-squashfs_fix.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/006-gcc4_inline_fix.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/007-samsung_flash.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/009-revert_intel_flash_breakage.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/010-disable_old_squashfs_compatibility.patch12
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/011-mips_boot.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/060-block2mtd_init.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/065-rootfs_split.patch42
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/100-netfilter_layer7_2.17.patch54
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/101-netfilter_layer7_pktmatch.patch12
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/110-ipp2p_0.8.1rc1.patch20
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/130-netfilter_ipset.patch104
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/140-netfilter_time.patch20
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/150-netfilter_imq.patch78
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/170-netfilter_chaostables_0.8.patch50
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/171-netfilter_tarpit.patch16
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/180-netfilter_depends.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/190-netfilter_rtsp.patch44
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/200-sched_esfq.patch22
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/202-mips-freestanding.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/204-jffs2_eofdetect.patch12
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/207-powerpc_asm_segment_h.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/208-rtl8110sb_fix.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/209-mini_fo.patch80
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/210-mini_fo_2.6.25_fixes.patch24
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/211-mini_fo_2.6.25_dentry_open_war.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/213-kobject_uevent.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/220-sound_kconfig.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/400-ledtrig_morse.patch12
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/401-led_alix.patch12
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/402-ledtrig_default_on.patch12
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/403-ds1672_detect.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/410-gpio_buttons.patch12
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/420-gpiodev.patch12
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/510-Yaffs.patch12
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/600-phy_extension.patch12
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/610-phy_detect.patch16
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/620-phy_adm6996.patch16
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/630-phy_packets.patch32
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/640-mvswitch.patch24
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/700-powerpc_git.patch2500
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/801-usb_serial_endpoint_size.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/840-unable_to_open_console.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/850-jffs2_erase_progress_indicator.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/900-headers_type_and_time.patch12
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/902-darwin_scripts_include.patch36
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/903-hostap_txpower.patch36
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/903-stddef_include.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/904-ls_time_locale.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/905-i386_build.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/921-gpio_spi_driver.patch12
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/930-ppc_big_endian_io_memory_accessors.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/940-arm_mach_types.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/950-revert_conntrack_optimization.patch6
59 files changed, 1789 insertions, 1789 deletions
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 77128cc5bb..bb84e3c1a2 100644
--- 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,7 +1,7 @@
-Index: linux-2.6.25.1/fs/Kconfig
+Index: linux-2.6.25.4/fs/Kconfig
===================================================================
---- linux-2.6.25.1.orig/fs/Kconfig
-+++ linux-2.6.25.1/fs/Kconfig
+--- linux-2.6.25.4.orig/fs/Kconfig
++++ linux-2.6.25.4/fs/Kconfig
@@ -1367,6 +1367,71 @@ config CRAMFS
If unsure, say N.
@@ -74,10 +74,10 @@ Index: linux-2.6.25.1/fs/Kconfig
config VXFS_FS
tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)"
depends on BLOCK
-Index: linux-2.6.25.1/fs/Makefile
+Index: linux-2.6.25.4/fs/Makefile
===================================================================
---- linux-2.6.25.1.orig/fs/Makefile
-+++ linux-2.6.25.1/fs/Makefile
+--- linux-2.6.25.4.orig/fs/Makefile
++++ linux-2.6.25.4/fs/Makefile
@@ -73,6 +73,7 @@ obj-$(CONFIG_JBD) += jbd/
obj-$(CONFIG_JBD2) += jbd2/
obj-$(CONFIG_EXT2_FS) += ext2/
@@ -86,10 +86,10 @@ Index: linux-2.6.25.1/fs/Makefile
obj-y += ramfs/
obj-$(CONFIG_HUGETLBFS) += hugetlbfs/
obj-$(CONFIG_CODA_FS) += coda/
-Index: linux-2.6.25.1/fs/squashfs/inode.c
+Index: linux-2.6.25.4/fs/squashfs/inode.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/fs/squashfs/inode.c
++++ linux-2.6.25.4/fs/squashfs/inode.c
@@ -0,0 +1,2122 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
@@ -2213,10 +2213,10 @@ Index: linux-2.6.25.1/fs/squashfs/inode.c
+MODULE_DESCRIPTION("squashfs, a compressed read-only filesystem");
+MODULE_AUTHOR("Phillip Lougher <phillip@lougher.org.uk>");
+MODULE_LICENSE("GPL");
-Index: linux-2.6.25.1/fs/squashfs/Makefile
+Index: linux-2.6.25.4/fs/squashfs/Makefile
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/fs/squashfs/Makefile
++++ linux-2.6.25.4/fs/squashfs/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for the linux squashfs routines.
@@ -2225,10 +2225,10 @@ Index: linux-2.6.25.1/fs/squashfs/Makefile
+obj-$(CONFIG_SQUASHFS) += squashfs.o
+squashfs-y += inode.o
+squashfs-y += squashfs2_0.o
-Index: linux-2.6.25.1/fs/squashfs/squashfs2_0.c
+Index: linux-2.6.25.4/fs/squashfs/squashfs2_0.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/fs/squashfs/squashfs2_0.c
++++ linux-2.6.25.4/fs/squashfs/squashfs2_0.c
@@ -0,0 +1,758 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
@@ -2988,10 +2988,10 @@ Index: linux-2.6.25.1/fs/squashfs/squashfs2_0.c
+
+ return 1;
+}
-Index: linux-2.6.25.1/fs/squashfs/squashfs.h
+Index: linux-2.6.25.4/fs/squashfs/squashfs.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/fs/squashfs/squashfs.h
++++ linux-2.6.25.4/fs/squashfs/squashfs.h
@@ -0,0 +1,86 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
@@ -3079,10 +3079,10 @@ Index: linux-2.6.25.1/fs/squashfs/squashfs.h
+ return 0;
+}
+#endif
-Index: linux-2.6.25.1/include/linux/magic.h
+Index: linux-2.6.25.4/include/linux/magic.h
===================================================================
---- linux-2.6.25.1.orig/include/linux/magic.h
-+++ linux-2.6.25.1/include/linux/magic.h
+--- linux-2.6.25.4.orig/include/linux/magic.h
++++ linux-2.6.25.4/include/linux/magic.h
@@ -35,6 +35,9 @@
#define REISER2FS_SUPER_MAGIC_STRING "ReIsEr2Fs"
#define REISER2FS_JR_SUPER_MAGIC_STRING "ReIsEr3Fs"
@@ -3093,10 +3093,10 @@ Index: linux-2.6.25.1/include/linux/magic.h
#define SMB_SUPER_MAGIC 0x517B
#define USBDEVICE_SUPER_MAGIC 0x9fa2
#define CGROUP_SUPER_MAGIC 0x27e0eb
-Index: linux-2.6.25.1/include/linux/squashfs_fs.h
+Index: linux-2.6.25.4/include/linux/squashfs_fs.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/squashfs_fs.h
++++ linux-2.6.25.4/include/linux/squashfs_fs.h
@@ -0,0 +1,911 @@
+#ifndef SQUASHFS_FS
+#define SQUASHFS_FS
@@ -4009,10 +4009,10 @@ Index: linux-2.6.25.1/include/linux/squashfs_fs.h
+
+#endif
+#endif
-Index: linux-2.6.25.1/include/linux/squashfs_fs_i.h
+Index: linux-2.6.25.4/include/linux/squashfs_fs_i.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/squashfs_fs_i.h
++++ linux-2.6.25.4/include/linux/squashfs_fs_i.h
@@ -0,0 +1,45 @@
+#ifndef SQUASHFS_FS_I
+#define SQUASHFS_FS_I
@@ -4059,10 +4059,10 @@ Index: linux-2.6.25.1/include/linux/squashfs_fs_i.h
+ struct inode vfs_inode;
+};
+#endif
-Index: linux-2.6.25.1/include/linux/squashfs_fs_sb.h
+Index: linux-2.6.25.4/include/linux/squashfs_fs_sb.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/squashfs_fs_sb.h
++++ linux-2.6.25.4/include/linux/squashfs_fs_sb.h
@@ -0,0 +1,74 @@
+#ifndef SQUASHFS_FS_SB
+#define SQUASHFS_FS_SB
@@ -4138,10 +4138,10 @@ Index: linux-2.6.25.1/include/linux/squashfs_fs_sb.h
+ int (*read_fragment_index_table)(struct super_block *s);
+};
+#endif
-Index: linux-2.6.25.1/init/do_mounts_rd.c
+Index: linux-2.6.25.4/init/do_mounts_rd.c
===================================================================
---- linux-2.6.25.1.orig/init/do_mounts_rd.c
-+++ linux-2.6.25.1/init/do_mounts_rd.c
+--- linux-2.6.25.4.orig/init/do_mounts_rd.c
++++ linux-2.6.25.4/init/do_mounts_rd.c
@@ -5,6 +5,7 @@
#include <linux/ext2_fs.h>
#include <linux/romfs_fs.h>
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 f2c31e75eb..73cf22a9b4 100644
--- 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.25.1/include/linux/LzmaDecode.h
+Index: linux-2.6.25.4/include/linux/LzmaDecode.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/LzmaDecode.h
++++ linux-2.6.25.4/include/linux/LzmaDecode.h
@@ -0,0 +1,100 @@
+/*
+ LzmaDecode.h
@@ -103,10 +103,10 @@ Index: linux-2.6.25.1/include/linux/LzmaDecode.h
+ UInt32 *outSizeProcessed);
+
+#endif
-Index: linux-2.6.25.1/lib/LzmaDecode.c
+Index: linux-2.6.25.4/lib/LzmaDecode.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/lib/LzmaDecode.c
++++ linux-2.6.25.4/lib/LzmaDecode.c
@@ -0,0 +1,663 @@
+/*
+ LzmaDecode.c
@@ -771,10 +771,10 @@ Index: linux-2.6.25.1/lib/LzmaDecode.c
+ *outSizeProcessed = nowPos;
+ return LZMA_RESULT_OK;
+}
-Index: linux-2.6.25.1/lib/Makefile
+Index: linux-2.6.25.4/lib/Makefile
===================================================================
---- linux-2.6.25.1.orig/lib/Makefile
-+++ linux-2.6.25.1/lib/Makefile
+--- linux-2.6.25.4.orig/lib/Makefile
++++ linux-2.6.25.4/lib/Makefile
@@ -14,7 +14,7 @@ lib-$(CONFIG_SMP) += cpumask.o
lib-y += kobject.o kref.o klist.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 454cd89969..5a42f25bdc 100644
--- 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.25.1/fs/squashfs/inode.c
+Index: linux-2.6.25.4/fs/squashfs/inode.c
===================================================================
---- linux-2.6.25.1.orig/fs/squashfs/inode.c
-+++ linux-2.6.25.1/fs/squashfs/inode.c
+--- linux-2.6.25.4.orig/fs/squashfs/inode.c
++++ linux-2.6.25.4/fs/squashfs/inode.c
@@ -4,6 +4,9 @@
* Copyright (c) 2002, 2003, 2004, 2005, 2006
* Phillip Lougher <phillip@lougher.org.uk>
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 c2062f7b0d..999b2e27ad 100644
--- 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,7 +1,7 @@
-Index: linux-2.6.25.1/Makefile
+Index: linux-2.6.25.4/Makefile
===================================================================
---- linux-2.6.25.1.orig/Makefile
-+++ linux-2.6.25.1/Makefile
+--- linux-2.6.25.4.orig/Makefile
++++ linux-2.6.25.4/Makefile
@@ -533,6 +533,9 @@ endif
NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
CHECKFLAGS += $(NOSTDINC_FLAGS)
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 66f8ccce4d..3987223945 100644
--- 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,7 +1,7 @@
-Index: linux-2.6.25.1/fs/squashfs/inode.c
+Index: linux-2.6.25.4/fs/squashfs/inode.c
===================================================================
---- linux-2.6.25.1.orig/fs/squashfs/inode.c
-+++ linux-2.6.25.1/fs/squashfs/inode.c
+--- linux-2.6.25.4.orig/fs/squashfs/inode.c
++++ linux-2.6.25.4/fs/squashfs/inode.c
@@ -33,6 +33,7 @@
#include <linux/fs.h>
#include <linux/smp_lock.h>
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 52cf2caf51..b344eb2425 100644
--- 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,7 +1,7 @@
-Index: linux-2.6.25.1/include/asm-mips/system.h
+Index: linux-2.6.25.4/include/asm-mips/system.h
===================================================================
---- linux-2.6.25.1.orig/include/asm-mips/system.h
-+++ linux-2.6.25.1/include/asm-mips/system.h
+--- linux-2.6.25.4.orig/include/asm-mips/system.h
++++ linux-2.6.25.4/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);
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 41e3850d38..8ae8eaa38a 100644
--- 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.25.1/drivers/mtd/chips/cfi_cmdset_0002.c
+Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0002.c
===================================================================
---- 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
+--- linux-2.6.25.4.orig/drivers/mtd/chips/cfi_cmdset_0002.c
++++ linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -51,6 +51,7 @@
#define SST49LF040B 0x0050
#define SST49LF008A 0x005a
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 4e4eefb3fb..d38cba2836 100644
--- 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,7 +1,7 @@
-Index: linux-2.6.25.1/drivers/mtd/chips/cfi_cmdset_0001.c
+Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0001.c
===================================================================
---- 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
+--- linux-2.6.25.4.orig/drivers/mtd/chips/cfi_cmdset_0001.c
++++ linux-2.6.25.4/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(
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 ecc7436e87..52fe135372 100644
--- 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.25.1/fs/squashfs/Makefile
+Index: linux-2.6.25.4/fs/squashfs/Makefile
===================================================================
---- linux-2.6.25.1.orig/fs/squashfs/Makefile
-+++ linux-2.6.25.1/fs/squashfs/Makefile
+--- linux-2.6.25.4.orig/fs/squashfs/Makefile
++++ linux-2.6.25.4/fs/squashfs/Makefile
@@ -4,4 +4,3 @@
obj-$(CONFIG_SQUASHFS) += squashfs.o
squashfs-y += inode.o
-squashfs-y += squashfs2_0.o
-Index: linux-2.6.25.1/fs/squashfs/squashfs.h
+Index: linux-2.6.25.4/fs/squashfs/squashfs.h
===================================================================
---- linux-2.6.25.1.orig/fs/squashfs/squashfs.h
-+++ linux-2.6.25.1/fs/squashfs/squashfs.h
+--- linux-2.6.25.4.orig/fs/squashfs/squashfs.h
++++ linux-2.6.25.4/fs/squashfs/squashfs.h
@@ -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 8434d873a3..4d09b6531a 100644
--- 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,7 +1,7 @@
-Index: linux-2.6.25.1/arch/mips/kernel/head.S
+Index: linux-2.6.25.4/arch/mips/kernel/head.S
===================================================================
---- linux-2.6.25.1.orig/arch/mips/kernel/head.S
-+++ linux-2.6.25.1/arch/mips/kernel/head.S
+--- linux-2.6.25.4.orig/arch/mips/kernel/head.S
++++ linux-2.6.25.4/arch/mips/kernel/head.S
@@ -120,6 +120,8 @@
#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 fa6325af83..f2f1b2f7c0 100644
--- 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.25.1/drivers/mtd/devices/block2mtd.c
+Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c
===================================================================
---- linux-2.6.25.1.orig/drivers/mtd/devices/block2mtd.c
-+++ linux-2.6.25.1/drivers/mtd/devices/block2mtd.c
+--- linux-2.6.25.4.orig/drivers/mtd/devices/block2mtd.c
++++ linux-2.6.25.4/drivers/mtd/devices/block2mtd.c
@@ -16,6 +16,7 @@
#include <linux/list.h>
#include <linux/init.h>
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 7561f11988..e12e8d4ded 100644
--- 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,7 +1,7 @@
-Index: linux-2.6.25.1/drivers/mtd/Kconfig
+Index: linux-2.6.25.4/drivers/mtd/Kconfig
===================================================================
---- linux-2.6.25.1.orig/drivers/mtd/Kconfig
-+++ linux-2.6.25.1/drivers/mtd/Kconfig
+--- linux-2.6.25.4.orig/drivers/mtd/Kconfig
++++ linux-2.6.25.4/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.
@@ -19,10 +19,10 @@ Index: linux-2.6.25.1/drivers/mtd/Kconfig
config MTD_REDBOOT_PARTS
tristate "RedBoot partition table parsing"
depends on MTD_PARTITIONS
-Index: linux-2.6.25.1/drivers/mtd/mtdpart.c
+Index: linux-2.6.25.4/drivers/mtd/mtdpart.c
===================================================================
---- linux-2.6.25.1.orig/drivers/mtd/mtdpart.c
-+++ linux-2.6.25.1/drivers/mtd/mtdpart.c
+--- linux-2.6.25.4.orig/drivers/mtd/mtdpart.c
++++ linux-2.6.25.4/drivers/mtd/mtdpart.c
@@ -20,6 +20,8 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
@@ -584,10 +584,10 @@ Index: linux-2.6.25.1/drivers/mtd/mtdpart.c
+EXPORT_SYMBOL_GPL(refresh_mtd_partitions);
EXPORT_SYMBOL_GPL(register_mtd_parser);
EXPORT_SYMBOL_GPL(deregister_mtd_parser);
-Index: linux-2.6.25.1/drivers/mtd/devices/block2mtd.c
+Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c
===================================================================
---- linux-2.6.25.1.orig/drivers/mtd/devices/block2mtd.c
-+++ linux-2.6.25.1/drivers/mtd/devices/block2mtd.c
+--- linux-2.6.25.4.orig/drivers/mtd/devices/block2mtd.c
++++ linux-2.6.25.4/drivers/mtd/devices/block2mtd.c
@@ -34,6 +34,8 @@ struct block2mtd_dev {
struct block_device *blkdev;
struct mtd_info mtd;
@@ -875,10 +875,10 @@ Index: linux-2.6.25.1/drivers/mtd/devices/block2mtd.c
part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
part->name = dev->mtd.name;
-Index: linux-2.6.25.1/drivers/mtd/mtdchar.c
+Index: linux-2.6.25.4/drivers/mtd/mtdchar.c
===================================================================
---- linux-2.6.25.1.orig/drivers/mtd/mtdchar.c
-+++ linux-2.6.25.1/drivers/mtd/mtdchar.c
+--- linux-2.6.25.4.orig/drivers/mtd/mtdchar.c
++++ linux-2.6.25.4/drivers/mtd/mtdchar.c
@@ -17,6 +17,7 @@
#include <linux/mtd/mtd.h>
@@ -901,10 +901,10 @@ Index: linux-2.6.25.1/drivers/mtd/mtdchar.c
default:
ret = -ENOTTY;
-Index: linux-2.6.25.1/include/linux/mtd/mtd.h
+Index: linux-2.6.25.4/include/linux/mtd/mtd.h
===================================================================
---- linux-2.6.25.1.orig/include/linux/mtd/mtd.h
-+++ linux-2.6.25.1/include/linux/mtd/mtd.h
+--- linux-2.6.25.4.orig/include/linux/mtd/mtd.h
++++ linux-2.6.25.4/include/linux/mtd/mtd.h
@@ -98,6 +98,7 @@ struct mtd_oob_ops {
uint8_t *oobbuf;
};
@@ -923,10 +923,10 @@ Index: linux-2.6.25.1/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
-Index: linux-2.6.25.1/include/linux/mtd/partitions.h
+Index: linux-2.6.25.4/include/linux/mtd/partitions.h
===================================================================
---- linux-2.6.25.1.orig/include/linux/mtd/partitions.h
-+++ linux-2.6.25.1/include/linux/mtd/partitions.h
+--- linux-2.6.25.4.orig/include/linux/mtd/partitions.h
++++ linux-2.6.25.4/include/linux/mtd/partitions.h
@@ -36,6 +36,7 @@
* erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
*/
@@ -951,10 +951,10 @@ Index: linux-2.6.25.1/include/linux/mtd/partitions.h
/*
* Functions dealing with the various ways of partitioning the space
-Index: linux-2.6.25.1/include/mtd/mtd-abi.h
+Index: linux-2.6.25.4/include/mtd/mtd-abi.h
===================================================================
---- linux-2.6.25.1.orig/include/mtd/mtd-abi.h
-+++ linux-2.6.25.1/include/mtd/mtd-abi.h
+--- linux-2.6.25.4.orig/include/mtd/mtd-abi.h
++++ linux-2.6.25.4/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)
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 434b9ab090..787f17e5c3 100644
--- 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,7 +1,7 @@
-Index: linux-2.6.25.1/drivers/mtd/redboot.c
+Index: linux-2.6.25.4/drivers/mtd/redboot.c
===================================================================
---- linux-2.6.25.1.orig/drivers/mtd/redboot.c
-+++ linux-2.6.25.1/drivers/mtd/redboot.c
+--- linux-2.6.25.4.orig/drivers/mtd/redboot.c
++++ linux-2.6.25.4/drivers/mtd/redboot.c
@@ -251,14 +251,21 @@ static int parse_redboot_partitions(stru
#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 695c6c0ecc..66fa504a8c 100644
--- 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,7 +1,7 @@
-Index: linux-2.6.25.1/net/netfilter/Kconfig
+Index: linux-2.6.25.4/net/netfilter/Kconfig
===================================================================
---- linux-2.6.25.1.orig/net/netfilter/Kconfig
-+++ linux-2.6.25.1/net/netfilter/Kconfig
+--- linux-2.6.25.4.orig/net/netfilter/Kconfig
++++ linux-2.6.25.4/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.
@@ -30,10 +30,10 @@ Index: linux-2.6.25.1/net/netfilter/Kconfig
config NETFILTER_XT_MATCH_STATISTIC
tristate '"statistic" match support'
depends on NETFILTER_XTABLES
-Index: linux-2.6.25.1/net/netfilter/Makefile
+Index: linux-2.6.25.4/net/netfilter/Makefile
===================================================================
---- linux-2.6.25.1.orig/net/netfilter/Makefile
-+++ linux-2.6.25.1/net/netfilter/Makefile
+--- linux-2.6.25.4.orig/net/netfilter/Makefile
++++ linux-2.6.25.4/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
@@ -42,10 +42,10 @@ Index: linux-2.6.25.1/net/netfilter/Makefile
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
-Index: linux-2.6.25.1/net/netfilter/xt_layer7.c
+Index: linux-2.6.25.4/net/netfilter/xt_layer7.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/net/netfilter/xt_layer7.c
++++ linux-2.6.25.4/net/netfilter/xt_layer7.c
@@ -0,0 +1,634 @@
+/*
+ Kernel module to match application layer (OSI layer 7) data in connections.
@@ -681,10 +681,10 @@ Index: linux-2.6.25.1/net/netfilter/xt_layer7.c
+
+module_init(xt_layer7_init);
+module_exit(xt_layer7_fini);
-Index: linux-2.6.25.1/net/netfilter/regexp/regexp.c
+Index: linux-2.6.25.4/net/netfilter/regexp/regexp.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/net/netfilter/regexp/regexp.c
++++ linux-2.6.25.4/net/netfilter/regexp/regexp.c
@@ -0,0 +1,1197 @@
+/*
+ * regcomp and regexec -- regsub and regerror are elsewhere
@@ -1883,10 +1883,10 @@ Index: linux-2.6.25.1/net/netfilter/regexp/regexp.c
+#endif
+
+
-Index: linux-2.6.25.1/net/netfilter/regexp/regexp.h
+Index: linux-2.6.25.4/net/netfilter/regexp/regexp.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/net/netfilter/regexp/regexp.h
++++ linux-2.6.25.4/net/netfilter/regexp/regexp.h
@@ -0,0 +1,41 @@
+/*
+ * Definitions etc. for regexp(3) routines.
@@ -1929,20 +1929,20 @@ Index: linux-2.6.25.1/net/netfilter/regexp/regexp.h
+void regerror(char *s);
+
+#endif
-Index: linux-2.6.25.1/net/netfilter/regexp/regmagic.h
+Index: linux-2.6.25.4/net/netfilter/regexp/regmagic.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/net/netfilter/regexp/regmagic.h
++++ linux-2.6.25.4/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
-Index: linux-2.6.25.1/net/netfilter/regexp/regsub.c
+Index: linux-2.6.25.4/net/netfilter/regexp/regsub.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/net/netfilter/regexp/regsub.c
++++ linux-2.6.25.4/net/netfilter/regexp/regsub.c
@@ -0,0 +1,95 @@
+/*
+ * regsub
@@ -2039,10 +2039,10 @@ Index: linux-2.6.25.1/net/netfilter/regexp/regsub.c
+ }
+ *dst++ = '\0';
+}
-Index: linux-2.6.25.1/net/netfilter/nf_conntrack_core.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/net/netfilter/nf_conntrack_core.c
++++ linux-2.6.25.4/net/netfilter/nf_conntrack_core.c
@@ -210,6 +210,14 @@ destroy_conntrack(struct nf_conntrack *n
* too. */
nf_ct_remove_expectations(ct);
@@ -2058,10 +2058,10 @@ Index: linux-2.6.25.1/net/netfilter/nf_conntrack_core.c
/* 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));
-Index: linux-2.6.25.1/net/netfilter/nf_conntrack_standalone.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/net/netfilter/nf_conntrack_standalone.c
++++ linux-2.6.25.4/net/netfilter/nf_conntrack_standalone.c
@@ -181,7 +181,12 @@ static int ct_seq_show(struct seq_file *
return -ENOSPC;
#endif
@@ -2076,10 +2076,10 @@ Index: linux-2.6.25.1/net/netfilter/nf_conntrack_standalone.c
return -ENOSPC;
return 0;
-Index: linux-2.6.25.1/include/net/netfilter/nf_conntrack.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/net/netfilter/nf_conntrack.h
++++ linux-2.6.25.4/include/net/netfilter/nf_conntrack.h
@@ -124,6 +124,22 @@ struct nf_conn
u_int32_t secmark;
#endif
@@ -2103,10 +2103,10 @@ Index: linux-2.6.25.1/include/net/netfilter/nf_conntrack.h
/* Storage reserved for other modules: */
union nf_conntrack_proto proto;
-Index: linux-2.6.25.1/include/linux/netfilter/xt_layer7.h
+Index: linux-2.6.25.4/include/linux/netfilter/xt_layer7.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/netfilter/xt_layer7.h
++++ linux-2.6.25.4/include/linux/netfilter/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 eff900ba5a..e8bd21bb21 100644
--- 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.25.1/include/linux/netfilter/xt_layer7.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/linux/netfilter/xt_layer7.h
++++ linux-2.6.25.4/include/linux/netfilter/xt_layer7.h
@@ -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.25.1/include/linux/netfilter/xt_layer7.h
};
#endif /* _XT_LAYER7_H */
-Index: linux-2.6.25.1/net/netfilter/xt_layer7.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/net/netfilter/xt_layer7.c
++++ linux-2.6.25.4/net/netfilter/xt_layer7.c
@@ -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 ad180ea7f7..0ed18b404c 100644
--- 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.25.1/include/linux/netfilter_ipv4/ipt_ipp2p.h
+Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_ipp2p.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_ipp2p.h
++++ linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_ipp2p.h
@@ -0,0 +1,31 @@
+#ifndef __IPT_IPP2P_H
+#define __IPT_IPP2P_H
@@ -34,10 +34,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_ipp2p.h
+#define IPP2P_MUTE (1 << 14)
+#define IPP2P_WASTE (1 << 15)
+#define IPP2P_XDCC (1 << 16)
-Index: linux-2.6.25.1/net/ipv4/netfilter/ipt_ipp2p.c
+Index: linux-2.6.25.4/net/ipv4/netfilter/ipt_ipp2p.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/net/ipv4/netfilter/ipt_ipp2p.c
++++ linux-2.6.25.4/net/ipv4/netfilter/ipt_ipp2p.c
@@ -0,0 +1,856 @@
+#if defined(MODVERSIONS)
+#include <linux/modversions.h>
@@ -895,10 +895,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/ipt_ipp2p.c
+module_exit(fini);
+
+
-Index: linux-2.6.25.1/net/ipv4/netfilter/Kconfig
+Index: linux-2.6.25.4/net/ipv4/netfilter/Kconfig
===================================================================
---- linux-2.6.25.1.orig/net/ipv4/netfilter/Kconfig
-+++ linux-2.6.25.1/net/ipv4/netfilter/Kconfig
+--- linux-2.6.25.4.orig/net/ipv4/netfilter/Kconfig
++++ linux-2.6.25.4/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.
@@ -912,10 +912,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/Kconfig
config IP_NF_MATCH_RECENT
tristate '"recent" match support'
depends on IP_NF_IPTABLES
-Index: linux-2.6.25.1/net/ipv4/netfilter/Makefile
+Index: linux-2.6.25.4/net/ipv4/netfilter/Makefile
===================================================================
---- linux-2.6.25.1.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.6.25.1/net/ipv4/netfilter/Makefile
+--- linux-2.6.25.4.orig/net/ipv4/netfilter/Makefile
++++ linux-2.6.25.4/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
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 24c0e71f97..294210ba37 100644
--- 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,7 +1,7 @@
-Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set.h
+Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set.h
++++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set.h
@@ -0,0 +1,498 @@
+#ifndef _IP_SET_H
+#define _IP_SET_H
@@ -501,10 +501,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set.h
+#endif /* __KERNEL__ */
+
+#endif /*_IP_SET_H*/
-Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_iphash.h
+Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_iphash.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_iphash.h
++++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_iphash.h
@@ -0,0 +1,30 @@
+#ifndef __IP_SET_IPHASH_H
+#define __IP_SET_IPHASH_H
@@ -536,10 +536,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_iphash.h
+};
+
+#endif /* __IP_SET_IPHASH_H */
-Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_ipmap.h
+Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_ipmap.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_ipmap.h
++++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_ipmap.h
@@ -0,0 +1,56 @@
+#ifndef __IP_SET_IPMAP_H
+#define __IP_SET_IPMAP_H
@@ -597,10 +597,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_ipmap.h
+}
+
+#endif /* __IP_SET_IPMAP_H */
-Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_ipporthash.h
+Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_ipporthash.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_ipporthash.h
++++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_ipporthash.h
@@ -0,0 +1,34 @@
+#ifndef __IP_SET_IPPORTHASH_H
+#define __IP_SET_IPPORTHASH_H
@@ -636,10 +636,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_ipporthash.h
+};
+
+#endif /* __IP_SET_IPPORTHASH_H */
-Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_iptree.h
+Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_iptree.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_iptree.h
++++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_iptree.h
@@ -0,0 +1,40 @@
+#ifndef __IP_SET_IPTREE_H
+#define __IP_SET_IPTREE_H
@@ -681,10 +681,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_iptree.h
+};
+
+#endif /* __IP_SET_IPTREE_H */
-Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_iptreemap.h
+Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_iptreemap.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_iptreemap.h
++++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_iptreemap.h
@@ -0,0 +1,40 @@
+#ifndef __IP_SET_IPTREEMAP_H
+#define __IP_SET_IPTREEMAP_H
@@ -726,10 +726,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_iptreemap.h
+};
+
+#endif /* __IP_SET_IPTREEMAP_H */
-Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_jhash.h
+Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_jhash.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_jhash.h
++++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_jhash.h
@@ -0,0 +1,148 @@
+#ifndef _LINUX_IPSET_JHASH_H
+#define _LINUX_IPSET_JHASH_H
@@ -879,10 +879,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_jhash.h
+}
+
+#endif /* _LINUX_IPSET_JHASH_H */
-Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_macipmap.h
+Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_macipmap.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_macipmap.h
++++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_macipmap.h
@@ -0,0 +1,38 @@
+#ifndef __IP_SET_MACIPMAP_H
+#define __IP_SET_MACIPMAP_H
@@ -922,10 +922,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_macipmap.h
+};
+
+#endif /* __IP_SET_MACIPMAP_H */
-Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_malloc.h
+Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_malloc.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_malloc.h
++++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_malloc.h
@@ -0,0 +1,116 @@
+#ifndef _IP_SET_MALLOC_H
+#define _IP_SET_MALLOC_H
@@ -1043,10 +1043,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_malloc.h
+#endif /* __KERNEL__ */
+
+#endif /*_IP_SET_MALLOC_H*/
-Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_nethash.h
+Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_nethash.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_nethash.h
++++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_nethash.h
@@ -0,0 +1,55 @@
+#ifndef __IP_SET_NETHASH_H
+#define __IP_SET_NETHASH_H
@@ -1103,10 +1103,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_nethash.h
+}
+
+#endif /* __IP_SET_NETHASH_H */
-Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_portmap.h
+Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_portmap.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_portmap.h
++++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_portmap.h
@@ -0,0 +1,25 @@
+#ifndef __IP_SET_PORTMAP_H
+#define __IP_SET_PORTMAP_H
@@ -1133,10 +1133,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ip_set_portmap.h
+};
+
+#endif /* __IP_SET_PORTMAP_H */
-Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_set.h
+Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_set.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_set.h
++++ linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_set.h
@@ -0,0 +1,21 @@
+#ifndef _IPT_SET_H
+#define _IPT_SET_H
@@ -1159,10 +1159,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_set.h
+};
+
+#endif /*_IPT_SET_H*/
-Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set.c
+Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set.c
++++ linux-2.6.25.4/net/ipv4/netfilter/ip_set.c
@@ -0,0 +1,2003 @@
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
+ * Patrick Schaaf <bof@bof.de>
@@ -3167,10 +3167,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set.c
+
+module_init(ip_set_init);
+module_exit(ip_set_fini);
-Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_iphash.c
+Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_iphash.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set_iphash.c
++++ linux-2.6.25.4/net/ipv4/netfilter/ip_set_iphash.c
@@ -0,0 +1,429 @@
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ *
@@ -3601,10 +3601,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_iphash.c
+
+module_init(ip_set_iphash_init);
+module_exit(ip_set_iphash_fini);
-Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_ipmap.c
+Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_ipmap.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set_ipmap.c
++++ linux-2.6.25.4/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>
@@ -3942,10 +3942,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_ipmap.c
+
+module_init(ip_set_ipmap_init);
+module_exit(ip_set_ipmap_fini);
-Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_ipporthash.c
+Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_ipporthash.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set_ipporthash.c
++++ linux-2.6.25.4/net/ipv4/netfilter/ip_set_ipporthash.c
@@ -0,0 +1,581 @@
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ *
@@ -4528,10 +4528,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_ipporthash.c
+
+module_init(ip_set_ipporthash_init);
+module_exit(ip_set_ipporthash_fini);
-Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_iptree.c
+Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_iptree.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set_iptree.c
++++ linux-2.6.25.4/net/ipv4/netfilter/ip_set_iptree.c
@@ -0,0 +1,612 @@
+/* Copyright (C) 2005 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ *
@@ -5145,10 +5145,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_iptree.c
+
+module_init(ip_set_iptree_init);
+module_exit(ip_set_iptree_fini);
-Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_iptreemap.c
+Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_iptreemap.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set_iptreemap.c
++++ linux-2.6.25.4/net/ipv4/netfilter/ip_set_iptreemap.c
@@ -0,0 +1,829 @@
+/* Copyright (C) 2007 Sven Wegener <sven.wegener@stealer.net>
+ *
@@ -5979,10 +5979,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_iptreemap.c
+
+module_init(ip_set_iptreemap_init);
+module_exit(ip_set_iptreemap_fini);
-Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_macipmap.c
+Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_macipmap.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set_macipmap.c
++++ linux-2.6.25.4/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>
@@ -6359,10 +6359,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_macipmap.c
+
+module_init(ip_set_macipmap_init);
+module_exit(ip_set_macipmap_fini);
-Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_nethash.c
+Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_nethash.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set_nethash.c
++++ linux-2.6.25.4/net/ipv4/netfilter/ip_set_nethash.c
@@ -0,0 +1,497 @@
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ *
@@ -6861,10 +6861,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_nethash.c
+
+module_init(ip_set_nethash_init);
+module_exit(ip_set_nethash_fini);
-Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_portmap.c
+Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_portmap.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/net/ipv4/netfilter/ip_set_portmap.c
++++ linux-2.6.25.4/net/ipv4/netfilter/ip_set_portmap.c
@@ -0,0 +1,346 @@
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ *
@@ -7212,10 +7212,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/ip_set_portmap.c
+
+module_init(ip_set_portmap_init);
+module_exit(ip_set_portmap_fini);
-Index: linux-2.6.25.1/net/ipv4/netfilter/ipt_set.c
+Index: linux-2.6.25.4/net/ipv4/netfilter/ipt_set.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/net/ipv4/netfilter/ipt_set.c
++++ linux-2.6.25.4/net/ipv4/netfilter/ipt_set.c
@@ -0,0 +1,160 @@
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
+ * Patrick Schaaf <bof@bof.de>
@@ -7377,10 +7377,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/ipt_set.c
+
+module_init(ipt_ipset_init);
+module_exit(ipt_ipset_fini);
-Index: linux-2.6.25.1/net/ipv4/netfilter/ipt_SET.c
+Index: linux-2.6.25.4/net/ipv4/netfilter/ipt_SET.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/net/ipv4/netfilter/ipt_SET.c
++++ linux-2.6.25.4/net/ipv4/netfilter/ipt_SET.c
@@ -0,0 +1,179 @@
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
+ * Patrick Schaaf <bof@bof.de>
@@ -7561,10 +7561,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/ipt_SET.c
+
+module_init(ipt_SET_init);
+module_exit(ipt_SET_fini);
-Index: linux-2.6.25.1/net/ipv4/netfilter/Kconfig
+Index: linux-2.6.25.4/net/ipv4/netfilter/Kconfig
===================================================================
---- linux-2.6.25.1.orig/net/ipv4/netfilter/Kconfig
-+++ linux-2.6.25.1/net/ipv4/netfilter/Kconfig
+--- linux-2.6.25.4.orig/net/ipv4/netfilter/Kconfig
++++ linux-2.6.25.4/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.
@@ -7688,10 +7688,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/Kconfig
+
endmenu
-Index: linux-2.6.25.1/net/ipv4/netfilter/Makefile
+Index: linux-2.6.25.4/net/ipv4/netfilter/Makefile
===================================================================
---- linux-2.6.25.1.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.6.25.1/net/ipv4/netfilter/Makefile
+--- linux-2.6.25.4.orig/net/ipv4/netfilter/Makefile
++++ linux-2.6.25.4/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
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 9b1c4478f4..41787ccfc5 100644
--- 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.25.1/include/linux/netfilter_ipv4/ipt_time.h
+Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_time.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_time.h
++++ linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_time.h
@@ -0,0 +1,18 @@
+#ifndef __ipt_time_h_included__
+#define __ipt_time_h_included__
@@ -21,10 +21,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_time.h
+
+
+#endif /* __ipt_time_h_included__ */
-Index: linux-2.6.25.1/net/ipv4/netfilter/ipt_time.c
+Index: linux-2.6.25.4/net/ipv4/netfilter/ipt_time.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/net/ipv4/netfilter/ipt_time.c
++++ linux-2.6.25.4/net/ipv4/netfilter/ipt_time.c
@@ -0,0 +1,180 @@
+/*
+ This is a module which is used for time matching
@@ -206,10 +206,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/ipt_time.c
+ r->tm_mon=i;
+ r->tm_mday=work-__spm[i]+1;
+}
-Index: linux-2.6.25.1/net/ipv4/netfilter/Kconfig
+Index: linux-2.6.25.4/net/ipv4/netfilter/Kconfig
===================================================================
---- linux-2.6.25.1.orig/net/ipv4/netfilter/Kconfig
-+++ linux-2.6.25.1/net/ipv4/netfilter/Kconfig
+--- linux-2.6.25.4.orig/net/ipv4/netfilter/Kconfig
++++ linux-2.6.25.4/net/ipv4/netfilter/Kconfig
@@ -63,6 +63,22 @@ config IP_NF_MATCH_IPP2P
help
Module for matching traffic of various Peer-to-Peer applications
@@ -233,10 +233,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/Kconfig
config IP_NF_MATCH_RECENT
tristate '"recent" match support'
depends on IP_NF_IPTABLES
-Index: linux-2.6.25.1/net/ipv4/netfilter/Makefile
+Index: linux-2.6.25.4/net/ipv4/netfilter/Makefile
===================================================================
---- linux-2.6.25.1.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.6.25.1/net/ipv4/netfilter/Makefile
+--- linux-2.6.25.4.orig/net/ipv4/netfilter/Makefile
++++ linux-2.6.25.4/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
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 eb5513050b..c3c5f8bada 100644
--- 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,7 +1,7 @@
-Index: linux-2.6.25.1/drivers/net/imq.c
+Index: linux-2.6.25.4/drivers/net/imq.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/drivers/net/imq.c
++++ linux-2.6.25.4/drivers/net/imq.c
@@ -0,0 +1,409 @@
+/*
+ * Pseudo-driver for the intermediate queue device.
@@ -412,10 +412,10 @@ Index: linux-2.6.25.1/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");
-Index: linux-2.6.25.1/drivers/net/Kconfig
+Index: linux-2.6.25.4/drivers/net/Kconfig
===================================================================
---- linux-2.6.25.1.orig/drivers/net/Kconfig
-+++ linux-2.6.25.1/drivers/net/Kconfig
+--- linux-2.6.25.4.orig/drivers/net/Kconfig
++++ linux-2.6.25.4/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.
@@ -546,10 +546,10 @@ Index: linux-2.6.25.1/drivers/net/Kconfig
config TUN
tristate "Universal TUN/TAP device driver support"
select CRC32
-Index: linux-2.6.25.1/drivers/net/Makefile
+Index: linux-2.6.25.4/drivers/net/Makefile
===================================================================
---- linux-2.6.25.1.orig/drivers/net/Makefile
-+++ linux-2.6.25.1/drivers/net/Makefile
+--- linux-2.6.25.4.orig/drivers/net/Makefile
++++ linux-2.6.25.4/drivers/net/Makefile
@@ -143,6 +143,7 @@ obj-$(CONFIG_SLHC) += slhc.o
obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
@@ -558,10 +558,10 @@ Index: linux-2.6.25.1/drivers/net/Makefile
obj-$(CONFIG_IFB) += ifb.o
obj-$(CONFIG_MACVLAN) += macvlan.o
obj-$(CONFIG_DE600) += de600.o
-Index: linux-2.6.25.1/include/linux/imq.h
+Index: linux-2.6.25.4/include/linux/imq.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/imq.h
++++ linux-2.6.25.4/include/linux/imq.h
@@ -0,0 +1,9 @@
+#ifndef _IMQ_H
+#define _IMQ_H
@@ -572,10 +572,10 @@ Index: linux-2.6.25.1/include/linux/imq.h
+#define IMQ_F_ENQUEUE 0x80
+
+#endif /* _IMQ_H */
-Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_IMQ.h
+Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_IMQ.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_IMQ.h
++++ linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_IMQ.h
@@ -0,0 +1,8 @@
+#ifndef _IPT_IMQ_H
+#define _IPT_IMQ_H
@@ -585,10 +585,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv4/ipt_IMQ.h
+};
+
+#endif /* _IPT_IMQ_H */
-Index: linux-2.6.25.1/include/linux/netfilter_ipv6/ip6t_IMQ.h
+Index: linux-2.6.25.4/include/linux/netfilter_ipv6/ip6t_IMQ.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/netfilter_ipv6/ip6t_IMQ.h
++++ linux-2.6.25.4/include/linux/netfilter_ipv6/ip6t_IMQ.h
@@ -0,0 +1,8 @@
+#ifndef _IP6T_IMQ_H
+#define _IP6T_IMQ_H
@@ -598,10 +598,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_ipv6/ip6t_IMQ.h
+};
+
+#endif /* _IP6T_IMQ_H */
-Index: linux-2.6.25.1/include/linux/skbuff.h
+Index: linux-2.6.25.4/include/linux/skbuff.h
===================================================================
---- linux-2.6.25.1.orig/include/linux/skbuff.h
-+++ linux-2.6.25.1/include/linux/skbuff.h
+--- linux-2.6.25.4.orig/include/linux/skbuff.h
++++ linux-2.6.25.4/include/linux/skbuff.h
@@ -296,6 +296,10 @@ struct sk_buff {
struct nf_conntrack *nfct;
struct sk_buff *nfct_reasm;
@@ -624,10 +624,10 @@ Index: linux-2.6.25.1/include/linux/skbuff.h
#ifdef CONFIG_BRIDGE_NETFILTER
dst->nf_bridge = src->nf_bridge;
nf_bridge_get(src->nf_bridge);
-Index: linux-2.6.25.1/net/core/dev.c
+Index: linux-2.6.25.4/net/core/dev.c
===================================================================
---- linux-2.6.25.1.orig/net/core/dev.c
-+++ linux-2.6.25.1/net/core/dev.c
+--- linux-2.6.25.4.orig/net/core/dev.c
++++ linux-2.6.25.4/net/core/dev.c
@@ -95,6 +95,9 @@
#include <net/net_namespace.h>
#include <net/sock.h>
@@ -651,10 +651,10 @@ Index: linux-2.6.25.1/net/core/dev.c
dev_queue_xmit_nit(skb, dev);
if (netif_needs_gso(dev, skb)) {
-Index: linux-2.6.25.1/net/ipv4/netfilter/ipt_IMQ.c
+Index: linux-2.6.25.4/net/ipv4/netfilter/ipt_IMQ.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/net/ipv4/netfilter/ipt_IMQ.c
++++ linux-2.6.25.4/net/ipv4/netfilter/ipt_IMQ.c
@@ -0,0 +1,69 @@
+/*
+ * This target marks packets to be enqueued to an imq device
@@ -725,10 +725,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/ipt_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");
-Index: linux-2.6.25.1/net/ipv4/netfilter/Kconfig
+Index: linux-2.6.25.4/net/ipv4/netfilter/Kconfig
===================================================================
---- linux-2.6.25.1.orig/net/ipv4/netfilter/Kconfig
-+++ linux-2.6.25.1/net/ipv4/netfilter/Kconfig
+--- linux-2.6.25.4.orig/net/ipv4/netfilter/Kconfig
++++ linux-2.6.25.4/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.
@@ -747,10 +747,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/Kconfig
config IP_NF_TARGET_ECN
tristate "ECN target support"
depends on IP_NF_MANGLE
-Index: linux-2.6.25.1/net/ipv4/netfilter/Makefile
+Index: linux-2.6.25.4/net/ipv4/netfilter/Makefile
===================================================================
---- linux-2.6.25.1.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.6.25.1/net/ipv4/netfilter/Makefile
+--- linux-2.6.25.4.orig/net/ipv4/netfilter/Makefile
++++ linux-2.6.25.4/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
@@ -759,10 +759,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/Makefile
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
-Index: linux-2.6.25.1/net/ipv6/netfilter/ip6t_IMQ.c
+Index: linux-2.6.25.4/net/ipv6/netfilter/ip6t_IMQ.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/net/ipv6/netfilter/ip6t_IMQ.c
++++ linux-2.6.25.4/net/ipv6/netfilter/ip6t_IMQ.c
@@ -0,0 +1,69 @@
+/*
+ * This target marks packets to be enqueued to an imq device
@@ -833,10 +833,10 @@ Index: linux-2.6.25.1/net/ipv6/netfilter/ip6t_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");
-Index: linux-2.6.25.1/net/ipv6/netfilter/Kconfig
+Index: linux-2.6.25.4/net/ipv6/netfilter/Kconfig
===================================================================
---- linux-2.6.25.1.orig/net/ipv6/netfilter/Kconfig
-+++ linux-2.6.25.1/net/ipv6/netfilter/Kconfig
+--- linux-2.6.25.4.orig/net/ipv6/netfilter/Kconfig
++++ linux-2.6.25.4/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.
@@ -853,10 +853,10 @@ Index: linux-2.6.25.1/net/ipv6/netfilter/Kconfig
config IP6_NF_TARGET_HL
tristate 'HL (hoplimit) target support'
depends on IP6_NF_MANGLE
-Index: linux-2.6.25.1/net/ipv6/netfilter/Makefile
+Index: linux-2.6.25.4/net/ipv6/netfilter/Makefile
===================================================================
---- linux-2.6.25.1.orig/net/ipv6/netfilter/Makefile
-+++ linux-2.6.25.1/net/ipv6/netfilter/Makefile
+--- linux-2.6.25.4.orig/net/ipv6/netfilter/Makefile
++++ linux-2.6.25.4/net/ipv6/netfilter/Makefile
@@ -6,6 +6,7 @@
obj-$(CONFIG_IP6_NF_IPTABLES) += ip6_tables.o
obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o
@@ -865,10 +865,10 @@ Index: linux-2.6.25.1/net/ipv6/netfilter/Makefile
obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o
obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o
-Index: linux-2.6.25.1/net/sched/sch_generic.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/net/sched/sch_generic.c
++++ linux-2.6.25.4/net/sched/sch_generic.c
@@ -182,6 +182,13 @@ static inline int qdisc_restart(struct n
return ret;
}
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 26708c43d3..3acc1aadb0 100644
--- 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.25.1/include/linux/netfilter/oot_conntrack.h
+Index: linux-2.6.25.4/include/linux/netfilter/oot_conntrack.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/netfilter/oot_conntrack.h
++++ linux-2.6.25.4/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
-Index: linux-2.6.25.1/include/linux/netfilter/oot_trans.h
+Index: linux-2.6.25.4/include/linux/netfilter/oot_trans.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/netfilter/oot_trans.h
++++ linux-2.6.25.4/include/linux/netfilter/oot_trans.h
@@ -0,0 +1,14 @@
+/* Out of tree workarounds */
+#include <linux/version.h>
@@ -27,10 +27,10 @@ Index: linux-2.6.25.1/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
-Index: linux-2.6.25.1/include/linux/netfilter/xt_CHAOS.h
+Index: linux-2.6.25.4/include/linux/netfilter/xt_CHAOS.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/netfilter/xt_CHAOS.h
++++ linux-2.6.25.4/include/linux/netfilter/xt_CHAOS.h
@@ -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.25.1/include/linux/netfilter/xt_CHAOS.h
+};
+
+#endif /* _LINUX_NETFILTER_XT_CHAOS_H */
-Index: linux-2.6.25.1/include/linux/netfilter/xt_portscan.h
+Index: linux-2.6.25.4/include/linux/netfilter/xt_portscan.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/netfilter/xt_portscan.h
++++ linux-2.6.25.4/include/linux/netfilter/xt_portscan.h
@@ -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.25.1/include/linux/netfilter/xt_portscan.h
+};
+
+#endif /* _LINUX_NETFILTER_XT_PORTSCAN_H */
-Index: linux-2.6.25.1/net/netfilter/find_match.c
+Index: linux-2.6.25.4/net/netfilter/find_match.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/net/netfilter/find_match.c
++++ linux-2.6.25.4/net/netfilter/find_match.c
@@ -0,0 +1,39 @@
+/*
+ xt_request_find_match
@@ -103,10 +103,10 @@ Index: linux-2.6.25.1/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
-Index: linux-2.6.25.1/net/netfilter/Kconfig
+Index: linux-2.6.25.4/net/netfilter/Kconfig
===================================================================
---- linux-2.6.25.1.orig/net/netfilter/Kconfig
-+++ linux-2.6.25.1/net/netfilter/Kconfig
+--- linux-2.6.25.4.orig/net/netfilter/Kconfig
++++ linux-2.6.25.4/net/netfilter/Kconfig
@@ -276,6 +276,14 @@ config NETFILTER_XTABLES
# alphabetically ordered list of targets
@@ -152,10 +152,10 @@ Index: linux-2.6.25.1/net/netfilter/Kconfig
config NETFILTER_XT_MATCH_MULTIPORT
tristate '"multiport" Multiple port match support'
depends on NETFILTER_XTABLES
-Index: linux-2.6.25.1/net/netfilter/Makefile
+Index: linux-2.6.25.4/net/netfilter/Makefile
===================================================================
---- linux-2.6.25.1.orig/net/netfilter/Makefile
-+++ linux-2.6.25.1/net/netfilter/Makefile
+--- linux-2.6.25.4.orig/net/netfilter/Makefile
++++ linux-2.6.25.4/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_TCPOPTSTRIP) += xt_TCPOPTSTRIP.o
@@ -170,10 +170,10 @@ Index: linux-2.6.25.1/net/netfilter/Makefile
obj-$(CONFIG_NETFILTER_XT_MATCH_TIME) += xt_time.o
obj-$(CONFIG_NETFILTER_XT_MATCH_U32) += xt_u32.o
+obj-$(CONFIG_NETFILTER_XT_MATCH_PORTSCAN) += xt_portscan.o
-Index: linux-2.6.25.1/net/netfilter/xt_CHAOS.c
+Index: linux-2.6.25.4/net/netfilter/xt_CHAOS.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/net/netfilter/xt_CHAOS.c
++++ linux-2.6.25.4/net/netfilter/xt_CHAOS.c
@@ -0,0 +1,200 @@
+/*
+ * CHAOS target for netfilter
@@ -375,10 +375,10 @@ Index: linux-2.6.25.1/net/netfilter/xt_CHAOS.c
+MODULE_DESCRIPTION("netfilter \"CHAOS\" target");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("ipt_CHAOS");
-Index: linux-2.6.25.1/net/netfilter/xt_DELUDE.c
+Index: linux-2.6.25.4/net/netfilter/xt_DELUDE.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/net/netfilter/xt_DELUDE.c
++++ linux-2.6.25.4/net/netfilter/xt_DELUDE.c
@@ -0,0 +1,197 @@
+/*
+ * DELUDE target
@@ -577,10 +577,10 @@ Index: linux-2.6.25.1/net/netfilter/xt_DELUDE.c
+MODULE_DESCRIPTION("netfilter \"DELUDE\" target");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("ipt_DELUDE");
-Index: linux-2.6.25.1/net/netfilter/xt_portscan.c
+Index: linux-2.6.25.4/net/netfilter/xt_portscan.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/net/netfilter/xt_portscan.c
++++ linux-2.6.25.4/net/netfilter/xt_portscan.c
@@ -0,0 +1,269 @@
+/*
+ * portscan match for netfilter
@@ -851,10 +851,10 @@ Index: linux-2.6.25.1/net/netfilter/xt_portscan.c
+MODULE_DESCRIPTION("netfilter \"portscan\" match");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("ipt_portscan");
-Index: linux-2.6.25.1/drivers/char/random.c
+Index: linux-2.6.25.4/drivers/char/random.c
===================================================================
---- linux-2.6.25.1.orig/drivers/char/random.c
-+++ linux-2.6.25.1/drivers/char/random.c
+--- linux-2.6.25.4.orig/drivers/char/random.c
++++ linux-2.6.25.4/drivers/char/random.c
@@ -1563,6 +1563,8 @@ __u32 secure_tcp_sequence_number(__be32
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 0b47b1f22e..7add5f5b93 100644
--- 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,7 +1,7 @@
-Index: linux-2.6.25.1/net/netfilter/Kconfig
+Index: linux-2.6.25.4/net/netfilter/Kconfig
===================================================================
---- linux-2.6.25.1.orig/net/netfilter/Kconfig
-+++ linux-2.6.25.1/net/netfilter/Kconfig
+--- linux-2.6.25.4.orig/net/netfilter/Kconfig
++++ linux-2.6.25.4/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.
@@ -26,10 +26,10 @@ Index: linux-2.6.25.1/net/netfilter/Kconfig
config NETFILTER_XT_TARGET_TCPMSS
tristate '"TCPMSS" target support'
depends on NETFILTER_XTABLES && (IPV6 || IPV6=n)
-Index: linux-2.6.25.1/net/netfilter/Makefile
+Index: linux-2.6.25.4/net/netfilter/Makefile
===================================================================
---- linux-2.6.25.1.orig/net/netfilter/Makefile
-+++ linux-2.6.25.1/net/netfilter/Makefile
+--- linux-2.6.25.4.orig/net/netfilter/Makefile
++++ linux-2.6.25.4/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_RATEEST) += xt_RATEEST.o
@@ -38,10 +38,10 @@ Index: linux-2.6.25.1/net/netfilter/Makefile
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
-Index: linux-2.6.25.1/net/netfilter/xt_TARPIT.c
+Index: linux-2.6.25.4/net/netfilter/xt_TARPIT.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/net/netfilter/xt_TARPIT.c
++++ linux-2.6.25.4/net/netfilter/xt_TARPIT.c
@@ -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 460db1159f..9a49199f0c 100644
--- 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,7 +1,7 @@
-Index: linux-2.6.25.1/net/netfilter/Kconfig
+Index: linux-2.6.25.4/net/netfilter/Kconfig
===================================================================
---- linux-2.6.25.1.orig/net/netfilter/Kconfig
-+++ linux-2.6.25.1/net/netfilter/Kconfig
+--- linux-2.6.25.4.orig/net/netfilter/Kconfig
++++ linux-2.6.25.4/net/netfilter/Kconfig
@@ -145,7 +145,7 @@ config NF_CONNTRACK_FTP
config NF_CONNTRACK_H323
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 641a95aea5..1859ff1e6e 100644
--- 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.25.1/include/linux/netfilter/nf_conntrack_rtsp.h
+Index: linux-2.6.25.4/include/linux/netfilter/nf_conntrack_rtsp.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/netfilter/nf_conntrack_rtsp.h
++++ linux-2.6.25.4/include/linux/netfilter/nf_conntrack_rtsp.h
@@ -0,0 +1,63 @@
+/*
+ * RTSP extension for IP connection tracking.
@@ -66,10 +66,10 @@ Index: linux-2.6.25.1/include/linux/netfilter/nf_conntrack_rtsp.h
+#endif /* __KERNEL__ */
+
+#endif /* _IP_CONNTRACK_RTSP_H */
-Index: linux-2.6.25.1/include/linux/netfilter_helpers.h
+Index: linux-2.6.25.4/include/linux/netfilter_helpers.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/netfilter_helpers.h
++++ linux-2.6.25.4/include/linux/netfilter_helpers.h
@@ -0,0 +1,133 @@
+/*
+ * Helpers for netfiler modules. This file provides implementations for basic
@@ -204,10 +204,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_helpers.h
+#endif /* __KERNEL__ */
+
+#endif /* _NETFILTER_HELPERS_H */
-Index: linux-2.6.25.1/include/linux/netfilter_mime.h
+Index: linux-2.6.25.4/include/linux/netfilter_mime.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/netfilter_mime.h
++++ linux-2.6.25.4/include/linux/netfilter_mime.h
@@ -0,0 +1,89 @@
+/*
+ * MIME functions for netfilter modules. This file provides implementations
@@ -298,10 +298,10 @@ Index: linux-2.6.25.1/include/linux/netfilter_mime.h
+#endif /* __KERNEL__ */
+
+#endif /* _NETFILTER_MIME_H */
-Index: linux-2.6.25.1/net/ipv4/netfilter/Makefile
+Index: linux-2.6.25.4/net/ipv4/netfilter/Makefile
===================================================================
---- linux-2.6.25.1.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.6.25.1/net/ipv4/netfilter/Makefile
+--- linux-2.6.25.4.orig/net/ipv4/netfilter/Makefile
++++ linux-2.6.25.4/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
@@ -310,10 +310,10 @@ Index: linux-2.6.25.1/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
-Index: linux-2.6.25.1/net/netfilter/Kconfig
+Index: linux-2.6.25.4/net/netfilter/Kconfig
===================================================================
---- linux-2.6.25.1.orig/net/netfilter/Kconfig
-+++ linux-2.6.25.1/net/netfilter/Kconfig
+--- linux-2.6.25.4.orig/net/netfilter/Kconfig
++++ linux-2.6.25.4/net/netfilter/Kconfig
@@ -258,6 +258,16 @@ config NF_CONNTRACK_TFTP
To compile it as a module, choose M here. If unsure, say N.
@@ -331,10 +331,10 @@ Index: linux-2.6.25.1/net/netfilter/Kconfig
config NF_CT_NETLINK
tristate 'Connection tracking netlink interface'
depends on NF_CONNTRACK
-Index: linux-2.6.25.1/net/netfilter/Makefile
+Index: linux-2.6.25.4/net/netfilter/Makefile
===================================================================
---- linux-2.6.25.1.orig/net/netfilter/Makefile
-+++ linux-2.6.25.1/net/netfilter/Makefile
+--- linux-2.6.25.4.orig/net/netfilter/Makefile
++++ linux-2.6.25.4/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
@@ -343,10 +343,10 @@ Index: linux-2.6.25.1/net/netfilter/Makefile
# generic X tables
obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o
-Index: linux-2.6.25.1/net/ipv4/netfilter/Kconfig
+Index: linux-2.6.25.4/net/ipv4/netfilter/Kconfig
===================================================================
---- linux-2.6.25.1.orig/net/ipv4/netfilter/Kconfig
-+++ linux-2.6.25.1/net/ipv4/netfilter/Kconfig
+--- linux-2.6.25.4.orig/net/ipv4/netfilter/Kconfig
++++ linux-2.6.25.4/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
@@ -359,10 +359,10 @@ Index: linux-2.6.25.1/net/ipv4/netfilter/Kconfig
config NF_NAT_TFTP
tristate
depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
-Index: linux-2.6.25.1/net/netfilter/nf_conntrack_rtsp.c
+Index: linux-2.6.25.4/net/netfilter/nf_conntrack_rtsp.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/net/netfilter/nf_conntrack_rtsp.c
++++ linux-2.6.25.4/net/netfilter/nf_conntrack_rtsp.c
@@ -0,0 +1,513 @@
+/*
+ * RTSP extension for IP connection tracking
@@ -877,10 +877,10 @@ Index: linux-2.6.25.1/net/netfilter/nf_conntrack_rtsp.c
+
+EXPORT_SYMBOL(nf_nat_rtsp_hook_expectfn);
+
-Index: linux-2.6.25.1/net/ipv4/netfilter/nf_nat_rtsp.c
+Index: linux-2.6.25.4/net/ipv4/netfilter/nf_nat_rtsp.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/net/ipv4/netfilter/nf_nat_rtsp.c
++++ linux-2.6.25.4/net/ipv4/netfilter/nf_nat_rtsp.c
@@ -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 142c82ab18..ac39a8c72f 100644
--- 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,7 @@
-Index: linux-2.6.25.1/include/linux/pkt_sched.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/linux/pkt_sched.h
++++ linux-2.6.25.4/include/linux/pkt_sched.h
@@ -162,8 +162,37 @@ struct tc_sfq_xstats
*
* The only reason for this is efficiency, it is possible
@@ -40,10 +40,10 @@ Index: linux-2.6.25.1/include/linux/pkt_sched.h
/* RED section */
enum
-Index: linux-2.6.25.1/net/sched/Kconfig
+Index: linux-2.6.25.4/net/sched/Kconfig
===================================================================
---- linux-2.6.25.1.orig/net/sched/Kconfig
-+++ linux-2.6.25.1/net/sched/Kconfig
+--- linux-2.6.25.4.orig/net/sched/Kconfig
++++ linux-2.6.25.4/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.
@@ -82,10 +82,10 @@ Index: linux-2.6.25.1/net/sched/Kconfig
config NET_SCH_TEQL
tristate "True Link Equalizer (TEQL)"
---help---
-Index: linux-2.6.25.1/net/sched/Makefile
+Index: linux-2.6.25.4/net/sched/Makefile
===================================================================
---- linux-2.6.25.1.orig/net/sched/Makefile
-+++ linux-2.6.25.1/net/sched/Makefile
+--- linux-2.6.25.4.orig/net/sched/Makefile
++++ linux-2.6.25.4/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
@@ -94,10 +94,10 @@ Index: linux-2.6.25.1/net/sched/Makefile
obj-$(CONFIG_NET_SCH_TBF) += sch_tbf.o
obj-$(CONFIG_NET_SCH_TEQL) += sch_teql.o
obj-$(CONFIG_NET_SCH_PRIO) += sch_prio.o
-Index: linux-2.6.25.1/net/sched/sch_esfq.c
+Index: linux-2.6.25.4/net/sched/sch_esfq.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/net/sched/sch_esfq.c
++++ linux-2.6.25.4/net/sched/sch_esfq.c
@@ -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 e461729b4f..165c0cb867 100644
--- 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,7 +1,7 @@
-Index: linux-2.6.25.1/arch/mips/Makefile
+Index: linux-2.6.25.4/arch/mips/Makefile
===================================================================
---- linux-2.6.25.1.orig/arch/mips/Makefile
-+++ linux-2.6.25.1/arch/mips/Makefile
+--- linux-2.6.25.4.orig/arch/mips/Makefile
++++ linux-2.6.25.4/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
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 3c004888ba..787ac6d218 100644
--- 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,7 +1,7 @@
-Index: linux-2.6.25.1/fs/jffs2/build.c
+Index: linux-2.6.25.4/fs/jffs2/build.c
===================================================================
---- linux-2.6.25.1.orig/fs/jffs2/build.c
-+++ linux-2.6.25.1/fs/jffs2/build.c
+--- linux-2.6.25.4.orig/fs/jffs2/build.c
++++ linux-2.6.25.4/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);
@@ -20,10 +20,10 @@ Index: linux-2.6.25.1/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. */
-Index: linux-2.6.25.1/fs/jffs2/scan.c
+Index: linux-2.6.25.4/fs/jffs2/scan.c
===================================================================
---- linux-2.6.25.1.orig/fs/jffs2/scan.c
-+++ linux-2.6.25.1/fs/jffs2/scan.c
+--- linux-2.6.25.4.orig/fs/jffs2/scan.c
++++ linux-2.6.25.4/fs/jffs2/scan.c
@@ -142,9 +142,12 @@ int jffs2_scan_medium(struct jffs2_sb_in
/* reset summary info for next eraseblock scan */
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 1ac884f437..55bc40eb82 100644
--- 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.25.1/include/asm-powerpc/segment.h
+Index: linux-2.6.25.4/include/asm-powerpc/segment.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/asm-powerpc/segment.h
++++ linux-2.6.25.4/include/asm-powerpc/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 7507ec650e..3a377c2e87 100644
--- 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,7 +1,7 @@
-Index: linux-2.6.25.1/drivers/net/r8169.c
+Index: linux-2.6.25.4/drivers/net/r8169.c
===================================================================
---- linux-2.6.25.1.orig/drivers/net/r8169.c
-+++ linux-2.6.25.1/drivers/net/r8169.c
+--- linux-2.6.25.4.orig/drivers/net/r8169.c
++++ linux-2.6.25.4/drivers/net/r8169.c
@@ -1537,7 +1537,7 @@ static const struct rtl_cfg_info {
.hw_start = rtl_hw_start_8169,
.region = 1,
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 f6da5058c8..9ff09b3b35 100644
--- 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,7 +1,7 @@
-Index: linux-2.6.25.1/fs/Kconfig
+Index: linux-2.6.25.4/fs/Kconfig
===================================================================
---- linux-2.6.25.1.orig/fs/Kconfig
-+++ linux-2.6.25.1/fs/Kconfig
+--- linux-2.6.25.4.orig/fs/Kconfig
++++ linux-2.6.25.4/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.
@@ -12,10 +12,10 @@ Index: linux-2.6.25.1/fs/Kconfig
config MINIX_FS
tristate "Minix file system support"
depends on BLOCK
-Index: linux-2.6.25.1/fs/Makefile
+Index: linux-2.6.25.4/fs/Makefile
===================================================================
---- linux-2.6.25.1.orig/fs/Makefile
-+++ linux-2.6.25.1/fs/Makefile
+--- linux-2.6.25.4.orig/fs/Makefile
++++ linux-2.6.25.4/fs/Makefile
@@ -77,6 +77,7 @@ obj-$(CONFIG_SQUASHFS) += squashfs/
obj-y += ramfs/
obj-$(CONFIG_HUGETLBFS) += hugetlbfs/
@@ -24,10 +24,10 @@ Index: linux-2.6.25.1/fs/Makefile
obj-$(CONFIG_MINIX_FS) += minix/
obj-$(CONFIG_FAT_FS) += fat/
obj-$(CONFIG_MSDOS_FS) += msdos/
-Index: linux-2.6.25.1/fs/mini_fo/aux.c
+Index: linux-2.6.25.4/fs/mini_fo/aux.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/fs/mini_fo/aux.c
++++ linux-2.6.25.4/fs/mini_fo/aux.c
@@ -0,0 +1,577 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
@@ -606,10 +606,10 @@ Index: linux-2.6.25.1/fs/mini_fo/aux.c
+
+#endif /* unused */
+
-Index: linux-2.6.25.1/fs/mini_fo/ChangeLog
+Index: linux-2.6.25.4/fs/mini_fo/ChangeLog
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/fs/mini_fo/ChangeLog
++++ linux-2.6.25.4/fs/mini_fo/ChangeLog
@@ -0,0 +1,281 @@
+2006-01-24 Markus Klotzbuecher <mk@mary.denx.de>
+
@@ -892,10 +892,10 @@ Index: linux-2.6.25.1/fs/mini_fo/ChangeLog
+ * Implementation of mini_fo_mknod and mini_fo_rename, support
+ for device files.
+
-Index: linux-2.6.25.1/fs/mini_fo/dentry.c
+Index: linux-2.6.25.4/fs/mini_fo/dentry.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/fs/mini_fo/dentry.c
++++ linux-2.6.25.4/fs/mini_fo/dentry.c
@@ -0,0 +1,244 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
@@ -1141,10 +1141,10 @@ Index: linux-2.6.25.1/fs/mini_fo/dentry.c
+ d_delete: mini_fo_d_delete,
+ d_iput: mini_fo_d_iput,
+};
-Index: linux-2.6.25.1/fs/mini_fo/file.c
+Index: linux-2.6.25.4/fs/mini_fo/file.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/fs/mini_fo/file.c
++++ linux-2.6.25.4/fs/mini_fo/file.c
@@ -0,0 +1,713 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
@@ -1859,10 +1859,10 @@ Index: linux-2.6.25.1/fs/mini_fo/file.c
+ /* not implemented: sendpage */
+ /* not implemented: get_unmapped_area */
+ };
-Index: linux-2.6.25.1/fs/mini_fo/fist.h
+Index: linux-2.6.25.4/fs/mini_fo/fist.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/fs/mini_fo/fist.h
++++ linux-2.6.25.4/fs/mini_fo/fist.h
@@ -0,0 +1,252 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
@@ -2116,10 +2116,10 @@ Index: linux-2.6.25.1/fs/mini_fo/fist.h
+# define FIST_IOCTL_SET_DEBUG_VALUE _IOW(0x15, 2, int)
+
+#endif /* not __FIST_H_ */
-Index: linux-2.6.25.1/fs/mini_fo/inode.c
+Index: linux-2.6.25.4/fs/mini_fo/inode.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/fs/mini_fo/inode.c
++++ linux-2.6.25.4/fs/mini_fo/inode.c
@@ -0,0 +1,1564 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
@@ -3685,10 +3685,10 @@ Index: linux-2.6.25.1/fs/mini_fo/inode.c
+ removexattr: mini_fo_removexattr
+# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
+ };
-Index: linux-2.6.25.1/fs/mini_fo/main.c
+Index: linux-2.6.25.4/fs/mini_fo/main.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/fs/mini_fo/main.c
++++ linux-2.6.25.4/fs/mini_fo/main.c
@@ -0,0 +1,423 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
@@ -4113,10 +4113,10 @@ Index: linux-2.6.25.1/fs/mini_fo/main.c
+
+module_init(init_mini_fo_fs)
+module_exit(exit_mini_fo_fs)
-Index: linux-2.6.25.1/fs/mini_fo/Makefile
+Index: linux-2.6.25.4/fs/mini_fo/Makefile
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/fs/mini_fo/Makefile
++++ linux-2.6.25.4/fs/mini_fo/Makefile
@@ -0,0 +1,17 @@
+#
+# Makefile for mini_fo 2.4 and 2.6 Linux kernels
@@ -4135,10 +4135,10 @@ Index: linux-2.6.25.1/fs/mini_fo/Makefile
+# dependencies
+${mini_fo-objs}: mini_fo.h fist.h
+
-Index: linux-2.6.25.1/fs/mini_fo/meta.c
+Index: linux-2.6.25.4/fs/mini_fo/meta.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/fs/mini_fo/meta.c
++++ linux-2.6.25.4/fs/mini_fo/meta.c
@@ -0,0 +1,1000 @@
+/*
+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
@@ -5140,10 +5140,10 @@ Index: linux-2.6.25.1/fs/mini_fo/meta.c
+ return 0;
+}
+
-Index: linux-2.6.25.1/fs/mini_fo/mini_fo.h
+Index: linux-2.6.25.4/fs/mini_fo/mini_fo.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/fs/mini_fo/mini_fo.h
++++ linux-2.6.25.4/fs/mini_fo/mini_fo.h
@@ -0,0 +1,510 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
@@ -5655,10 +5655,10 @@ Index: linux-2.6.25.1/fs/mini_fo/mini_fo.h
+/* ioctls */
+
+#endif /* not __MINI_FO_H_ */
-Index: linux-2.6.25.1/fs/mini_fo/mini_fo-merge
+Index: linux-2.6.25.4/fs/mini_fo/mini_fo-merge
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/fs/mini_fo/mini_fo-merge
++++ linux-2.6.25.4/fs/mini_fo/mini_fo-merge
@@ -0,0 +1,180 @@
+#!/bin/bash
+#
@@ -5840,10 +5840,10 @@ Index: linux-2.6.25.1/fs/mini_fo/mini_fo-merge
+#rm $TMP/$SKIP_DEL_LIST
+
+echo "Done!"
-Index: linux-2.6.25.1/fs/mini_fo/mini_fo-overlay
+Index: linux-2.6.25.4/fs/mini_fo/mini_fo-overlay
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/fs/mini_fo/mini_fo-overlay
++++ linux-2.6.25.4/fs/mini_fo/mini_fo-overlay
@@ -0,0 +1,130 @@
+#!/bin/bash
+#
@@ -5975,10 +5975,10 @@ Index: linux-2.6.25.1/fs/mini_fo/mini_fo-overlay
+if [ $? -ne 0 ]; then
+ echo "Error, mounting failed, maybe no permisson to mount?"
+fi
-Index: linux-2.6.25.1/fs/mini_fo/mmap.c
+Index: linux-2.6.25.4/fs/mini_fo/mmap.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/fs/mini_fo/mmap.c
++++ linux-2.6.25.4/fs/mini_fo/mmap.c
@@ -0,0 +1,637 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
@@ -6617,10 +6617,10 @@ Index: linux-2.6.25.1/fs/mini_fo/mmap.c
+ print_exit_status(err);
+ return err;
+}
-Index: linux-2.6.25.1/fs/mini_fo/README
+Index: linux-2.6.25.4/fs/mini_fo/README
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/fs/mini_fo/README
++++ linux-2.6.25.4/fs/mini_fo/README
@@ -0,0 +1,163 @@
+README for the mini_fo overlay file system
+=========================================
@@ -6785,10 +6785,10 @@ Index: linux-2.6.25.1/fs/mini_fo/README
+2 of the License, or (at your option) any later version.
+
+
-Index: linux-2.6.25.1/fs/mini_fo/RELEASE_NOTES
+Index: linux-2.6.25.4/fs/mini_fo/RELEASE_NOTES
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/fs/mini_fo/RELEASE_NOTES
++++ linux-2.6.25.4/fs/mini_fo/RELEASE_NOTES
@@ -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.25.1/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.
-Index: linux-2.6.25.1/fs/mini_fo/state.c
+Index: linux-2.6.25.4/fs/mini_fo/state.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/fs/mini_fo/state.c
++++ linux-2.6.25.4/fs/mini_fo/state.c
@@ -0,0 +1,620 @@
+/*
+ * Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
@@ -7526,10 +7526,10 @@ Index: linux-2.6.25.1/fs/mini_fo/state.c
+ return err;
+}
+
-Index: linux-2.6.25.1/fs/mini_fo/super.c
+Index: linux-2.6.25.4/fs/mini_fo/super.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/fs/mini_fo/super.c
++++ linux-2.6.25.4/fs/mini_fo/super.c
@@ -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 337d4de9e3..bb83133b34 100644
--- 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.1/fs/mini_fo/main.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/fs/mini_fo/main.c
++++ linux-2.6.25.4/fs/mini_fo/main.c
@@ -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.1/fs/mini_fo/main.c
stohs2(sb) = hidden_root2->d_sb;
/* validate storage dir, this is done in
-Index: linux-2.6.25.1/fs/mini_fo/mini_fo.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/fs/mini_fo/mini_fo.h
++++ linux-2.6.25.4/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);
@@ -95,10 +95,10 @@ Index: linux-2.6.25.1/fs/mini_fo/mini_fo.h
/*
* Definitions for user and kernel code
*/
-Index: linux-2.6.25.1/fs/mini_fo/super.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/fs/mini_fo/super.c
++++ linux-2.6.25.4/fs/mini_fo/super.c
@@ -262,10 +262,31 @@ mini_fo_umount_begin(super_block_t *sb)
}
#endif
@@ -131,10 +131,10 @@ Index: linux-2.6.25.1/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) */
-Index: linux-2.6.25.1/fs/mini_fo/aux.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/fs/mini_fo/aux.c
++++ linux-2.6.25.4/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);
diff --git a/target/linux/generic-2.6/patches-2.6.25/211-mini_fo_2.6.25_dentry_open_war.patch b/target/linux/generic-2.6/patches-2.6.25/211-mini_fo_2.6.25_dentry_open_war.patch
index 44e89f8a23..a9e42ac07a 100644
--- a/target/linux/generic-2.6/patches-2.6.25/211-mini_fo_2.6.25_dentry_open_war.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/211-mini_fo_2.6.25_dentry_open_war.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/fs/mini_fo/meta.c
+Index: linux-2.6.25.4/fs/mini_fo/meta.c
===================================================================
---- linux-2.6.25.1.orig/fs/mini_fo/meta.c
-+++ linux-2.6.25.1/fs/mini_fo/meta.c
+--- linux-2.6.25.4.orig/fs/mini_fo/meta.c
++++ linux-2.6.25.4/fs/mini_fo/meta.c
@@ -442,6 +442,11 @@ int meta_write_d_entry(dentry_t *dentry,
S_IRUSR | S_IWUSR);
#endif
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 1777b01d7b..4d90fc0f6d 100644
--- 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,7 +1,7 @@
-Index: linux-2.6.25.1/lib/kobject_uevent.c
+Index: linux-2.6.25.4/lib/kobject_uevent.c
===================================================================
---- linux-2.6.25.1.orig/lib/kobject_uevent.c
-+++ linux-2.6.25.1/lib/kobject_uevent.c
+--- linux-2.6.25.4.orig/lib/kobject_uevent.c
++++ linux-2.6.25.4/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);
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 331ae38380..e2f83a7581 100644
--- 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,7 +1,7 @@
-Index: linux-2.6.25.1/sound/core/Kconfig
+Index: linux-2.6.25.4/sound/core/Kconfig
===================================================================
---- linux-2.6.25.1.orig/sound/core/Kconfig
-+++ linux-2.6.25.1/sound/core/Kconfig
+--- linux-2.6.25.4.orig/sound/core/Kconfig
++++ linux-2.6.25.4/sound/core/Kconfig
@@ -9,7 +9,7 @@ config SND_PCM
depends on SND
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 c761ed456b..b9a352abef 100644
--- 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,7 +1,7 @@
-Index: linux-2.6.25.1/drivers/leds/Kconfig
+Index: linux-2.6.25.4/drivers/leds/Kconfig
===================================================================
---- linux-2.6.25.1.orig/drivers/leds/Kconfig
-+++ linux-2.6.25.1/drivers/leds/Kconfig
+--- linux-2.6.25.4.orig/drivers/leds/Kconfig
++++ linux-2.6.25.4/drivers/leds/Kconfig
@@ -181,4 +181,8 @@ config LEDS_TRIGGER_HEARTBEAT
load average.
If unsure, say Y.
@@ -11,10 +11,10 @@ Index: linux-2.6.25.1/drivers/leds/Kconfig
+ depends on LEDS_TRIGGERS
+
endif # NEW_LEDS
-Index: linux-2.6.25.1/drivers/leds/Makefile
+Index: linux-2.6.25.4/drivers/leds/Makefile
===================================================================
---- linux-2.6.25.1.orig/drivers/leds/Makefile
-+++ linux-2.6.25.1/drivers/leds/Makefile
+--- linux-2.6.25.4.orig/drivers/leds/Makefile
++++ linux-2.6.25.4/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
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 9a48bc2954..ec96c23ae2 100644
--- 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,7 @@
-Index: linux-2.6.25.1/drivers/leds/Kconfig
+Index: linux-2.6.25.4/drivers/leds/Kconfig
===================================================================
---- linux-2.6.25.1.orig/drivers/leds/Kconfig
-+++ linux-2.6.25.1/drivers/leds/Kconfig
+--- linux-2.6.25.4.orig/drivers/leds/Kconfig
++++ linux-2.6.25.4/drivers/leds/Kconfig
@@ -79,6 +79,12 @@ config LEDS_WRAP
help
This option enables support for the PCEngines WRAP programmable LEDs.
@@ -15,10 +15,10 @@ Index: linux-2.6.25.1/drivers/leds/Kconfig
config LEDS_H1940
tristate "LED Support for iPAQ H1940 device"
depends on LEDS_CLASS && ARCH_H1940
-Index: linux-2.6.25.1/drivers/leds/Makefile
+Index: linux-2.6.25.4/drivers/leds/Makefile
===================================================================
---- linux-2.6.25.1.orig/drivers/leds/Makefile
-+++ linux-2.6.25.1/drivers/leds/Makefile
+--- linux-2.6.25.4.orig/drivers/leds/Makefile
++++ linux-2.6.25.4/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
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 2cdccf2941..83d1cf6fef 100644
--- 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,7 @@
-Index: linux-2.6.25.1/drivers/leds/Kconfig
+Index: linux-2.6.25.4/drivers/leds/Kconfig
===================================================================
---- linux-2.6.25.1.orig/drivers/leds/Kconfig
-+++ linux-2.6.25.1/drivers/leds/Kconfig
+--- linux-2.6.25.4.orig/drivers/leds/Kconfig
++++ linux-2.6.25.4/drivers/leds/Kconfig
@@ -191,4 +191,11 @@ config LEDS_TRIGGER_MORSE
tristate "LED Morse Trigger"
depends on LEDS_TRIGGERS
@@ -14,10 +14,10 @@ Index: linux-2.6.25.1/drivers/leds/Kconfig
+ If unsure, say Y.
+
endif # NEW_LEDS
-Index: linux-2.6.25.1/drivers/leds/Makefile
+Index: linux-2.6.25.4/drivers/leds/Makefile
===================================================================
---- linux-2.6.25.1.orig/drivers/leds/Makefile
-+++ linux-2.6.25.1/drivers/leds/Makefile
+--- linux-2.6.25.4.orig/drivers/leds/Makefile
++++ linux-2.6.25.4/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
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 efaf82657a..5c75c51cf1 100644
--- 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,7 +1,7 @@
-Index: linux-2.6.25.1/drivers/rtc/rtc-ds1672.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/drivers/rtc/rtc-ds1672.c
++++ linux-2.6.25.4/drivers/rtc/rtc-ds1672.c
@@ -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 ac889fa723..45e8448f25 100644
--- 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,7 +1,7 @@
-Index: linux-2.6.25.1/drivers/input/misc/Kconfig
+Index: linux-2.6.25.4/drivers/input/misc/Kconfig
===================================================================
---- linux-2.6.25.1.orig/drivers/input/misc/Kconfig
-+++ linux-2.6.25.1/drivers/input/misc/Kconfig
+--- linux-2.6.25.4.orig/drivers/input/misc/Kconfig
++++ linux-2.6.25.4/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.
@@ -23,10 +23,10 @@ Index: linux-2.6.25.1/drivers/input/misc/Kconfig
+ module will be called gpio-buttons.
+
endif
-Index: linux-2.6.25.1/drivers/input/misc/Makefile
+Index: linux-2.6.25.4/drivers/input/misc/Makefile
===================================================================
---- linux-2.6.25.1.orig/drivers/input/misc/Makefile
-+++ linux-2.6.25.1/drivers/input/misc/Makefile
+--- linux-2.6.25.4.orig/drivers/input/misc/Makefile
++++ linux-2.6.25.4/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
diff --git a/target/linux/generic-2.6/patches-2.6.25/420-gpiodev.patch b/target/linux/generic-2.6/patches-2.6.25/420-gpiodev.patch
index 4c252f5988..215fc53344 100644
--- a/target/linux/generic-2.6/patches-2.6.25/420-gpiodev.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/420-gpiodev.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25/drivers/gpio/Kconfig
+Index: linux-2.6.25.4/drivers/gpio/Kconfig
===================================================================
---- linux-2.6.25.orig/drivers/gpio/Kconfig 2008-04-27 23:35:57.000000000 +0100
-+++ linux-2.6.25/drivers/gpio/Kconfig 2008-04-27 23:42:52.000000000 +0100
+--- linux-2.6.25.4.orig/drivers/gpio/Kconfig
++++ linux-2.6.25.4/drivers/gpio/Kconfig
@@ -2,6 +2,13 @@
# GPIO infrastructure and expanders
#
@@ -16,10 +16,10 @@ Index: linux-2.6.25/drivers/gpio/Kconfig
config HAVE_GPIO_LIB
bool
help
-Index: linux-2.6.25/drivers/gpio/Makefile
+Index: linux-2.6.25.4/drivers/gpio/Makefile
===================================================================
---- linux-2.6.25.orig/drivers/gpio/Makefile 2008-04-27 23:42:59.000000000 +0100
-+++ linux-2.6.25/drivers/gpio/Makefile 2008-04-27 23:43:41.000000000 +0100
+--- linux-2.6.25.4.orig/drivers/gpio/Makefile
++++ linux-2.6.25.4/drivers/gpio/Makefile
@@ -7,3 +7,4 @@ obj-$(CONFIG_HAVE_GPIO_LIB) += gpiolib.o
obj-$(CONFIG_GPIO_MCP23S08) += mcp23s08.o
obj-$(CONFIG_GPIO_PCA953X) += pca953x.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 4193983551..ea56fae18d 100644
--- 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,7 +1,7 @@
-Index: linux-2.6.25.1/fs/Kconfig
+Index: linux-2.6.25.4/fs/Kconfig
===================================================================
---- linux-2.6.25.1.orig/fs/Kconfig
-+++ linux-2.6.25.1/fs/Kconfig
+--- linux-2.6.25.4.orig/fs/Kconfig
++++ linux-2.6.25.4/fs/Kconfig
@@ -421,6 +421,7 @@ config FS_POSIX_ACL
source "fs/xfs/Kconfig"
@@ -10,10 +10,10 @@ Index: linux-2.6.25.1/fs/Kconfig
config OCFS2_FS
tristate "OCFS2 file system support"
-Index: linux-2.6.25.1/fs/Makefile
+Index: linux-2.6.25.4/fs/Makefile
===================================================================
---- linux-2.6.25.1.orig/fs/Makefile
-+++ linux-2.6.25.1/fs/Makefile
+--- linux-2.6.25.4.orig/fs/Makefile
++++ linux-2.6.25.4/fs/Makefile
@@ -121,3 +121,4 @@ obj-$(CONFIG_HPPFS) += hppfs/
obj-$(CONFIG_DEBUG_FS) += debugfs/
obj-$(CONFIG_OCFS2_FS) += ocfs2/
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 c80696f092..9358a18f78 100644
--- 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,7 +1,7 @@
-Index: linux-2.6.25.1/drivers/net/phy/phy.c
+Index: linux-2.6.25.4/drivers/net/phy/phy.c
===================================================================
---- linux-2.6.25.1.orig/drivers/net/phy/phy.c
-+++ linux-2.6.25.1/drivers/net/phy/phy.c
+--- linux-2.6.25.4.orig/drivers/net/phy/phy.c
++++ linux-2.6.25.4/drivers/net/phy/phy.c
@@ -348,6 +348,50 @@ int phy_ethtool_gset(struct phy_device *
}
EXPORT_SYMBOL(phy_ethtool_gset);
@@ -53,10 +53,10 @@ Index: linux-2.6.25.1/drivers/net/phy/phy.c
/**
* phy_mii_ioctl - generic PHY MII ioctl interface
* @phydev: the phy_device struct
-Index: linux-2.6.25.1/include/linux/phy.h
+Index: linux-2.6.25.4/include/linux/phy.h
===================================================================
---- linux-2.6.25.1.orig/include/linux/phy.h
-+++ linux-2.6.25.1/include/linux/phy.h
+--- linux-2.6.25.4.orig/include/linux/phy.h
++++ linux-2.6.25.4/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);
diff --git a/target/linux/generic-2.6/patches-2.6.25/610-phy_detect.patch b/target/linux/generic-2.6/patches-2.6.25/610-phy_detect.patch
index 454415341f..6fb6852d8a 100644
--- a/target/linux/generic-2.6/patches-2.6.25/610-phy_detect.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/610-phy_detect.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.25.1/drivers/net/phy/mdio_bus.c
+Index: linux-2.6.25.4/drivers/net/phy/mdio_bus.c
===================================================================
---- linux-2.6.25.1.orig/drivers/net/phy/mdio_bus.c 2008-05-01 23:45:25.000000000 +0200
-+++ linux-2.6.25.1/drivers/net/phy/mdio_bus.c 2008-05-12 23:44:21.000000000 +0200
-@@ -132,6 +132,9 @@
+--- linux-2.6.25.4.orig/drivers/net/phy/mdio_bus.c
++++ linux-2.6.25.4/drivers/net/phy/mdio_bus.c
+@@ -132,6 +132,9 @@ static int mdio_bus_match(struct device
struct phy_device *phydev = to_phy_device(dev);
struct phy_driver *phydrv = to_phy_driver(drv);
@@ -12,11 +12,11 @@ Index: linux-2.6.25.1/drivers/net/phy/mdio_bus.c
return ((phydrv->phy_id & phydrv->phy_id_mask) ==
(phydev->phy_id & phydrv->phy_id_mask));
}
-Index: linux-2.6.25.1/include/linux/phy.h
+Index: linux-2.6.25.4/include/linux/phy.h
===================================================================
---- linux-2.6.25.1.orig/include/linux/phy.h 2008-05-01 23:45:25.000000000 +0200
-+++ linux-2.6.25.1/include/linux/phy.h 2008-05-12 23:44:21.000000000 +0200
-@@ -325,6 +325,11 @@
+--- linux-2.6.25.4.orig/include/linux/phy.h
++++ linux-2.6.25.4/include/linux/phy.h
+@@ -325,6 +325,11 @@ struct phy_driver {
u32 features;
u32 flags;
diff --git a/target/linux/generic-2.6/patches-2.6.25/620-phy_adm6996.patch b/target/linux/generic-2.6/patches-2.6.25/620-phy_adm6996.patch
index 10da7cf7ff..fda414a171 100644
--- a/target/linux/generic-2.6/patches-2.6.25/620-phy_adm6996.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/620-phy_adm6996.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.25.1/drivers/net/phy/Kconfig
+Index: linux-2.6.25.4/drivers/net/phy/Kconfig
===================================================================
---- linux-2.6.25.1.orig/drivers/net/phy/Kconfig 2008-05-01 23:45:25.000000000 +0200
-+++ linux-2.6.25.1/drivers/net/phy/Kconfig 2008-05-12 23:44:33.000000000 +0200
-@@ -65,6 +65,11 @@
+--- linux-2.6.25.4.orig/drivers/net/phy/Kconfig
++++ linux-2.6.25.4/drivers/net/phy/Kconfig
+@@ -65,6 +65,11 @@ config REALTEK_PHY
---help---
Supports the Realtek 821x PHY.
@@ -14,11 +14,11 @@ Index: linux-2.6.25.1/drivers/net/phy/Kconfig
config FIXED_PHY
bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
depends on PHYLIB=y
-Index: linux-2.6.25.1/drivers/net/phy/Makefile
+Index: linux-2.6.25.4/drivers/net/phy/Makefile
===================================================================
---- linux-2.6.25.1.orig/drivers/net/phy/Makefile 2008-05-01 23:45:25.000000000 +0200
-+++ linux-2.6.25.1/drivers/net/phy/Makefile 2008-05-12 23:44:50.000000000 +0200
-@@ -12,6 +12,7 @@
+--- linux-2.6.25.4.orig/drivers/net/phy/Makefile
++++ linux-2.6.25.4/drivers/net/phy/Makefile
+@@ -12,6 +12,7 @@ obj-$(CONFIG_SMSC_PHY) += smsc.o
obj-$(CONFIG_VITESSE_PHY) += vitesse.o
obj-$(CONFIG_BROADCOM_PHY) += broadcom.o
obj-$(CONFIG_ICPLUS_PHY) += icplus.o
diff --git a/target/linux/generic-2.6/patches-2.6.25/630-phy_packets.patch b/target/linux/generic-2.6/patches-2.6.25/630-phy_packets.patch
index 930139b556..e5947e13ec 100644
--- a/target/linux/generic-2.6/patches-2.6.25/630-phy_packets.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/630-phy_packets.patch
@@ -1,10 +1,10 @@
-Index: linux-2.6.23.16/drivers/net/phy/phy_device.c
+Index: linux-2.6.25.4/drivers/net/phy/phy_device.c
===================================================================
---- linux-2.6.23.16.orig/drivers/net/phy/phy_device.c 2008-04-20 10:16:21.000000000 +0200
-+++ linux-2.6.23.16/drivers/net/phy/phy_device.c 2008-04-29 14:20:03.000000000 +0200
-@@ -44,6 +44,18 @@
- extern int mdio_bus_init(void);
- extern void mdio_bus_exit(void);
+--- linux-2.6.25.4.orig/drivers/net/phy/phy_device.c
++++ linux-2.6.25.4/drivers/net/phy/phy_device.c
+@@ -53,6 +53,18 @@ static void phy_device_release(struct de
+ phy_device_free(to_phy_device(dev));
+ }
+static int generic_receive_skb(struct sk_buff *skb)
+{
@@ -21,20 +21,20 @@ Index: linux-2.6.23.16/drivers/net/phy/phy_device.c
struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
{
struct phy_device *dev;
-@@ -67,6 +79,8 @@
+@@ -78,6 +90,8 @@ struct phy_device* phy_device_create(str
dev->bus = bus;
dev->state = PHY_DOWN;
+ dev->netif_receive_skb = &generic_receive_skb;
+ dev->netif_rx = &generic_rx;
- spin_lock_init(&dev->lock);
+ mutex_init(&dev->lock);
-Index: linux-2.6.23.16/include/linux/phy.h
+Index: linux-2.6.25.4/include/linux/phy.h
===================================================================
---- linux-2.6.23.16.orig/include/linux/phy.h 2008-04-20 10:16:21.000000000 +0200
-+++ linux-2.6.23.16/include/linux/phy.h 2008-04-20 10:17:58.000000000 +0200
-@@ -289,6 +289,17 @@
+--- linux-2.6.25.4.orig/include/linux/phy.h
++++ linux-2.6.25.4/include/linux/phy.h
+@@ -295,6 +295,17 @@ struct phy_device {
void (*adjust_link)(struct net_device *dev);
void (*adjust_state)(struct net_device *dev);
@@ -52,11 +52,11 @@ Index: linux-2.6.23.16/include/linux/phy.h
};
#define to_phy_device(d) container_of(d, struct phy_device, dev)
-Index: linux-2.6.23.16/include/linux/netdevice.h
+Index: linux-2.6.25.4/include/linux/netdevice.h
===================================================================
---- linux-2.6.23.16.orig/include/linux/netdevice.h 2008-04-20 10:16:21.000000000 +0200
-+++ linux-2.6.23.16/include/linux/netdevice.h 2008-04-20 10:17:58.000000000 +0200
-@@ -426,6 +426,7 @@
+--- linux-2.6.25.4.orig/include/linux/netdevice.h
++++ linux-2.6.25.4/include/linux/netdevice.h
+@@ -595,6 +595,7 @@ struct net_device
void *ax25_ptr; /* AX.25 specific data */
struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data,
assign before registering */
diff --git a/target/linux/generic-2.6/patches-2.6.25/640-mvswitch.patch b/target/linux/generic-2.6/patches-2.6.25/640-mvswitch.patch
index 1adcf0d411..62c64baef3 100644
--- a/target/linux/generic-2.6/patches-2.6.25/640-mvswitch.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/640-mvswitch.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.25.1/drivers/net/phy/Kconfig
+Index: linux-2.6.25.4/drivers/net/phy/Kconfig
===================================================================
---- linux-2.6.25.1.orig/drivers/net/phy/Kconfig 2008-05-12 23:44:33.000000000 +0200
-+++ linux-2.6.25.1/drivers/net/phy/Kconfig 2008-05-12 23:45:33.000000000 +0200
-@@ -70,6 +70,12 @@
+--- linux-2.6.25.4.orig/drivers/net/phy/Kconfig
++++ linux-2.6.25.4/drivers/net/phy/Kconfig
+@@ -70,6 +70,12 @@ config ADM6996_PHY
---help---
Currently supports the ADM6996F switch
@@ -15,11 +15,11 @@ Index: linux-2.6.25.1/drivers/net/phy/Kconfig
config FIXED_PHY
bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
depends on PHYLIB=y
-Index: linux-2.6.25.1/drivers/net/phy/Makefile
+Index: linux-2.6.25.4/drivers/net/phy/Makefile
===================================================================
---- linux-2.6.25.1.orig/drivers/net/phy/Makefile 2008-05-12 23:44:50.000000000 +0200
-+++ linux-2.6.25.1/drivers/net/phy/Makefile 2008-05-12 23:45:59.000000000 +0200
-@@ -13,6 +13,7 @@
+--- linux-2.6.25.4.orig/drivers/net/phy/Makefile
++++ linux-2.6.25.4/drivers/net/phy/Makefile
+@@ -13,6 +13,7 @@ obj-$(CONFIG_VITESSE_PHY) += vitesse.o
obj-$(CONFIG_BROADCOM_PHY) += broadcom.o
obj-$(CONFIG_ICPLUS_PHY) += icplus.o
obj-$(CONFIG_ADM6996_PHY) += adm6996.o
@@ -27,10 +27,10 @@ Index: linux-2.6.25.1/drivers/net/phy/Makefile
obj-$(CONFIG_REALTEK_PHY) += realtek.o
obj-$(CONFIG_FIXED_PHY) += fixed.o
obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o
-Index: linux-2.6.25.1/drivers/net/phy/mdio_bus.c
+Index: linux-2.6.25.4/drivers/net/phy/mdio_bus.c
===================================================================
---- linux-2.6.25.1.orig/drivers/net/phy/mdio_bus.c 2008-05-12 23:44:21.000000000 +0200
-+++ linux-2.6.25.1/drivers/net/phy/mdio_bus.c 2008-05-12 23:45:33.000000000 +0200
+--- linux-2.6.25.4.orig/drivers/net/phy/mdio_bus.c
++++ linux-2.6.25.4/drivers/net/phy/mdio_bus.c
@@ -35,6 +35,12 @@
#include <asm/irq.h>
#include <asm/uaccess.h>
@@ -44,7 +44,7 @@ Index: linux-2.6.25.1/drivers/net/phy/mdio_bus.c
/**
* mdiobus_register - bring up all the PHYs on a given bus and attach them to bus
* @bus: target mii_bus
-@@ -85,6 +91,7 @@
+@@ -85,6 +91,7 @@ int mdiobus_register(struct mii_bus *bus
phydev->dev.parent = bus->dev;
phydev->dev.bus = &mdio_bus_type;
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 c207b55614..46690f17b3 100644
--- 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,7 @@
-Index: linux-2.6.25.1/Documentation/kernel-parameters.txt
+Index: linux-2.6.25.4/Documentation/kernel-parameters.txt
===================================================================
---- linux-2.6.25.1.orig/Documentation/kernel-parameters.txt
-+++ linux-2.6.25.1/Documentation/kernel-parameters.txt
+--- linux-2.6.25.4.orig/Documentation/kernel-parameters.txt
++++ linux-2.6.25.4/Documentation/kernel-parameters.txt
@@ -930,6 +930,8 @@ and is between 256 and 4096 characters.
l2cr= [PPC]
@@ -11,10 +11,10 @@ Index: linux-2.6.25.1/Documentation/kernel-parameters.txt
lapic [X86-32,APIC] Enable the local APIC even if BIOS
disabled it.
-Index: linux-2.6.25.1/Documentation/powerpc/booting-without-of.txt
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/Documentation/powerpc/booting-without-of.txt
++++ linux-2.6.25.4/Documentation/powerpc/booting-without-of.txt
@@ -59,12 +59,39 @@ Table of Contents
p) Freescale Synchronous Serial Interface
q) USB EHCI controllers
@@ -713,10 +713,10 @@ Index: linux-2.6.25.1/Documentation/powerpc/booting-without-of.txt
Appendix A - Sample SOC node for MPC8540
========================================
-Index: linux-2.6.25.1/Documentation/powerpc/phyp-assisted-dump.txt
+Index: linux-2.6.25.4/Documentation/powerpc/phyp-assisted-dump.txt
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/Documentation/powerpc/phyp-assisted-dump.txt
++++ linux-2.6.25.4/Documentation/powerpc/phyp-assisted-dump.txt
@@ -0,0 +1,127 @@
+
+ Hypervisor-Assisted Dump
@@ -845,10 +845,10 @@ Index: linux-2.6.25.1/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.
-Index: linux-2.6.25.1/arch/powerpc/Kconfig
+Index: linux-2.6.25.4/arch/powerpc/Kconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/Kconfig
-+++ linux-2.6.25.1/arch/powerpc/Kconfig
+--- linux-2.6.25.4.orig/arch/powerpc/Kconfig
++++ linux-2.6.25.4/arch/powerpc/Kconfig
@@ -49,6 +49,19 @@ config IRQ_PER_CPU
bool
default y
@@ -987,10 +987,10 @@ Index: linux-2.6.25.1/arch/powerpc/Kconfig
config PIN_TLB
bool "Pinned Kernel TLBs (860 ONLY)"
depends on ADVANCED_OPTIONS && 8xx
-Index: linux-2.6.25.1/arch/powerpc/Kconfig.debug
+Index: linux-2.6.25.4/arch/powerpc/Kconfig.debug
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/Kconfig.debug
-+++ linux-2.6.25.1/arch/powerpc/Kconfig.debug
+--- linux-2.6.25.4.orig/arch/powerpc/Kconfig.debug
++++ linux-2.6.25.4/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
@@ -1000,10 +1000,10 @@ Index: linux-2.6.25.1/arch/powerpc/Kconfig.debug
default "0xff002008" if CPM1
help
This specifies the address of the transmit descriptor
-Index: linux-2.6.25.1/arch/powerpc/Makefile
+Index: linux-2.6.25.4/arch/powerpc/Makefile
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/Makefile
-+++ linux-2.6.25.1/arch/powerpc/Makefile
+--- linux-2.6.25.4.orig/arch/powerpc/Makefile
++++ linux-2.6.25.4/arch/powerpc/Makefile
@@ -71,13 +71,11 @@ endif
LDFLAGS_vmlinux := -Bstatic
@@ -1031,10 +1031,10 @@ Index: linux-2.6.25.1/arch/powerpc/Makefile
$(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)
define archhelp
-Index: linux-2.6.25.1/arch/powerpc/boot/Makefile
+Index: linux-2.6.25.4/arch/powerpc/boot/Makefile
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/boot/Makefile
-+++ linux-2.6.25.1/arch/powerpc/boot/Makefile
+--- linux-2.6.25.4.orig/arch/powerpc/boot/Makefile
++++ linux-2.6.25.4/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
@@ -1134,10 +1134,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/Makefile
# clean up files cached by wrapper
clean-kernel := vmlinux.strip vmlinux.bin
-Index: linux-2.6.25.1/arch/powerpc/boot/bamboo.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/bamboo.c
++++ linux-2.6.25.4/arch/powerpc/boot/bamboo.c
@@ -33,7 +33,8 @@ static void bamboo_fixups(void)
ibm440ep_fixup_clocks(sysclk, 11059200, 25000000);
ibm4xx_sdram_fixup_memsize();
@@ -1148,10 +1148,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/bamboo.c
}
void bamboo_init(void *mac0, void *mac1)
-Index: linux-2.6.25.1/arch/powerpc/boot/cpm-serial.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/cpm-serial.c
++++ linux-2.6.25.4/arch/powerpc/boot/cpm-serial.c
@@ -11,6 +11,7 @@
#include "types.h"
#include "io.h"
@@ -1343,10 +1343,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/cpm-serial.c
scdp->open = cpm_serial_open;
scdp->putc = cpm_serial_putc;
-Index: linux-2.6.25.1/arch/powerpc/boot/cuboot-pq2.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/cuboot-pq2.c
++++ linux-2.6.25.4/arch/powerpc/boot/cuboot-pq2.c
@@ -128,7 +128,7 @@ static void fixup_pci(void)
u8 *soc_regs;
int i, len;
@@ -1422,10 +1422,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/cuboot-pq2.c
}
static void pq2_platform_fixups(void)
-Index: linux-2.6.25.1/arch/powerpc/boot/cuboot-rainier.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/cuboot-rainier.c
++++ linux-2.6.25.4/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");
@@ -1436,10 +1436,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/cuboot-rainier.c
}
void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
-Index: linux-2.6.25.1/arch/powerpc/boot/cuboot-sequoia.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/cuboot-sequoia.c
++++ linux-2.6.25.4/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");
@@ -1450,10 +1450,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/cuboot-sequoia.c
}
void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
-Index: linux-2.6.25.1/arch/powerpc/boot/cuboot-taishan.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/cuboot-taishan.c
++++ linux-2.6.25.4/arch/powerpc/boot/cuboot-taishan.c
@@ -40,7 +40,8 @@ static void taishan_fixups(void)
ibm4xx_sdram_fixup_memsize();
@@ -1464,10 +1464,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/cuboot-taishan.c
ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
}
-Index: linux-2.6.25.1/arch/powerpc/boot/cuboot-warp.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/cuboot-warp.c
++++ linux-2.6.25.4/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();
@@ -1477,10 +1477,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/cuboot-warp.c
}
-Index: linux-2.6.25.1/arch/powerpc/boot/cuboot-yosemite.c
+Index: linux-2.6.25.4/arch/powerpc/boot/cuboot-yosemite.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/boot/cuboot-yosemite.c
++++ linux-2.6.25.4/arch/powerpc/boot/cuboot-yosemite.c
@@ -0,0 +1,44 @@
+/*
+ * Old U-boot compatibility for Yosemite
@@ -1526,10 +1526,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/cuboot-yosemite.c
+ fdt_init(_dtb_start);
+ serial_console_init();
+}
-Index: linux-2.6.25.1/arch/powerpc/boot/devtree.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/devtree.c
++++ linux-2.6.25.4/arch/powerpc/boot/devtree.c
@@ -350,3 +350,23 @@ int dt_is_compatible(void *node, const c
return 0;
@@ -1554,10 +1554,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/devtree.c
+ return n;
+}
+
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/bamboo.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/bamboo.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/bamboo.dts
@@ -204,7 +204,6 @@
};
@@ -1574,10 +1574,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/bamboo.dts
device_type = "network";
compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
interrupt-parent = <&UIC1>;
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/canyonlands.dts
+Index: linux-2.6.25.4/arch/powerpc/boot/dts/canyonlands.dts
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/boot/dts/canyonlands.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/canyonlands.dts
@@ -0,0 +1,402 @@
+/*
+ * Device Tree Source for AMCC Canyonlands (460EX)
@@ -1981,10 +1981,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/canyonlands.dts
+ };
+ };
+};
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/ebony.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/ebony.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/ebony.dts
@@ -241,7 +241,6 @@
};
@@ -2001,10 +2001,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/ebony.dts
device_type = "network";
compatible = "ibm,emac-440gp", "ibm,emac";
interrupt-parent = <&UIC1>;
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/ep8248e.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/ep8248e.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/ep8248e.dts
@@ -121,8 +121,7 @@
data@0 {
@@ -2024,10 +2024,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/ep8248e.dts
interrupts = <4 8>;
interrupt-parent = <&PIC>;
fsl,cpm-brg = <7>;
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/ep88xc.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/ep88xc.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/ep88xc.dts
@@ -2,7 +2,7 @@
* EP88xC Device Tree Source
*
@@ -2255,10 +2255,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/ep88xc.dts
fsl,cpm-command = <0000>;
};
};
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/glacier.dts
+Index: linux-2.6.25.4/arch/powerpc/boot/dts/glacier.dts
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/boot/dts/glacier.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/glacier.dts
@@ -0,0 +1,467 @@
+/*
+ * Device Tree Source for AMCC Glacier (460GT)
@@ -2727,10 +2727,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/glacier.dts
+ };
+ };
+};
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/haleakala.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/haleakala.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/haleakala.dts
@@ -12,7 +12,7 @@
#address-cells = <1>;
#size-cells = <1>;
@@ -2749,10 +2749,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/haleakala.dts
rx-fifo-size = <1000>;
tx-fifo-size = <800>;
phy-mode = "rgmii";
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/katmai.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/katmai.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/katmai.dts
@@ -212,7 +212,7 @@
mal-tx-channel = <0>;
mal-rx-channel = <0>;
@@ -2762,10 +2762,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/katmai.dts
rx-fifo-size = <1000>;
tx-fifo-size = <800>;
phy-mode = "gmii";
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/kilauea.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/kilauea.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/kilauea.dts
@@ -219,7 +219,7 @@
mal-tx-channel = <0>;
mal-rx-channel = <0>;
@@ -2784,10 +2784,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/kilauea.dts
rx-fifo-size = <1000>;
tx-fifo-size = <800>;
phy-mode = "rgmii";
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/ksi8560.dts
+Index: linux-2.6.25.4/arch/powerpc/boot/dts/ksi8560.dts
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/boot/dts/ksi8560.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/ksi8560.dts
@@ -0,0 +1,267 @@
+/*
+ * Device Tree Source for Emerson KSI8560
@@ -3056,10 +3056,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/ksi8560.dts
+ linux,stdout-path = "/soc/cpm/serial@91a00";
+ };
+};
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/kuroboxHD.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/kuroboxHD.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/kuroboxHD.dts
@@ -7,6 +7,7 @@
* Based on sandpoint.dts
*
@@ -3223,10 +3223,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/kuroboxHD.dts
>;
};
};
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/kuroboxHG.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/kuroboxHG.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/kuroboxHG.dts
@@ -7,6 +7,7 @@
* Based on sandpoint.dts
*
@@ -3390,10 +3390,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/kuroboxHG.dts
>;
};
};
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/makalu.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/makalu.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/makalu.dts
@@ -219,7 +219,7 @@
mal-tx-channel = <0>;
mal-rx-channel = <0>;
@@ -3412,10 +3412,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/makalu.dts
rx-fifo-size = <1000>;
tx-fifo-size = <800>;
phy-mode = "rgmii";
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc7448hpc2.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/mpc7448hpc2.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/mpc7448hpc2.dts
@@ -1,7 +1,7 @@
/*
* MPC7448HPC2 (Taiga) board Device Tree Source
@@ -3631,10 +3631,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc7448hpc2.dts
interrupt-parent = <&mpic>;
};
};
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc8272ads.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/mpc8272ads.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/mpc8272ads.dts
@@ -1,7 +1,7 @@
/*
* MPC8272 ADS Device Tree Source
@@ -3936,10 +3936,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc8272ads.dts
};
};
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc832x_mds.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/mpc832x_mds.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -255,9 +255,7 @@
enet0: ucc@2200 {
device_type = "network";
@@ -3970,10 +3970,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc832x_mds.dts
port-number = <0>; /* Which ttyQEx device */
soft-uart; /* We need Soft-UART */
reg = <0x2400 0x200>;
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc832x_rdb.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/mpc832x_rdb.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -208,9 +208,7 @@
enet0: ucc@3000 {
device_type = "network";
@@ -3994,10 +3994,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc832x_rdb.dts
reg = <0x2200 0x200>;
interrupts = <34>;
interrupt-parent = <&qeic>;
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc836x_mds.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/mpc836x_mds.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/mpc836x_mds.dts
@@ -257,9 +257,7 @@
enet0: ucc@2000 {
device_type = "network";
@@ -4018,10 +4018,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc836x_mds.dts
reg = <0x3000 0x200>;
interrupts = <33>;
interrupt-parent = <&qeic>;
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc8540ads.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/mpc8540ads.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/mpc8540ads.dts
@@ -1,7 +1,7 @@
/*
* MPC8540 ADS Device Tree Source
@@ -4351,10 +4351,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc8540ads.dts
compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
device_type = "pci";
};
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc8541cds.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/mpc8541cds.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/mpc8541cds.dts
@@ -1,7 +1,7 @@
/*
* MPC8541 CDS Device Tree Source
@@ -4700,10 +4700,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc8541cds.dts
compatible = "fsl,mpc8540-pci";
device_type = "pci";
};
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc8544ds.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/mpc8544ds.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/mpc8544ds.dts
@@ -1,7 +1,7 @@
/*
* MPC8544 DS Device Tree Source
@@ -5240,10 +5240,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc8544ds.dts
};
};
};
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc8548cds.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/mpc8548cds.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/mpc8548cds.dts
@@ -1,7 +1,7 @@
/*
* MPC8548 CDS Device Tree Source
@@ -5785,10 +5785,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc8548cds.dts
};
};
};
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc8555cds.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/mpc8555cds.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/mpc8555cds.dts
@@ -1,7 +1,7 @@
/*
* MPC8555 CDS Device Tree Source
@@ -6134,10 +6134,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc8555cds.dts
compatible = "fsl,mpc8540-pci";
device_type = "pci";
};
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc8560ads.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/mpc8560ads.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/mpc8560ads.dts
@@ -1,7 +1,7 @@
/*
* MPC8560 ADS Device Tree Source
@@ -6531,10 +6531,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc8560ads.dts
+ 0x1000000 0x0 0x0 0xe2000000 0x0 0x1000000>;
};
};
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc8568mds.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/mpc8568mds.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -1,7 +1,7 @@
/*
* MPC8568E MDS Device Tree Source
@@ -7111,10 +7111,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc8568mds.dts
};
};
};
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc8572ds.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/mpc8572ds.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/mpc8572ds.dts
@@ -1,7 +1,7 @@
/*
* MPC8572 DS Device Tree Source
@@ -7775,10 +7775,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc8572ds.dts
};
};
};
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc8641_hpcn.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/mpc8641_hpcn.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/mpc8641_hpcn.dts
@@ -13,7 +13,7 @@
/ {
@@ -7788,10 +7788,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc8641_hpcn.dts
#address-cells = <1>;
#size-cells = <1>;
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc866ads.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/mpc866ads.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/mpc866ads.dts
@@ -2,6 +2,7 @@
* MPC866 ADS Device Tree Source
*
@@ -7976,10 +7976,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc866ads.dts
interrupt-parent = <&CPM_PIC>;
fsl,cpm-command = <0000>;
linux,network-index = <1>;
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc885ads.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/mpc885ads.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/mpc885ads.dts
@@ -2,7 +2,7 @@
* MPC885 ADS Device Tree Source
*
@@ -8216,10 +8216,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/mpc885ads.dts
linux,network-index = <2>;
};
};
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/pq2fads.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/pq2fads.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/pq2fads.dts
@@ -1,7 +1,7 @@
/*
* Device Tree for the PQ2FADS-ZU board with an MPC8280 chip.
@@ -8509,10 +8509,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/pq2fads.dts
compatible = "fsl,mpc8280-pic", "fsl,cpm2-pic";
};
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/prpmc2800.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/prpmc2800.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/prpmc2800.dts
@@ -11,6 +11,8 @@
* if it can determine the exact PrPMC type.
*/
@@ -8978,10 +8978,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/prpmc2800.dts
+ linux,stdout-path = &MPSC0;
};
};
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/rainier.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/rainier.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/rainier.dts
@@ -254,7 +254,6 @@
};
@@ -9016,10 +9016,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/rainier.dts
rx-fifo-size = <1000>;
tx-fifo-size = <800>;
phy-mode = "rgmii";
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/sbc8641d.dts
+Index: linux-2.6.25.4/arch/powerpc/boot/dts/sbc8641d.dts
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/boot/dts/sbc8641d.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/sbc8641d.dts
@@ -0,0 +1,352 @@
+/*
+ * SBC8641D Device Tree Source
@@ -9373,10 +9373,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/sbc8641d.dts
+ };
+ };
+};
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/sequoia.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/sequoia.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/sequoia.dts
@@ -269,7 +269,6 @@
};
@@ -9411,10 +9411,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/sequoia.dts
rx-fifo-size = <1000>;
tx-fifo-size = <800>;
phy-mode = "rgmii";
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/taishan.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/taishan.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/taishan.dts
@@ -104,6 +104,16 @@
// FIXME: anything else?
};
@@ -9508,10 +9508,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/taishan.dts
};
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/walnut.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/walnut.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/walnut.dts
@@ -125,7 +125,6 @@
};
@@ -9520,10 +9520,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/walnut.dts
device_type = "network";
compatible = "ibm,emac-405gp", "ibm,emac";
interrupt-parent = <&UIC0>;
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/warp.dts
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/dts/warp.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/warp.dts
@@ -204,7 +204,6 @@
};
@@ -9532,10 +9532,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/warp.dts
device_type = "network";
compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
interrupt-parent = <&UIC1>;
-Index: linux-2.6.25.1/arch/powerpc/boot/dts/yosemite.dts
+Index: linux-2.6.25.4/arch/powerpc/boot/dts/yosemite.dts
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/boot/dts/yosemite.dts
++++ linux-2.6.25.4/arch/powerpc/boot/dts/yosemite.dts
@@ -0,0 +1,304 @@
+/*
+ * Device Tree Source for AMCC Yosemite
@@ -9841,10 +9841,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/dts/yosemite.dts
+ linux,stdout-path = "/plb/opb/serial@ef600300";
+ };
+};
-Index: linux-2.6.25.1/arch/powerpc/boot/ebony.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/ebony.c
++++ linux-2.6.25.4/arch/powerpc/boot/ebony.c
@@ -75,7 +75,8 @@ static void ebony_fixups(void)
ibm440gp_fixup_clocks(sysclk, 6 * 1843200);
@@ -9855,10 +9855,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/ebony.c
ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
ebony_flashsel_fixup();
}
-Index: linux-2.6.25.1/arch/powerpc/boot/libfdt-wrapper.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/libfdt-wrapper.c
++++ linux-2.6.25.4/arch/powerpc/boot/libfdt-wrapper.c
@@ -35,7 +35,7 @@
#define check_err(err) \
({ \
@@ -9868,10 +9868,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/libfdt-wrapper.c
fdt_strerror(err)); \
if (BAD_ERROR(err)) \
exit(); \
-Index: linux-2.6.25.1/arch/powerpc/boot/mpc52xx-psc.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/mpc52xx-psc.c
++++ linux-2.6.25.4/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)
@@ -9889,10 +9889,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/mpc52xx-psc.c
scdp->open = psc_open;
scdp->putc = psc_putc;
-Index: linux-2.6.25.1/arch/powerpc/boot/mpsc.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/mpsc.c
++++ linux-2.6.25.4/arch/powerpc/boot/mpsc.c
@@ -141,7 +141,7 @@ int mpsc_console_init(void *devp, struct
if (mpscintr_base == NULL)
goto err_out;
@@ -9902,10 +9902,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/mpsc.c
if (n != sizeof(v))
goto err_out;
reg_set = (int)v;
-Index: linux-2.6.25.1/arch/powerpc/boot/mv64x60.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/mv64x60.c
++++ linux-2.6.25.4/arch/powerpc/boot/mv64x60.c
@@ -535,7 +535,7 @@ u8 *mv64x60_get_bridge_pbase(void)
u32 v[2];
void *devp;
@@ -9924,10 +9924,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/mv64x60.c
if (devp == NULL)
goto err_out;
if (getprop(devp, "virtual-reg", &v, sizeof(v)) != sizeof(v))
-Index: linux-2.6.25.1/arch/powerpc/boot/mv64x60_i2c.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/mv64x60_i2c.c
++++ linux-2.6.25.4/arch/powerpc/boot/mv64x60_i2c.c
@@ -185,7 +185,7 @@ int mv64x60_i2c_open(void)
u32 v;
void *devp;
@@ -9937,10 +9937,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/mv64x60_i2c.c
if (devp == NULL)
goto err_out;
if (getprop(devp, "virtual-reg", &v, sizeof(v)) != sizeof(v))
-Index: linux-2.6.25.1/arch/powerpc/boot/ns16550.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/ns16550.c
++++ linux-2.6.25.4/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)
{
@@ -9959,10 +9959,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/ns16550.c
n = getprop(devp, "reg-shift", &reg_shift, sizeof(reg_shift));
if (n != sizeof(reg_shift))
-Index: linux-2.6.25.1/arch/powerpc/boot/ops.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/ops.h
++++ linux-2.6.25.4/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);
@@ -9971,10 +9971,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/ops.h
static inline void *finddevice(const char *name)
{
-Index: linux-2.6.25.1/arch/powerpc/boot/prpmc2800.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/prpmc2800.c
++++ linux-2.6.25.4/arch/powerpc/boot/prpmc2800.c
@@ -344,20 +344,20 @@ static void prpmc2800_bridge_setup(u32 m
acc_bits);
@@ -10035,10 +10035,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/prpmc2800.c
if (devp == NULL)
fatal("Error: Missing User FLASH device tree node\n\r");
rc = getprop(devp, "reg", v, sizeof(v));
-Index: linux-2.6.25.1/arch/powerpc/boot/ps3-head.S
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/ps3-head.S
++++ linux-2.6.25.4/arch/powerpc/boot/ps3-head.S
@@ -27,8 +27,9 @@
/*
* __system_reset_overlay - The PS3 first stage entry.
@@ -10099,10 +10099,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/ps3-head.S
- . = __system_reset_kernel + 0x100
+ . = __system_reset_kernel + 512
-Index: linux-2.6.25.1/arch/powerpc/boot/ps3.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/ps3.c
++++ linux-2.6.25.4/arch/powerpc/boot/ps3.c
@@ -27,10 +27,10 @@
#include "page.h"
#include "ops.h"
@@ -10168,10 +10168,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/ps3.c
((kernel_entry_t)0)(ft_addr, 0, NULL);
ps3_exit();
-Index: linux-2.6.25.1/arch/powerpc/boot/serial.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/serial.c
++++ linux-2.6.25.4/arch/powerpc/boot/serial.c
@@ -119,7 +119,7 @@ int serial_console_init(void)
if (dt_is_compatible(devp, "ns16550"))
@@ -10181,10 +10181,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/serial.c
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") ||
-Index: linux-2.6.25.1/arch/powerpc/boot/simpleboot.c
+Index: linux-2.6.25.4/arch/powerpc/boot/simpleboot.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/boot/simpleboot.c
++++ linux-2.6.25.4/arch/powerpc/boot/simpleboot.c
@@ -0,0 +1,84 @@
+/*
+ * The simple platform -- for booting when firmware doesn't supply a device
@@ -10270,10 +10270,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/simpleboot.c
+ fdt_init(_dtb_start);
+ serial_console_init();
+}
-Index: linux-2.6.25.1/arch/powerpc/boot/treeboot-walnut.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/boot/treeboot-walnut.c
++++ linux-2.6.25.4/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");
@@ -10283,10 +10283,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/treeboot-walnut.c
}
void platform_init(void)
-Index: linux-2.6.25.1/arch/powerpc/boot/virtex405-head.S
+Index: linux-2.6.25.4/arch/powerpc/boot/virtex405-head.S
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/boot/virtex405-head.S
++++ linux-2.6.25.4/arch/powerpc/boot/virtex405-head.S
@@ -0,0 +1,30 @@
+#include "ppc_asm.h"
+
@@ -10318,10 +10318,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/virtex405-head.S
+ addi r9,r9,0x20
+ bdnz 1b
+2: b _zimage_start_lib
-Index: linux-2.6.25.1/arch/powerpc/boot/wrapper
+Index: linux-2.6.25.4/arch/powerpc/boot/wrapper
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/boot/wrapper
-+++ linux-2.6.25.1/arch/powerpc/boot/wrapper
+--- linux-2.6.25.4.orig/arch/powerpc/boot/wrapper
++++ linux-2.6.25.4/arch/powerpc/boot/wrapper
@@ -174,7 +174,7 @@ cuboot*)
*-mpc83*)
platformo=$object/cuboot-83xx.o
@@ -10392,10 +10392,10 @@ Index: linux-2.6.25.1/arch/powerpc/boot/wrapper
${CROSS}objcopy -O binary "$ofile" "$ofile.bin"
-Index: linux-2.6.25.1/arch/powerpc/configs/40x/ep405_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/40x/ep405_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/40x/ep405_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/40x/ep405_defconfig
@@ -0,0 +1,968 @@
+#
+# Automatically generated make config: don't edit
@@ -11365,10 +11365,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/40x/ep405_defconfig
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/40x/kilauea_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/40x/kilauea_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/40x/kilauea_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/40x/kilauea_defconfig
@@ -0,0 +1,839 @@
+#
+# Automatically generated make config: don't edit
@@ -12209,10 +12209,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/40x/kilauea_defconfig
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/40x/makalu_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/40x/makalu_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/40x/makalu_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/40x/makalu_defconfig
@@ -0,0 +1,839 @@
+#
+# Automatically generated make config: don't edit
@@ -13053,10 +13053,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/40x/makalu_defconfig
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/40x/walnut_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/40x/walnut_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/40x/walnut_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/40x/walnut_defconfig
@@ -0,0 +1,887 @@
+#
+# Automatically generated make config: don't edit
@@ -13945,10 +13945,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/40x/walnut_defconfig
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/44x/bamboo_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/44x/bamboo_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/44x/bamboo_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/44x/bamboo_defconfig
@@ -0,0 +1,815 @@
+#
+# Automatically generated make config: don't edit
@@ -14765,10 +14765,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/44x/bamboo_defconfig
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/44x/canyonlands_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/44x/canyonlands_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/44x/canyonlands_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/44x/canyonlands_defconfig
@@ -0,0 +1,721 @@
+#
+# Automatically generated make config: don't edit
@@ -15491,10 +15491,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/44x/canyonlands_defconfig
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+# CONFIG_CRYPTO is not set
+# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/44x/ebony_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/44x/ebony_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/44x/ebony_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/44x/ebony_defconfig
@@ -0,0 +1,898 @@
+#
+# Automatically generated make config: don't edit
@@ -16394,10 +16394,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/44x/ebony_defconfig
+# CONFIG_CRYPTO_LZO is not set
+# CONFIG_CRYPTO_HW is not set
+# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/44x/katmai_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/44x/katmai_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/44x/katmai_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/44x/katmai_defconfig
@@ -0,0 +1,790 @@
+#
+# Automatically generated make config: don't edit
@@ -17189,10 +17189,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/44x/katmai_defconfig
+# CONFIG_CRYPTO_AUTHENC is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/44x/rainier_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/44x/rainier_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/44x/rainier_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/44x/rainier_defconfig
@@ -0,0 +1,899 @@
+#
+# Automatically generated make config: don't edit
@@ -18093,10 +18093,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/44x/rainier_defconfig
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/44x/sequoia_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/44x/sequoia_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/44x/sequoia_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/44x/sequoia_defconfig
@@ -0,0 +1,916 @@
+#
+# Automatically generated make config: don't edit
@@ -19014,10 +19014,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/44x/sequoia_defconfig
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/44x/taishan_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/44x/taishan_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/44x/taishan_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/44x/taishan_defconfig
@@ -0,0 +1,815 @@
+#
+# Automatically generated make config: don't edit
@@ -19834,10 +19834,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/44x/taishan_defconfig
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/44x/warp_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/44x/warp_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/44x/warp_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/44x/warp_defconfig
@@ -0,0 +1,1110 @@
+#
+# Automatically generated make config: don't edit
@@ -20949,10 +20949,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/44x/warp_defconfig
+# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
@@ -0,0 +1,1395 @@
+#
+# Automatically generated make config: don't edit
@@ -22349,10 +22349,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
@@ -0,0 +1,1451 @@
+#
+# Automatically generated make config: don't edit
@@ -23805,10 +23805,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
@@ -0,0 +1,1081 @@
+#
+# Automatically generated make config: don't edit
@@ -24891,10 +24891,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
+CONFIG_PPC_LIB_RHEAP=y
-Index: linux-2.6.25.1/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
@@ -0,0 +1,1233 @@
+#
+# Automatically generated make config: don't edit
@@ -26129,10 +26129,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
+CONFIG_PPC_LIB_RHEAP=y
-Index: linux-2.6.25.1/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
@@ -0,0 +1,1295 @@
+#
+# Automatically generated make config: don't edit
@@ -27429,10 +27429,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
@@ -0,0 +1,1222 @@
+#
+# Automatically generated make config: don't edit
@@ -28656,10 +28656,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
@@ -0,0 +1,1021 @@
+#
+# Automatically generated make config: don't edit
@@ -29682,10 +29682,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
@@ -0,0 +1,1079 @@
+#
+# Automatically generated make config: don't edit
@@ -30766,10 +30766,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
+CONFIG_PPC_LIB_RHEAP=y
-Index: linux-2.6.25.1/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
@@ -0,0 +1,899 @@
+#
+# Automatically generated make config: don't edit
@@ -31670,10 +31670,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
+# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
@@ -0,0 +1,930 @@
+#
+# Automatically generated make config: don't edit
@@ -32605,10 +32605,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
+# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/83xx/sbc834x_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/83xx/sbc834x_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/83xx/sbc834x_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/83xx/sbc834x_defconfig
@@ -0,0 +1,828 @@
+#
+# Automatically generated make config: don't edit
@@ -33438,10 +33438,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/83xx/sbc834x_defconfig
+# CONFIG_CRYPTO_LZO is not set
+# CONFIG_CRYPTO_HW is not set
+# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/85xx/ksi8560_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/85xx/ksi8560_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/85xx/ksi8560_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/85xx/ksi8560_defconfig
@@ -0,0 +1,899 @@
+#
+# Automatically generated make config: don't edit
@@ -34342,10 +34342,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/85xx/ksi8560_defconfig
+CONFIG_CRYPTO_HW=y
+# CONFIG_PPC_CLOCK is not set
+CONFIG_PPC_LIB_RHEAP=y
-Index: linux-2.6.25.1/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
@@ -0,0 +1,796 @@
+#
+# Automatically generated make config: don't edit
@@ -35143,10 +35143,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
+# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/85xx/mpc8544_ds_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/85xx/mpc8544_ds_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/85xx/mpc8544_ds_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/85xx/mpc8544_ds_defconfig
@@ -0,0 +1,1564 @@
+#
+# Automatically generated make config: don't edit
@@ -36712,10 +36712,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/85xx/mpc8544_ds_defconfig
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
@@ -0,0 +1,885 @@
+#
+# Automatically generated make config: don't edit
@@ -37602,10 +37602,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
+CONFIG_PPC_LIB_RHEAP=y
-Index: linux-2.6.25.1/arch/powerpc/configs/85xx/mpc8568mds_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/85xx/mpc8568mds_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/85xx/mpc8568mds_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/85xx/mpc8568mds_defconfig
@@ -0,0 +1,1117 @@
+#
+# Automatically generated make config: don't edit
@@ -38724,10 +38724,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/85xx/mpc8568mds_defconfig
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
+CONFIG_PPC_LIB_RHEAP=y
-Index: linux-2.6.25.1/arch/powerpc/configs/85xx/mpc8572_ds_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/85xx/mpc8572_ds_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/85xx/mpc8572_ds_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/85xx/mpc8572_ds_defconfig
@@ -0,0 +1,1549 @@
+#
+# Automatically generated make config: don't edit
@@ -40278,10 +40278,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/85xx/mpc8572_ds_defconfig
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig
@@ -0,0 +1,935 @@
+#
+# Automatically generated make config: don't edit
@@ -41218,10 +41218,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/85xx/sbc8548_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/85xx/sbc8548_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/85xx/sbc8548_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/85xx/sbc8548_defconfig
@@ -0,0 +1,812 @@
+#
+# Automatically generated make config: don't edit
@@ -42035,10 +42035,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/85xx/sbc8548_defconfig
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/85xx/sbc8560_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/85xx/sbc8560_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/85xx/sbc8560_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/85xx/sbc8560_defconfig
@@ -0,0 +1,830 @@
+#
+# Automatically generated make config: don't edit
@@ -42870,10 +42870,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/85xx/sbc8560_defconfig
+# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/85xx/stx_gp3_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/85xx/stx_gp3_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/85xx/stx_gp3_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/85xx/stx_gp3_defconfig
@@ -0,0 +1,1253 @@
+#
+# Automatically generated make config: don't edit
@@ -44128,10 +44128,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/85xx/stx_gp3_defconfig
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
+CONFIG_PPC_LIB_RHEAP=y
-Index: linux-2.6.25.1/arch/powerpc/configs/85xx/tqm8540_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/85xx/tqm8540_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/85xx/tqm8540_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/85xx/tqm8540_defconfig
@@ -0,0 +1,1097 @@
+#
+# Automatically generated make config: don't edit
@@ -45230,10 +45230,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/85xx/tqm8540_defconfig
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/85xx/tqm8541_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/85xx/tqm8541_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/85xx/tqm8541_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/85xx/tqm8541_defconfig
@@ -0,0 +1,1109 @@
+#
+# Automatically generated make config: don't edit
@@ -46344,10 +46344,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/85xx/tqm8541_defconfig
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
+CONFIG_PPC_LIB_RHEAP=y
-Index: linux-2.6.25.1/arch/powerpc/configs/85xx/tqm8555_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/85xx/tqm8555_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/85xx/tqm8555_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/85xx/tqm8555_defconfig
@@ -0,0 +1,1109 @@
+#
+# Automatically generated make config: don't edit
@@ -47458,10 +47458,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/85xx/tqm8555_defconfig
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
+CONFIG_PPC_LIB_RHEAP=y
-Index: linux-2.6.25.1/arch/powerpc/configs/85xx/tqm8560_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/85xx/tqm8560_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/85xx/tqm8560_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/85xx/tqm8560_defconfig
@@ -0,0 +1,1109 @@
+#
+# Automatically generated make config: don't edit
@@ -48572,9 +48572,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/85xx/tqm8560_defconfig
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
+CONFIG_PPC_LIB_RHEAP=y
-Index: linux-2.6.25.1/arch/powerpc/configs/bamboo_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/bamboo_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/bamboo_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/bamboo_defconfig
+++ /dev/null
@@ -1,815 +0,0 @@
-#
@@ -49392,10 +49392,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/bamboo_defconfig
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/chrp32_defconfig
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/configs/chrp32_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/chrp32_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
@@ -49431,9 +49431,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/chrp32_defconfig
#
# Kernel hacking
-Index: linux-2.6.25.1/arch/powerpc/configs/ebony_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/ebony_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/ebony_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/ebony_defconfig
+++ /dev/null
@@ -1,898 +0,0 @@
-#
@@ -50334,9 +50334,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/ebony_defconfig
-# CONFIG_CRYPTO_LZO is not set
-# CONFIG_CRYPTO_HW is not set
-# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/ep405_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/ep405_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/ep405_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/ep405_defconfig
+++ /dev/null
@@ -1,968 +0,0 @@
-#
@@ -51307,10 +51307,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/ep405_defconfig
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/g5_defconfig
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/configs/g5_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/g5_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
@@ -51346,10 +51346,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/g5_defconfig
#
# Kernel hacking
-Index: linux-2.6.25.1/arch/powerpc/configs/iseries_defconfig
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/configs/iseries_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/iseries_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
@@ -51385,9 +51385,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/iseries_defconfig
#
# Kernel hacking
-Index: linux-2.6.25.1/arch/powerpc/configs/katmai_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/katmai_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/katmai_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/katmai_defconfig
+++ /dev/null
@@ -1,790 +0,0 @@
-#
@@ -52180,9 +52180,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/katmai_defconfig
-# CONFIG_CRYPTO_AUTHENC is not set
-CONFIG_CRYPTO_HW=y
-# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/kilauea_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/kilauea_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/kilauea_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/kilauea_defconfig
+++ /dev/null
@@ -1,839 +0,0 @@
-#
@@ -53024,9 +53024,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/kilauea_defconfig
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/makalu_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/makalu_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/makalu_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/makalu_defconfig
+++ /dev/null
@@ -1,839 +0,0 @@
-#
@@ -53868,10 +53868,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/makalu_defconfig
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/maple_defconfig
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/configs/maple_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/maple_defconfig
@@ -333,7 +333,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_STANDALONE=y
@@ -54045,9 +54045,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/maple_defconfig
CONFIG_USB_MON=y
#
-Index: linux-2.6.25.1/arch/powerpc/configs/mpc8313_rdb_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/mpc8313_rdb_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/mpc8313_rdb_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/mpc8313_rdb_defconfig
+++ /dev/null
@@ -1,1393 +0,0 @@
-#
@@ -55443,9 +55443,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/mpc8313_rdb_defconfig
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/mpc8315_rdb_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/mpc8315_rdb_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/mpc8315_rdb_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/mpc8315_rdb_defconfig
+++ /dev/null
@@ -1,1451 +0,0 @@
-#
@@ -56899,9 +56899,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/mpc8315_rdb_defconfig
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/mpc832x_mds_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/mpc832x_mds_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/mpc832x_mds_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/mpc832x_mds_defconfig
+++ /dev/null
@@ -1,1081 +0,0 @@
-#
@@ -57985,9 +57985,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/mpc832x_mds_defconfig
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-CONFIG_PPC_LIB_RHEAP=y
-Index: linux-2.6.25.1/arch/powerpc/configs/mpc832x_rdb_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/mpc832x_rdb_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/mpc832x_rdb_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/mpc832x_rdb_defconfig
+++ /dev/null
@@ -1,1233 +0,0 @@
-#
@@ -59223,9 +59223,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/mpc832x_rdb_defconfig
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-CONFIG_PPC_LIB_RHEAP=y
-Index: linux-2.6.25.1/arch/powerpc/configs/mpc834x_itx_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/mpc834x_itx_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/mpc834x_itx_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/mpc834x_itx_defconfig
+++ /dev/null
@@ -1,1295 +0,0 @@
-#
@@ -60523,9 +60523,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/mpc834x_itx_defconfig
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/mpc834x_itxgp_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/mpc834x_itxgp_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/mpc834x_itxgp_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/mpc834x_itxgp_defconfig
+++ /dev/null
@@ -1,1222 +0,0 @@
-#
@@ -61750,9 +61750,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/mpc834x_itxgp_defconfig
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/mpc834x_mds_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/mpc834x_mds_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/mpc834x_mds_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/mpc834x_mds_defconfig
+++ /dev/null
@@ -1,1021 +0,0 @@
-#
@@ -62776,9 +62776,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/mpc834x_mds_defconfig
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/mpc836x_mds_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/mpc836x_mds_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/mpc836x_mds_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/mpc836x_mds_defconfig
+++ /dev/null
@@ -1,1079 +0,0 @@
-#
@@ -63860,9 +63860,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/mpc836x_mds_defconfig
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-CONFIG_PPC_LIB_RHEAP=y
-Index: linux-2.6.25.1/arch/powerpc/configs/mpc837x_mds_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/mpc837x_mds_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/mpc837x_mds_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/mpc837x_mds_defconfig
+++ /dev/null
@@ -1,899 +0,0 @@
-#
@@ -64764,9 +64764,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/mpc837x_mds_defconfig
-# CONFIG_CRYPTO_LZO is not set
-CONFIG_CRYPTO_HW=y
-# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/mpc837x_rdb_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/mpc837x_rdb_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/mpc837x_rdb_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/mpc837x_rdb_defconfig
+++ /dev/null
@@ -1,930 +0,0 @@
-#
@@ -65699,10 +65699,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/mpc837x_rdb_defconfig
-# CONFIG_CRYPTO_LZO is not set
-CONFIG_CRYPTO_HW=y
-# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/mpc83xx_defconfig
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/configs/mpc83xx_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/mpc83xx_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
@@ -65952,9 +65952,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/mpc83xx_defconfig
#
# Kernel hacking
-Index: linux-2.6.25.1/arch/powerpc/configs/mpc8540_ads_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/mpc8540_ads_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/mpc8540_ads_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/mpc8540_ads_defconfig
+++ /dev/null
@@ -1,796 +0,0 @@
-#
@@ -66753,9 +66753,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/mpc8540_ads_defconfig
-# CONFIG_CRYPTO_LZO is not set
-CONFIG_CRYPTO_HW=y
-# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/mpc8544_ds_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/mpc8544_ds_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/mpc8544_ds_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/mpc8544_ds_defconfig
+++ /dev/null
@@ -1,1549 +0,0 @@
-#
@@ -68307,9 +68307,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/mpc8544_ds_defconfig
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/mpc8560_ads_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/mpc8560_ads_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/mpc8560_ads_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/mpc8560_ads_defconfig
+++ /dev/null
@@ -1,885 +0,0 @@
-#
@@ -69197,9 +69197,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/mpc8560_ads_defconfig
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-CONFIG_PPC_LIB_RHEAP=y
-Index: linux-2.6.25.1/arch/powerpc/configs/mpc8568mds_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/mpc8568mds_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/mpc8568mds_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/mpc8568mds_defconfig
+++ /dev/null
@@ -1,1117 +0,0 @@
-#
@@ -70319,9 +70319,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/mpc8568mds_defconfig
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-CONFIG_PPC_LIB_RHEAP=y
-Index: linux-2.6.25.1/arch/powerpc/configs/mpc8572_ds_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/mpc8572_ds_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/mpc8572_ds_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/mpc8572_ds_defconfig
+++ /dev/null
@@ -1,1549 +0,0 @@
-#
@@ -71873,9 +71873,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/mpc8572_ds_defconfig
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/mpc85xx_cds_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/mpc85xx_cds_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/mpc85xx_cds_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/mpc85xx_cds_defconfig
+++ /dev/null
@@ -1,935 +0,0 @@
-#
@@ -72813,10 +72813,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/mpc85xx_cds_defconfig
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/pmac32_defconfig
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/configs/pmac32_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/pmac32_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
@@ -72852,10 +72852,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/pmac32_defconfig
#
# Kernel hacking
-Index: linux-2.6.25.1/arch/powerpc/configs/ppc40x_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/ppc40x_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/ppc40x_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/ppc40x_defconfig
@@ -0,0 +1,896 @@
+#
+# Automatically generated make config: don't edit
@@ -73753,10 +73753,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/ppc40x_defconfig
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/ppc44x_defconfig
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/configs/ppc44x_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/ppc44x_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
@@ -73839,10 +73839,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/ppc44x_defconfig
#
# Kernel hacking
-Index: linux-2.6.25.1/arch/powerpc/configs/ppc64_defconfig
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/configs/ppc64_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/ppc64_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
@@ -73886,10 +73886,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/ppc64_defconfig
#
# Kernel hacking
-Index: linux-2.6.25.1/arch/powerpc/configs/pseries_defconfig
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/configs/pseries_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/pseries_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
@@ -73933,9 +73933,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/pseries_defconfig
#
# Kernel hacking
-Index: linux-2.6.25.1/arch/powerpc/configs/rainier_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/rainier_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/rainier_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/rainier_defconfig
+++ /dev/null
@@ -1,899 +0,0 @@
-#
@@ -74837,9 +74837,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/rainier_defconfig
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/sbc834x_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/sbc834x_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/sbc834x_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/sbc834x_defconfig
+++ /dev/null
@@ -1,828 +0,0 @@
-#
@@ -75670,9 +75670,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/sbc834x_defconfig
-# CONFIG_CRYPTO_LZO is not set
-# CONFIG_CRYPTO_HW is not set
-# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/sbc8548_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/sbc8548_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/sbc8548_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/sbc8548_defconfig
+++ /dev/null
@@ -1,812 +0,0 @@
-#
@@ -76487,9 +76487,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/sbc8548_defconfig
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/sbc8560_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/sbc8560_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/sbc8560_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/sbc8560_defconfig
+++ /dev/null
@@ -1,830 +0,0 @@
-#
@@ -77322,10 +77322,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/sbc8560_defconfig
-# CONFIG_CRYPTO_LZO is not set
-CONFIG_CRYPTO_HW=y
-# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/sbc8641d_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/sbc8641d_defconfig
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/configs/sbc8641d_defconfig
++++ linux-2.6.25.4/arch/powerpc/configs/sbc8641d_defconfig
@@ -0,0 +1,1342 @@
+#
+# Automatically generated make config: don't edit
@@ -78669,9 +78669,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/sbc8641d_defconfig
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/sequoia_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/sequoia_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/sequoia_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/sequoia_defconfig
+++ /dev/null
@@ -1,916 +0,0 @@
-#
@@ -79590,9 +79590,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/sequoia_defconfig
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/stx_gp3_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/stx_gp3_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/stx_gp3_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/stx_gp3_defconfig
+++ /dev/null
@@ -1,1253 +0,0 @@
-#
@@ -80848,9 +80848,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/stx_gp3_defconfig
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-CONFIG_PPC_LIB_RHEAP=y
-Index: linux-2.6.25.1/arch/powerpc/configs/taishan_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/taishan_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/taishan_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/taishan_defconfig
+++ /dev/null
@@ -1,815 +0,0 @@
-#
@@ -81668,9 +81668,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/taishan_defconfig
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/tqm8540_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/tqm8540_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/tqm8540_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/tqm8540_defconfig
+++ /dev/null
@@ -1,1097 +0,0 @@
-#
@@ -82770,9 +82770,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/tqm8540_defconfig
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/tqm8541_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/tqm8541_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/tqm8541_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/tqm8541_defconfig
+++ /dev/null
@@ -1,1109 +0,0 @@
-#
@@ -83884,9 +83884,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/tqm8541_defconfig
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-CONFIG_PPC_LIB_RHEAP=y
-Index: linux-2.6.25.1/arch/powerpc/configs/tqm8555_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/tqm8555_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/tqm8555_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/tqm8555_defconfig
+++ /dev/null
@@ -1,1109 +0,0 @@
-#
@@ -84998,9 +84998,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/tqm8555_defconfig
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-CONFIG_PPC_LIB_RHEAP=y
-Index: linux-2.6.25.1/arch/powerpc/configs/tqm8560_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/tqm8560_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/tqm8560_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/tqm8560_defconfig
+++ /dev/null
@@ -1,1109 +0,0 @@
-#
@@ -86112,9 +86112,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/tqm8560_defconfig
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-CONFIG_PPC_LIB_RHEAP=y
-Index: linux-2.6.25.1/arch/powerpc/configs/walnut_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/walnut_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/walnut_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/walnut_defconfig
+++ /dev/null
@@ -1,887 +0,0 @@
-#
@@ -87004,9 +87004,9 @@ Index: linux-2.6.25.1/arch/powerpc/configs/walnut_defconfig
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/configs/warp_defconfig
+Index: linux-2.6.25.4/arch/powerpc/configs/warp_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/configs/warp_defconfig
+--- linux-2.6.25.4.orig/arch/powerpc/configs/warp_defconfig
+++ /dev/null
@@ -1,1110 +0,0 @@
-#
@@ -88119,10 +88119,10 @@ Index: linux-2.6.25.1/arch/powerpc/configs/warp_defconfig
-# CONFIG_CRYPTO_LZO is not set
-CONFIG_CRYPTO_HW=y
-# CONFIG_PPC_CLOCK is not set
-Index: linux-2.6.25.1/arch/powerpc/kernel/Makefile
+Index: linux-2.6.25.4/arch/powerpc/kernel/Makefile
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/kernel/Makefile
-+++ linux-2.6.25.1/arch/powerpc/kernel/Makefile
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/Makefile
++++ linux-2.6.25.4/arch/powerpc/kernel/Makefile
@@ -67,6 +67,7 @@ obj-$(CONFIG_BOOTX_TEXT) += btext.o
obj-$(CONFIG_SMP) += smp.o
obj-$(CONFIG_KPROBES) += kprobes.o
@@ -88131,10 +88131,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/Makefile
pci64-$(CONFIG_PPC64) += pci_dn.o isa-bridge.o
obj-$(CONFIG_PCI) += pci_$(CONFIG_WORD_SIZE).o $(pci64-y) \
-Index: linux-2.6.25.1/arch/powerpc/kernel/asm-offsets.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/asm-offsets.c
++++ linux-2.6.25.4/arch/powerpc/kernel/asm-offsets.c
@@ -26,8 +26,6 @@
#ifdef CONFIG_PPC64
#include <linux/time.h>
@@ -88180,10 +88180,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/asm-offsets.c
#endif
DEFINE(PGD_TABLE_SIZE, PGD_TABLE_SIZE);
-Index: linux-2.6.25.1/arch/powerpc/kernel/btext.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/btext.c
++++ linux-2.6.25.4/arch/powerpc/kernel/btext.c
@@ -7,6 +7,7 @@
#include <linux/string.h>
#include <linux/init.h>
@@ -88201,10 +88201,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/btext.c
#include <asm/processor.h>
#include <asm/udbg.h>
-Index: linux-2.6.25.1/arch/powerpc/kernel/cpu_setup_44x.S
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/cpu_setup_44x.S
++++ linux-2.6.25.4/arch/powerpc/kernel/cpu_setup_44x.S
@@ -3,7 +3,7 @@
* Valentine Barshak <vbarshak@ru.mvista.com>
* MontaVista Software, Inc (c) 2007
@@ -88224,10 +88224,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/cpu_setup_44x.S
_GLOBAL(__setup_cpu_440gx)
_GLOBAL(__setup_cpu_440spe)
b __fixup_440A_mcheck
-Index: linux-2.6.25.1/arch/powerpc/kernel/cputable.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/cputable.c
++++ linux-2.6.25.4/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);
@@ -88277,10 +88277,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/cputable.c
* 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
-Index: linux-2.6.25.1/arch/powerpc/kernel/crash.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/crash.c
++++ linux-2.6.25.4/arch/powerpc/kernel/crash.c
@@ -24,12 +24,13 @@
#include <linux/init.h>
#include <linux/irq.h>
@@ -88296,10 +88296,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/crash.c
#include <asm/firmware.h>
#include <asm/smp.h>
#include <asm/system.h>
-Index: linux-2.6.25.1/arch/powerpc/kernel/crash_dump.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/crash_dump.c
++++ linux-2.6.25.4/arch/powerpc/kernel/crash_dump.c
@@ -13,8 +13,9 @@
#include <linux/crash_dump.h>
@@ -88311,10 +88311,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/crash_dump.c
#include <asm/firmware.h>
#include <asm/uaccess.h>
-Index: linux-2.6.25.1/arch/powerpc/kernel/entry_32.S
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/entry_32.S
++++ linux-2.6.25.4/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)
@@ -88390,10 +88390,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/entry_32.S
.previous
#endif /* !(CONFIG_4xx || CONFIG_BOOKE) */
-Index: linux-2.6.25.1/arch/powerpc/kernel/entry_64.S
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/entry_64.S
++++ linux-2.6.25.4/arch/powerpc/kernel/entry_64.S
@@ -29,6 +29,8 @@
#include <asm/cputable.h>
#include <asm/firmware.h>
@@ -88473,10 +88473,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/entry_64.S
li r0,1
stb r0,PACASOFTIRQEN(r13)
stb r0,PACAHARDIRQEN(r13)
-Index: linux-2.6.25.1/arch/powerpc/kernel/head_32.S
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/head_32.S
++++ linux-2.6.25.4/arch/powerpc/kernel/head_32.S
@@ -30,6 +30,7 @@
#include <asm/thread_info.h>
#include <asm/ppc_asm.h>
@@ -88520,10 +88520,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/head_32.S
* giveup_altivec(tsk)
* Disable AltiVec for the task given as the argument,
* and save the AltiVec registers in its thread_struct.
-Index: linux-2.6.25.1/arch/powerpc/kernel/head_44x.S
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/head_44x.S
++++ linux-2.6.25.4/arch/powerpc/kernel/head_44x.S
@@ -211,7 +211,7 @@ skpinv: addi r4,r4,1 /* Increment */
SET_IVOR(12, WatchdogTimer);
SET_IVOR(13, DataTLBError);
@@ -88542,10 +88542,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/head_44x.S
/*
* Local functions
-Index: linux-2.6.25.1/arch/powerpc/kernel/head_64.S
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/head_64.S
++++ linux-2.6.25.4/arch/powerpc/kernel/head_64.S
@@ -36,8 +36,7 @@
#include <asm/firmware.h>
#include <asm/page_64.h>
@@ -88703,10 +88703,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/head_64.S
/* Load the TOC */
ld r2,PACATOC(r13)
std r1,PACAKSAVE(r13)
-Index: linux-2.6.25.1/arch/powerpc/kernel/head_booke.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/head_booke.h
++++ linux-2.6.25.4/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.
@@ -88790,10 +88790,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/head_booke.h
#define INSTRUCTION_STORAGE_EXCEPTION \
START_EXCEPTION(InstructionStorage) \
-Index: linux-2.6.25.1/arch/powerpc/kernel/head_fsl_booke.S
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/head_fsl_booke.S
++++ linux-2.6.25.4/arch/powerpc/kernel/head_fsl_booke.S
@@ -68,7 +68,9 @@ _ENTRY(_start);
mr r29,r5
mr r28,r6
@@ -88883,10 +88883,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/head_fsl_booke.S
/*
* Local functions
-Index: linux-2.6.25.1/arch/powerpc/kernel/ibmebus.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/ibmebus.c
++++ linux-2.6.25.4/arch/powerpc/kernel/ibmebus.c
@@ -183,7 +183,7 @@ static int ibmebus_create_devices(const
ret = ibmebus_create_device(child);
if (ret) {
@@ -88940,10 +88940,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/ibmebus.c
bus_unregister(&ibmebus_bus_type);
return err;
-Index: linux-2.6.25.1/arch/powerpc/kernel/iommu.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/iommu.c
++++ linux-2.6.25.4/arch/powerpc/kernel/iommu.c
@@ -520,7 +520,7 @@ void iommu_free_table(struct iommu_table
unsigned int order;
@@ -88962,10 +88962,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/iommu.c
break;
}
}
-Index: linux-2.6.25.1/arch/powerpc/kernel/irq.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/irq.c
++++ linux-2.6.25.4/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)));
}
@@ -89014,10 +89014,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/irq.c
memset((void *)hardirq_ctx[i], 0, THREAD_SIZE);
tp = hardirq_ctx[i];
-Index: linux-2.6.25.1/arch/powerpc/kernel/isa-bridge.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/isa-bridge.c
++++ linux-2.6.25.4/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
@@ -89043,10 +89043,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/isa-bridge.c
return;
}
-Index: linux-2.6.25.1/arch/powerpc/kernel/lparcfg.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/lparcfg.c
++++ linux-2.6.25.4/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) {
@@ -89095,10 +89095,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/lparcfg.c
retval = -EIO;
}
-Index: linux-2.6.25.1/arch/powerpc/kernel/machine_kexec.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/machine_kexec.c
++++ linux-2.6.25.4/arch/powerpc/kernel/machine_kexec.c
@@ -12,8 +12,9 @@
#include <linux/kexec.h>
#include <linux/reboot.h>
@@ -89110,10 +89110,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/machine_kexec.c
void machine_crash_shutdown(struct pt_regs *regs)
{
-Index: linux-2.6.25.1/arch/powerpc/kernel/paca.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/paca.c
++++ linux-2.6.25.4/arch/powerpc/kernel/paca.c
@@ -15,7 +15,6 @@
#include <asm/ptrace.h>
#include <asm/page.h>
@@ -89178,10 +89178,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/paca.c
struct paca_struct paca[] = {
PACA_INIT(0),
#if NR_CPUS > 1
-Index: linux-2.6.25.1/arch/powerpc/kernel/ppc_ksyms.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/ppc_ksyms.c
++++ linux-2.6.25.4/arch/powerpc/kernel/ppc_ksyms.c
@@ -45,10 +45,6 @@
#include <asm/signal.h>
#include <asm/dcr.h>
@@ -89214,10 +89214,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/ppc_ksyms.c
EXPORT_SYMBOL(__mfdcr);
#endif
+EXPORT_SYMBOL(empty_zero_page);
-Index: linux-2.6.25.1/arch/powerpc/kernel/process.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/process.c
++++ linux-2.6.25.4/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,
@@ -89296,10 +89296,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/process.c
struct pt_regs *regs = (struct pt_regs *)
(sp + STACK_FRAME_OVERHEAD);
printk("--- Exception: %lx", regs->trap);
-Index: linux-2.6.25.1/arch/powerpc/kernel/prom.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/prom.c
++++ linux-2.6.25.4/arch/powerpc/kernel/prom.c
@@ -31,10 +31,10 @@
#include <linux/kexec.h>
#include <linux/debugfs.h>
@@ -89541,10 +89541,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/prom.c
if (!found)
return -ENODEV;
-Index: linux-2.6.25.1/arch/powerpc/kernel/prom_init.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/prom_init.c
++++ linux-2.6.25.4/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"));
@@ -89560,10 +89560,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/prom_init.c
/* Fixup bestcomm interrupts property */
node = call_prom("finddevice", 1, 1, ADDR("/builtin/bestcomm"));
if (PHANDLE_VALID(node)) {
-Index: linux-2.6.25.1/arch/powerpc/kernel/rtas.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/rtas.c
++++ linux-2.6.25.4/arch/powerpc/kernel/rtas.c
@@ -22,6 +22,7 @@
#include <linux/smp.h>
#include <linux/completion.h>
@@ -89589,10 +89589,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/rtas.c
rc = -ERANGE;
break;
}
-Index: linux-2.6.25.1/arch/powerpc/kernel/rtas_flash.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/rtas_flash.c
++++ linux-2.6.25.4/arch/powerpc/kernel/rtas_flash.c
@@ -807,7 +807,7 @@ int __init rtas_flash_init(void)
rtas_block_ctor);
if (!flash_block_cache) {
@@ -89602,10 +89602,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/rtas_flash.c
rc = -ENOMEM;
goto cleanup;
}
-Index: linux-2.6.25.1/arch/powerpc/kernel/rtas_pci.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/rtas_pci.c
++++ linux-2.6.25.4/arch/powerpc/kernel/rtas_pci.c
@@ -56,21 +56,6 @@ static inline int config_access_valid(st
return 0;
}
@@ -89687,10 +89687,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/rtas_pci.c
return 1;
}
}
-Index: linux-2.6.25.1/arch/powerpc/kernel/setup-common.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/setup-common.c
++++ linux-2.6.25.4/arch/powerpc/kernel/setup-common.c
@@ -34,6 +34,7 @@
#include <linux/serial_8250.h>
#include <linux/debugfs.h>
@@ -89730,10 +89730,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/setup-common.c
if (ppc_md.show_cpuinfo != NULL)
ppc_md.show_cpuinfo(m);
-Index: linux-2.6.25.1/arch/powerpc/kernel/setup_32.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/setup_32.c
++++ linux-2.6.25.4/arch/powerpc/kernel/setup_32.c
@@ -172,6 +172,18 @@ int __init ppc_setup_l2cr(char *str)
}
__setup("l2cr=", ppc_setup_l2cr);
@@ -89762,10 +89762,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/setup_32.c
init_mm.end_code = (unsigned long) _etext;
init_mm.end_data = (unsigned long) _edata;
init_mm.brk = klimit;
-Index: linux-2.6.25.1/arch/powerpc/kernel/setup_64.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/setup_64.c
++++ linux-2.6.25.4/arch/powerpc/kernel/setup_64.c
@@ -33,6 +33,8 @@
#include <linux/serial_8250.h>
#include <linux/bootmem.h>
@@ -89802,10 +89802,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/setup_64.c
init_mm.end_code = (unsigned long) _etext;
init_mm.end_data = (unsigned long) _edata;
init_mm.brk = klimit;
-Index: linux-2.6.25.1/arch/powerpc/kernel/stacktrace.c
+Index: linux-2.6.25.4/arch/powerpc/kernel/stacktrace.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/kernel/stacktrace.c
++++ linux-2.6.25.4/arch/powerpc/kernel/stacktrace.c
@@ -0,0 +1,47 @@
+/*
+ * Stack trace utility
@@ -89854,10 +89854,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/stacktrace.c
+ sp = newsp;
+ }
+}
-Index: linux-2.6.25.1/arch/powerpc/kernel/sys_ppc32.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/sys_ppc32.c
++++ linux-2.6.25.4/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);
@@ -89870,10 +89870,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/sys_ppc32.c
putname(filename);
out:
-Index: linux-2.6.25.1/arch/powerpc/kernel/vdso.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/vdso.c
++++ linux-2.6.25.4/arch/powerpc/kernel/vdso.c
@@ -21,13 +21,14 @@
#include <linux/elf.h>
#include <linux/security.h>
@@ -89890,10 +89890,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/vdso.c
#include <asm/machdep.h>
#include <asm/cputable.h>
#include <asm/sections.h>
-Index: linux-2.6.25.1/arch/powerpc/kernel/vio.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/vio.c
++++ linux-2.6.25.4/arch/powerpc/kernel/vio.c
@@ -139,7 +139,7 @@ static int vio_bus_remove(struct device
*/
int vio_register_driver(struct vio_driver *viodrv)
@@ -89939,10 +89939,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/vio.c
return err;
}
-Index: linux-2.6.25.1/arch/powerpc/kernel/vmlinux.lds.S
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/kernel/vmlinux.lds.S
++++ linux-2.6.25.4/arch/powerpc/kernel/vmlinux.lds.S
@@ -1,11 +1,9 @@
#ifdef CONFIG_PPC64
-#include <asm/page.h>
@@ -90134,10 +90134,10 @@ Index: linux-2.6.25.1/arch/powerpc/kernel/vmlinux.lds.S
__bss_start = .;
*(.sbss) *(.scommon)
*(.dynbss)
-Index: linux-2.6.25.1/arch/powerpc/lib/rheap.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/lib/rheap.c
++++ linux-2.6.25.4/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;
@@ -90156,10 +90156,10 @@ Index: linux-2.6.25.1/arch/powerpc/lib/rheap.c
if (info == NULL)
return ERR_PTR(-ENOMEM);
-Index: linux-2.6.25.1/arch/powerpc/lib/string.S
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/lib/string.S
++++ linux-2.6.25.4/arch/powerpc/lib/string.S
@@ -75,6 +75,20 @@ _GLOBAL(strcmp)
beq 1b
blr
@@ -90181,10 +90181,10 @@ Index: linux-2.6.25.1/arch/powerpc/lib/string.S
_GLOBAL(strlen)
addi r4,r3,-1
1: lbzu r0,1(r4)
-Index: linux-2.6.25.1/arch/powerpc/math-emu/fabs.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/fabs.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/fabs.c
@@ -9,7 +9,7 @@ fabs(u32 *frD, u32 *frB)
frD[1] = frB[1];
@@ -90194,10 +90194,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/fabs.c
dump_double(frD);
printk("\n");
#endif
-Index: linux-2.6.25.1/arch/powerpc/math-emu/fadd.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/fadd.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/fadd.c
@@ -14,7 +14,7 @@ fadd(void *frD, void *frA, void *frB)
int ret = 0;
@@ -90207,10 +90207,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/fadd.c
#endif
__FP_UNPACK_D(A, frA);
-Index: linux-2.6.25.1/arch/powerpc/math-emu/fadds.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/fadds.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/fadds.c
@@ -15,7 +15,7 @@ fadds(void *frD, void *frA, void *frB)
int ret = 0;
@@ -90220,10 +90220,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/fadds.c
#endif
__FP_UNPACK_D(A, frA);
-Index: linux-2.6.25.1/arch/powerpc/math-emu/fcmpo.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/fcmpo.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/fcmpo.c
@@ -15,7 +15,7 @@ fcmpo(u32 *ccr, int crfD, void *frA, voi
int ret = 0;
@@ -90233,10 +90233,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/fcmpo.c
#endif
__FP_UNPACK_D(A, frA);
-Index: linux-2.6.25.1/arch/powerpc/math-emu/fcmpu.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/fcmpu.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/fcmpu.c
@@ -14,7 +14,7 @@ fcmpu(u32 *ccr, int crfD, void *frA, voi
long cmp;
@@ -90246,10 +90246,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/fcmpu.c
#endif
__FP_UNPACK_D(A, frA);
-Index: linux-2.6.25.1/arch/powerpc/math-emu/fctiw.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/fctiw.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/fctiw.c
@@ -16,7 +16,7 @@ fctiw(u32 *frD, void *frB)
frD[1] = r;
@@ -90259,10 +90259,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/fctiw.c
dump_double(frD);
printk("\n");
#endif
-Index: linux-2.6.25.1/arch/powerpc/math-emu/fctiwz.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/fctiwz.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/fctiwz.c
@@ -23,7 +23,7 @@ fctiwz(u32 *frD, void *frB)
__FPU_FPSCR = fpscr;
@@ -90272,10 +90272,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/fctiwz.c
dump_double(frD);
printk("\n");
#endif
-Index: linux-2.6.25.1/arch/powerpc/math-emu/fdiv.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/fdiv.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/fdiv.c
@@ -14,7 +14,7 @@ fdiv(void *frD, void *frA, void *frB)
int ret = 0;
@@ -90301,10 +90301,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/fdiv.c
#endif
}
-Index: linux-2.6.25.1/arch/powerpc/math-emu/fdivs.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/fdivs.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/fdivs.c
@@ -15,7 +15,7 @@ fdivs(void *frD, void *frA, void *frB)
int ret = 0;
@@ -90330,10 +90330,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/fdivs.c
#endif
}
-Index: linux-2.6.25.1/arch/powerpc/math-emu/fmadd.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/fmadd.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/fmadd.c
@@ -16,7 +16,7 @@ fmadd(void *frD, void *frA, void *frB, v
int ret = 0;
@@ -90343,10 +90343,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/fmadd.c
#endif
__FP_UNPACK_D(A, frA);
-Index: linux-2.6.25.1/arch/powerpc/math-emu/fmadds.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/fmadds.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/fmadds.c
@@ -17,7 +17,7 @@ fmadds(void *frD, void *frA, void *frB,
int ret = 0;
@@ -90356,10 +90356,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/fmadds.c
#endif
__FP_UNPACK_D(A, frA);
-Index: linux-2.6.25.1/arch/powerpc/math-emu/fmr.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/fmr.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/fmr.c
@@ -9,7 +9,7 @@ fmr(u32 *frD, u32 *frB)
frD[1] = frB[1];
@@ -90369,10 +90369,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/fmr.c
dump_double(frD);
printk("\n");
#endif
-Index: linux-2.6.25.1/arch/powerpc/math-emu/fmsub.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/fmsub.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/fmsub.c
@@ -16,7 +16,7 @@ fmsub(void *frD, void *frA, void *frB, v
int ret = 0;
@@ -90382,10 +90382,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/fmsub.c
#endif
__FP_UNPACK_D(A, frA);
-Index: linux-2.6.25.1/arch/powerpc/math-emu/fmsubs.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/fmsubs.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/fmsubs.c
@@ -17,7 +17,7 @@ fmsubs(void *frD, void *frA, void *frB,
int ret = 0;
@@ -90395,10 +90395,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/fmsubs.c
#endif
__FP_UNPACK_D(A, frA);
-Index: linux-2.6.25.1/arch/powerpc/math-emu/fmul.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/fmul.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/fmul.c
@@ -14,7 +14,7 @@ fmul(void *frD, void *frA, void *frB)
int ret = 0;
@@ -90408,10 +90408,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/fmul.c
#endif
__FP_UNPACK_D(A, frA);
-Index: linux-2.6.25.1/arch/powerpc/math-emu/fmuls.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/fmuls.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/fmuls.c
@@ -15,7 +15,7 @@ fmuls(void *frD, void *frA, void *frB)
int ret = 0;
@@ -90421,10 +90421,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/fmuls.c
#endif
__FP_UNPACK_D(A, frA);
-Index: linux-2.6.25.1/arch/powerpc/math-emu/fnabs.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/fnabs.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/fnabs.c
@@ -9,7 +9,7 @@ fnabs(u32 *frD, u32 *frB)
frD[1] = frB[1];
@@ -90434,10 +90434,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/fnabs.c
dump_double(frD);
printk("\n");
#endif
-Index: linux-2.6.25.1/arch/powerpc/math-emu/fneg.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/fneg.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/fneg.c
@@ -9,7 +9,7 @@ fneg(u32 *frD, u32 *frB)
frD[1] = frB[1];
@@ -90447,10 +90447,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/fneg.c
dump_double(frD);
printk("\n");
#endif
-Index: linux-2.6.25.1/arch/powerpc/math-emu/fnmadd.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/fnmadd.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/fnmadd.c
@@ -16,7 +16,7 @@ fnmadd(void *frD, void *frA, void *frB,
int ret = 0;
@@ -90460,10 +90460,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/fnmadd.c
#endif
__FP_UNPACK_D(A, frA);
-Index: linux-2.6.25.1/arch/powerpc/math-emu/fnmadds.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/fnmadds.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/fnmadds.c
@@ -17,7 +17,7 @@ fnmadds(void *frD, void *frA, void *frB,
int ret = 0;
@@ -90473,10 +90473,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/fnmadds.c
#endif
__FP_UNPACK_D(A, frA);
-Index: linux-2.6.25.1/arch/powerpc/math-emu/fnmsub.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/fnmsub.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/fnmsub.c
@@ -16,7 +16,7 @@ fnmsub(void *frD, void *frA, void *frB,
int ret = 0;
@@ -90486,10 +90486,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/fnmsub.c
#endif
__FP_UNPACK_D(A, frA);
-Index: linux-2.6.25.1/arch/powerpc/math-emu/fnmsubs.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/fnmsubs.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/fnmsubs.c
@@ -17,7 +17,7 @@ fnmsubs(void *frD, void *frA, void *frB,
int ret = 0;
@@ -90499,10 +90499,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/fnmsubs.c
#endif
__FP_UNPACK_D(A, frA);
-Index: linux-2.6.25.1/arch/powerpc/math-emu/fres.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/fres.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/fres.c
@@ -6,7 +6,7 @@ int
fres(void *frD, void *frB)
{
@@ -90512,10 +90512,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/fres.c
#endif
return -ENOSYS;
}
-Index: linux-2.6.25.1/arch/powerpc/math-emu/frsp.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/frsp.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/frsp.c
@@ -12,7 +12,7 @@ frsp(void *frD, void *frB)
FP_DECL_D(B);
@@ -90525,10 +90525,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/frsp.c
#endif
__FP_UNPACK_D(B, frB);
-Index: linux-2.6.25.1/arch/powerpc/math-emu/frsqrte.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/frsqrte.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/frsqrte.c
@@ -6,7 +6,7 @@ int
frsqrte(void *frD, void *frB)
{
@@ -90538,10 +90538,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/frsqrte.c
#endif
return 0;
}
-Index: linux-2.6.25.1/arch/powerpc/math-emu/fsel.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/fsel.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/fsel.c
@@ -11,7 +11,7 @@ fsel(u32 *frD, void *frA, u32 *frB, u32
FP_DECL_D(A);
@@ -90551,10 +90551,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/fsel.c
#endif
__FP_UNPACK_D(A, frA);
-Index: linux-2.6.25.1/arch/powerpc/math-emu/fsqrt.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/fsqrt.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/fsqrt.c
@@ -13,7 +13,7 @@ fsqrt(void *frD, void *frB)
int ret = 0;
@@ -90564,10 +90564,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/fsqrt.c
#endif
__FP_UNPACK_D(B, frB);
-Index: linux-2.6.25.1/arch/powerpc/math-emu/fsqrts.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/fsqrts.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/fsqrts.c
@@ -14,7 +14,7 @@ fsqrts(void *frD, void *frB)
int ret = 0;
@@ -90577,10 +90577,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/fsqrts.c
#endif
__FP_UNPACK_D(B, frB);
-Index: linux-2.6.25.1/arch/powerpc/math-emu/fsub.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/fsub.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/fsub.c
@@ -14,7 +14,7 @@ fsub(void *frD, void *frA, void *frB)
int ret = 0;
@@ -90590,10 +90590,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/fsub.c
#endif
__FP_UNPACK_D(A, frA);
-Index: linux-2.6.25.1/arch/powerpc/math-emu/fsubs.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/fsubs.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/fsubs.c
@@ -15,7 +15,7 @@ fsubs(void *frD, void *frA, void *frB)
int ret = 0;
@@ -90603,10 +90603,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/fsubs.c
#endif
__FP_UNPACK_D(A, frA);
-Index: linux-2.6.25.1/arch/powerpc/math-emu/lfd.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/lfd.c
++++ linux-2.6.25.4/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;
@@ -90616,10 +90616,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/lfd.c
dump_double(frD);
printk("\n");
#endif
-Index: linux-2.6.25.1/arch/powerpc/math-emu/lfs.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/lfs.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/lfs.c
@@ -14,7 +14,7 @@ lfs(void *frD, void *ea)
float f;
@@ -90629,10 +90629,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/lfs.c
#endif
if (copy_from_user(&f, ea, sizeof(float)))
-Index: linux-2.6.25.1/arch/powerpc/math-emu/mcrfs.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/mcrfs.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/mcrfs.c
@@ -10,7 +10,7 @@ mcrfs(u32 *ccr, u32 crfD, u32 crfS)
u32 value, clear;
@@ -90651,10 +90651,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/mcrfs.c
#endif
return 0;
-Index: linux-2.6.25.1/arch/powerpc/math-emu/mffs.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/mffs.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/mffs.c
@@ -10,7 +10,7 @@ mffs(u32 *frD)
frD[1] = __FPU_FPSCR;
@@ -90664,10 +90664,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/mffs.c
#endif
return 0;
-Index: linux-2.6.25.1/arch/powerpc/math-emu/mtfsb0.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/mtfsb0.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/mtfsb0.c
@@ -11,7 +11,7 @@ mtfsb0(int crbD)
__FPU_FPSCR &= ~(1 << (31 - crbD));
@@ -90677,10 +90677,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/mtfsb0.c
#endif
return 0;
-Index: linux-2.6.25.1/arch/powerpc/math-emu/mtfsb1.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/mtfsb1.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/mtfsb1.c
@@ -11,7 +11,7 @@ mtfsb1(int crbD)
__FPU_FPSCR |= (1 << (31 - crbD));
@@ -90690,10 +90690,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/mtfsb1.c
#endif
return 0;
-Index: linux-2.6.25.1/arch/powerpc/math-emu/mtfsf.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/mtfsf.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/mtfsf.c
@@ -38,7 +38,7 @@ mtfsf(unsigned int FM, u32 *frB)
__FPU_FPSCR |= (frB[1] & mask);
@@ -90703,10 +90703,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/mtfsf.c
#endif
return 0;
-Index: linux-2.6.25.1/arch/powerpc/math-emu/mtfsfi.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/mtfsfi.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/mtfsfi.c
@@ -16,7 +16,7 @@ mtfsfi(unsigned int crfD, unsigned int I
__FPU_FPSCR |= (IMM & 0xf) << ((7 - crfD) << 2);
@@ -90716,10 +90716,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/mtfsfi.c
#endif
return 0;
-Index: linux-2.6.25.1/arch/powerpc/math-emu/stfd.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/stfd.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/stfd.c
@@ -7,7 +7,7 @@ stfd(void *frS, void *ea)
{
#if 0
@@ -90729,10 +90729,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/stfd.c
dump_double(frS);
printk("\n");
#endif
-Index: linux-2.6.25.1/arch/powerpc/math-emu/stfiwx.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/stfiwx.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/stfiwx.c
@@ -6,7 +6,7 @@ int
stfiwx(u32 *frS, void *ea)
{
@@ -90742,10 +90742,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/stfiwx.c
#endif
if (copy_to_user(ea, &frS[1], sizeof(frS[1])))
-Index: linux-2.6.25.1/arch/powerpc/math-emu/stfs.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/math-emu/stfs.c
++++ linux-2.6.25.4/arch/powerpc/math-emu/stfs.c
@@ -15,7 +15,7 @@ stfs(void *frS, void *ea)
int err;
@@ -90755,10 +90755,10 @@ Index: linux-2.6.25.1/arch/powerpc/math-emu/stfs.c
#endif
__FP_UNPACK_D(A, frS);
-Index: linux-2.6.25.1/arch/powerpc/mm/40x_mmu.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/mm/40x_mmu.c
++++ linux-2.6.25.4/arch/powerpc/mm/40x_mmu.c
@@ -97,7 +97,7 @@ unsigned long __init mmu_mapin_ram(void)
phys_addr_t p;
@@ -90768,10 +90768,10 @@ Index: linux-2.6.25.1/arch/powerpc/mm/40x_mmu.c
s = total_lowmem;
if (__map_without_ltlbs)
-Index: linux-2.6.25.1/arch/powerpc/mm/44x_mmu.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/mm/44x_mmu.c
++++ linux-2.6.25.4/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
@@ -90781,10 +90781,10 @@ Index: linux-2.6.25.1/arch/powerpc/mm/44x_mmu.c
addr += PPC_PIN_SIZE)
ppc44x_pin_tlb(addr + PAGE_OFFSET, addr);
-Index: linux-2.6.25.1/arch/powerpc/mm/Makefile
+Index: linux-2.6.25.4/arch/powerpc/mm/Makefile
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/mm/Makefile
-+++ linux-2.6.25.1/arch/powerpc/mm/Makefile
+--- linux-2.6.25.4.orig/arch/powerpc/mm/Makefile
++++ linux-2.6.25.4/arch/powerpc/mm/Makefile
@@ -6,7 +6,7 @@ ifeq ($(CONFIG_PPC64),y)
EXTRA_CFLAGS += -mno-minimal-toc
endif
@@ -90794,10 +90794,10 @@ Index: linux-2.6.25.1/arch/powerpc/mm/Makefile
init_$(CONFIG_WORD_SIZE).o \
pgtable_$(CONFIG_WORD_SIZE).o \
mmu_context_$(CONFIG_WORD_SIZE).o
-Index: linux-2.6.25.1/arch/powerpc/mm/fsl_booke_mmu.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/mm/fsl_booke_mmu.c
++++ linux-2.6.25.4/arch/powerpc/mm/fsl_booke_mmu.c
@@ -49,18 +49,15 @@
#include <asm/mmu.h>
#include <asm/uaccess.h>
@@ -90899,10 +90899,10 @@ Index: linux-2.6.25.1/arch/powerpc/mm/fsl_booke_mmu.c
+ __max_low_memory = __cam0 + __cam1 + __cam2;
+ __initial_memory_limit_addr = memstart_addr + __max_low_memory;
}
-Index: linux-2.6.25.1/arch/powerpc/mm/hash_utils_64.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/mm/hash_utils_64.c
++++ linux-2.6.25.4/arch/powerpc/mm/hash_utils_64.c
@@ -31,6 +31,7 @@
#include <linux/cache.h>
#include <linux/init.h>
@@ -90963,10 +90963,10 @@ Index: linux-2.6.25.1/arch/powerpc/mm/hash_utils_64.c
#endif /* CONFIG_MEMORY_HOTPLUG */
static inline void make_bl(unsigned int *insn_addr, void *func)
-Index: linux-2.6.25.1/arch/powerpc/mm/init_32.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/mm/init_32.c
++++ linux-2.6.25.4/arch/powerpc/mm/init_32.c
@@ -30,6 +30,7 @@
#include <linux/highmem.h>
#include <linux/initrd.h>
@@ -91070,10 +91070,10 @@ Index: linux-2.6.25.1/arch/powerpc/mm/init_32.c
/* must stay under 32 bits */
if ( 0xfffffffful - (unsigned long)__va(base) < size) {
-Index: linux-2.6.25.1/arch/powerpc/mm/init_64.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/mm/init_64.c
++++ linux-2.6.25.4/arch/powerpc/mm/init_64.c
@@ -38,11 +38,11 @@
#include <linux/nodemask.h>
#include <linux/module.h>
@@ -91106,9 +91106,9 @@ Index: linux-2.6.25.1/arch/powerpc/mm/init_64.c
kclist_add(kcore_mem, __va(base), size);
}
-Index: linux-2.6.25.1/arch/powerpc/mm/lmb.c
+Index: linux-2.6.25.4/arch/powerpc/mm/lmb.c
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/mm/lmb.c
+--- linux-2.6.25.4.orig/arch/powerpc/mm/lmb.c
+++ /dev/null
@@ -1,357 +0,0 @@
-/*
@@ -91468,10 +91468,10 @@ Index: linux-2.6.25.1/arch/powerpc/mm/lmb.c
- }
- return 0;
-}
-Index: linux-2.6.25.1/arch/powerpc/mm/mem.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/mm/mem.c
++++ linux-2.6.25.4/arch/powerpc/mm/mem.c
@@ -31,6 +31,7 @@
#include <linux/initrd.h>
#include <linux/pagemap.h>
@@ -91559,10 +91559,10 @@ Index: linux-2.6.25.1/arch/powerpc/mm/mem.c
for (pfn = highmem_mapnr; pfn < max_mapnr; ++pfn) {
struct page *page = pfn_to_page(pfn);
if (lmb_is_reserved(pfn << PAGE_SHIFT))
-Index: linux-2.6.25.1/arch/powerpc/mm/mmu_decl.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/mm/mmu_decl.h
++++ linux-2.6.25.4/arch/powerpc/mm/mmu_decl.h
@@ -48,9 +48,11 @@ extern unsigned int num_tlbcam_entries;
extern unsigned long ioremap_bot;
@@ -91576,10 +91576,10 @@ Index: linux-2.6.25.1/arch/powerpc/mm/mmu_decl.h
/* ...and now those things that may be slightly different between processor
* architectures. -- Dan
-Index: linux-2.6.25.1/arch/powerpc/mm/numa.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/mm/numa.c
++++ linux-2.6.25.4/arch/powerpc/mm/numa.c
@@ -17,8 +17,9 @@
#include <linux/nodemask.h>
#include <linux/cpu.h>
@@ -91591,10 +91591,10 @@ Index: linux-2.6.25.1/arch/powerpc/mm/numa.c
#include <asm/system.h>
#include <asm/smp.h>
-Index: linux-2.6.25.1/arch/powerpc/mm/pgtable_32.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/mm/pgtable_32.c
++++ linux-2.6.25.4/arch/powerpc/mm/pgtable_32.c
@@ -281,12 +281,13 @@ int map_page(unsigned long va, phys_addr
*/
void __init mapin_ram(void)
@@ -91611,10 +91611,10 @@ Index: linux-2.6.25.1/arch/powerpc/mm/pgtable_32.c
for (; s < total_lowmem; s += PAGE_SIZE) {
ktext = ((char *) v >= _stext && (char *) v < etext);
f = ktext ?_PAGE_RAM_TEXT : _PAGE_RAM;
-Index: linux-2.6.25.1/arch/powerpc/mm/ppc_mmu_32.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/mm/ppc_mmu_32.c
++++ linux-2.6.25.4/arch/powerpc/mm/ppc_mmu_32.c
@@ -26,11 +26,11 @@
#include <linux/mm.h>
#include <linux/init.h>
@@ -91675,10 +91675,10 @@ Index: linux-2.6.25.1/arch/powerpc/mm/ppc_mmu_32.c
cacheable_memzero(Hash, Hash_size);
_SDR1 = __pa(Hash) | SDR1_LOW_BITS;
-Index: linux-2.6.25.1/arch/powerpc/mm/stab.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/mm/stab.c
++++ linux-2.6.25.4/arch/powerpc/mm/stab.c
@@ -12,12 +12,14 @@
* 2 of the License, or (at your option) any later version.
*/
@@ -91695,10 +91695,10 @@ Index: linux-2.6.25.1/arch/powerpc/mm/stab.c
#include <asm/abs_addr.h>
#include <asm/firmware.h>
#include <asm/iseries/hv_call.h>
-Index: linux-2.6.25.1/arch/powerpc/oprofile/cell/spu_task_sync.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/oprofile/cell/spu_task_sync.c
++++ linux-2.6.25.4/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: "
@@ -91753,10 +91753,10 @@ Index: linux-2.6.25.1/arch/powerpc/oprofile/cell/spu_task_sync.c
goto out;
}
-Index: linux-2.6.25.1/arch/powerpc/oprofile/cell/vma_map.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/oprofile/cell/vma_map.c
++++ linux-2.6.25.4/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) {
@@ -91798,10 +91798,10 @@ Index: linux-2.6.25.1/arch/powerpc/oprofile/cell/vma_map.c
goto fail;
}
ovly_table = spu_elf_start + overlay_tbl_offset;
-Index: linux-2.6.25.1/arch/powerpc/oprofile/op_model_cell.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/oprofile/op_model_cell.c
++++ linux-2.6.25.4/arch/powerpc/oprofile/op_model_cell.c
@@ -216,7 +216,7 @@ static void pm_rtas_reset_signals(u32 no
* failure to stop OProfile.
*/
@@ -91865,10 +91865,10 @@ Index: linux-2.6.25.1/arch/powerpc/oprofile/op_model_cell.c
}
/* Deactivate the signals */
-Index: linux-2.6.25.1/arch/powerpc/platforms/40x/ep405.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/40x/ep405.c
++++ linux-2.6.25.4/arch/powerpc/platforms/40x/ep405.c
@@ -29,6 +29,7 @@
#include <asm/time.h>
#include <asm/uic.h>
@@ -91884,10 +91884,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/40x/ep405.c
+ .restart = ppc4xx_reset_system,
.calibrate_decr = generic_calibrate_decr,
};
-Index: linux-2.6.25.1/arch/powerpc/platforms/40x/kilauea.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/40x/kilauea.c
++++ linux-2.6.25.4/arch/powerpc/platforms/40x/kilauea.c
@@ -1,7 +1,7 @@
/*
* Kilauea board specific routines
@@ -91912,10 +91912,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/40x/kilauea.c
+ .restart = ppc4xx_reset_system,
.calibrate_decr = generic_calibrate_decr,
};
-Index: linux-2.6.25.1/arch/powerpc/platforms/40x/makalu.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/40x/makalu.c
++++ linux-2.6.25.4/arch/powerpc/platforms/40x/makalu.c
@@ -20,6 +20,7 @@
#include <asm/time.h>
#include <asm/uic.h>
@@ -91931,10 +91931,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/40x/makalu.c
+ .restart = ppc4xx_reset_system,
.calibrate_decr = generic_calibrate_decr,
};
-Index: linux-2.6.25.1/arch/powerpc/platforms/40x/virtex.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/40x/virtex.c
++++ linux-2.6.25.4/arch/powerpc/platforms/40x/virtex.c
@@ -14,6 +14,7 @@
#include <asm/prom.h>
#include <asm/time.h>
@@ -91950,10 +91950,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/40x/virtex.c
+ .restart = ppc4xx_reset_system,
.calibrate_decr = generic_calibrate_decr,
};
-Index: linux-2.6.25.1/arch/powerpc/platforms/40x/walnut.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/40x/walnut.c
++++ linux-2.6.25.4/arch/powerpc/platforms/40x/walnut.c
@@ -26,6 +26,7 @@
#include <asm/time.h>
#include <asm/uic.h>
@@ -91970,10 +91970,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/40x/walnut.c
+ .restart = ppc4xx_reset_system,
+ .calibrate_decr = generic_calibrate_decr,
};
-Index: linux-2.6.25.1/arch/powerpc/platforms/44x/44x.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/44x/44x.h
++++ linux-2.6.25.4/arch/powerpc/platforms/44x/44x.h
@@ -3,6 +3,5 @@
extern u8 as1_readb(volatile u8 __iomem *addr);
@@ -91981,10 +91981,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/44x/44x.h
-extern void ppc44x_reset_system(char *cmd);
#endif /* __POWERPC_PLATFORMS_44X_44X_H */
-Index: linux-2.6.25.1/arch/powerpc/platforms/44x/Kconfig
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/44x/Kconfig
++++ linux-2.6.25.4/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.
@@ -92026,10 +92026,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/44x/Kconfig
# 44x errata/workaround config symbols, selected by the CPU models above
config IBM440EP_ERR42
bool
-Index: linux-2.6.25.1/arch/powerpc/platforms/44x/Makefile
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/44x/Makefile
++++ linux-2.6.25.4/arch/powerpc/platforms/44x/Makefile
@@ -1,9 +1,11 @@
-obj-$(CONFIG_44x) := misc_44x.o
+obj-$(CONFIG_44x) := misc_44x.o idle.o
@@ -92043,10 +92043,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/44x/Makefile
obj-$(CONFIG_WARP) += warp.o
obj-$(CONFIG_WARP) += warp-nand.o
+obj-$(CONFIG_CANYONLANDS) += canyonlands.o
-Index: linux-2.6.25.1/arch/powerpc/platforms/44x/bamboo.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/44x/bamboo.c
++++ linux-2.6.25.4/arch/powerpc/platforms/44x/bamboo.c
@@ -22,8 +22,7 @@
#include <asm/time.h>
#include <asm/uic.h>
@@ -92075,10 +92075,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/44x/bamboo.c
+ .restart = ppc4xx_reset_system,
.calibrate_decr = generic_calibrate_decr,
};
-Index: linux-2.6.25.1/arch/powerpc/platforms/44x/canyonlands.c
+Index: linux-2.6.25.4/arch/powerpc/platforms/44x/canyonlands.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/platforms/44x/canyonlands.c
++++ linux-2.6.25.4/arch/powerpc/platforms/44x/canyonlands.c
@@ -0,0 +1,63 @@
+/*
+ * Canyonlands board specific routines
@@ -92143,10 +92143,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/44x/canyonlands.c
+ .restart = ppc4xx_reset_system,
+ .calibrate_decr = generic_calibrate_decr,
+};
-Index: linux-2.6.25.1/arch/powerpc/platforms/44x/ebony.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/44x/ebony.c
++++ linux-2.6.25.4/arch/powerpc/platforms/44x/ebony.c
@@ -26,8 +26,7 @@
#include <asm/time.h>
#include <asm/uic.h>
@@ -92165,10 +92165,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/44x/ebony.c
+ .restart = ppc4xx_reset_system,
.calibrate_decr = generic_calibrate_decr,
};
-Index: linux-2.6.25.1/arch/powerpc/platforms/44x/idle.c
+Index: linux-2.6.25.4/arch/powerpc/platforms/44x/idle.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/platforms/44x/idle.c
++++ linux-2.6.25.4/arch/powerpc/platforms/44x/idle.c
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2008 IBM Corp.
@@ -92237,10 +92237,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/44x/idle.c
+}
+
+early_param("idle", idle_param);
-Index: linux-2.6.25.1/arch/powerpc/platforms/44x/katmai.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/44x/katmai.c
++++ linux-2.6.25.4/arch/powerpc/platforms/44x/katmai.c
@@ -22,8 +22,7 @@
#include <asm/time.h>
#include <asm/uic.h>
@@ -92259,10 +92259,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/44x/katmai.c
+ .restart = ppc4xx_reset_system,
.calibrate_decr = generic_calibrate_decr,
};
-Index: linux-2.6.25.1/arch/powerpc/platforms/44x/misc_44x.S
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/44x/misc_44x.S
++++ linux-2.6.25.4/arch/powerpc/platforms/44x/misc_44x.S
@@ -44,14 +44,3 @@ _GLOBAL(as1_writeb)
sync
isync
@@ -92278,10 +92278,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/44x/misc_44x.S
- oris r13,r13,DBCR0_RST_SYSTEM@h
- mtspr SPRN_DBCR0,r13
- b . /* Just in case the reset doesn't work */
-Index: linux-2.6.25.1/arch/powerpc/platforms/44x/rainier.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/44x/rainier.c
++++ linux-2.6.25.4/arch/powerpc/platforms/44x/rainier.c
@@ -22,7 +22,7 @@
#include <asm/time.h>
#include <asm/uic.h>
@@ -92299,10 +92299,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/44x/rainier.c
+ .restart = ppc4xx_reset_system,
.calibrate_decr = generic_calibrate_decr,
};
-Index: linux-2.6.25.1/arch/powerpc/platforms/44x/sequoia.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/44x/sequoia.c
++++ linux-2.6.25.4/arch/powerpc/platforms/44x/sequoia.c
@@ -23,7 +23,7 @@
#include <asm/uic.h>
#include <asm/pci-bridge.h>
@@ -92320,10 +92320,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/44x/sequoia.c
+ .restart = ppc4xx_reset_system,
.calibrate_decr = generic_calibrate_decr,
};
-Index: linux-2.6.25.1/arch/powerpc/platforms/44x/taishan.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/44x/taishan.c
++++ linux-2.6.25.4/arch/powerpc/platforms/44x/taishan.c
@@ -29,8 +29,7 @@
#include <asm/time.h>
#include <asm/uic.h>
@@ -92342,10 +92342,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/44x/taishan.c
+ .restart = ppc4xx_reset_system,
.calibrate_decr = generic_calibrate_decr,
};
-Index: linux-2.6.25.1/arch/powerpc/platforms/44x/warp-nand.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/44x/warp-nand.c
++++ linux-2.6.25.4/arch/powerpc/platforms/44x/warp-nand.c
@@ -11,6 +11,7 @@
#include <linux/mtd/partitions.h>
#include <linux/mtd/nand.h>
@@ -92362,10 +92362,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/44x/warp-nand.c
+machine_device_initcall(warp, warp_setup_nand_flash);
#endif
-Index: linux-2.6.25.1/arch/powerpc/platforms/44x/warp.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/44x/warp.c
++++ linux-2.6.25.4/arch/powerpc/platforms/44x/warp.c
@@ -18,9 +18,7 @@
#include <asm/udbg.h>
#include <asm/time.h>
@@ -92386,10 +92386,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/44x/warp.c
.calibrate_decr = generic_calibrate_decr,
};
-Index: linux-2.6.25.1/arch/powerpc/platforms/52xx/lite5200.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/52xx/lite5200.c
++++ linux-2.6.25.4/arch/powerpc/platforms/52xx/lite5200.c
@@ -63,7 +63,7 @@ lite5200_fix_clock_config(void)
of_node_put(np);
if (!cdm) {
@@ -92408,10 +92408,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/52xx/lite5200.c
return;
}
-Index: linux-2.6.25.1/arch/powerpc/platforms/82xx/Kconfig
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/82xx/Kconfig
++++ linux-2.6.25.4/arch/powerpc/platforms/82xx/Kconfig
@@ -11,7 +11,6 @@ config MPC8272_ADS
select 8260
select FSL_SOC
@@ -92436,10 +92436,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/82xx/Kconfig
select MDIO_BITBANG
help
This enables support for the Embedded Planet EP8248E board.
-Index: linux-2.6.25.1/arch/powerpc/platforms/83xx/mpc837x_rdb.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/83xx/mpc837x_rdb.c
++++ linux-2.6.25.4/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", },
@@ -92448,10 +92448,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/83xx/mpc837x_rdb.c
{},
};
-Index: linux-2.6.25.1/arch/powerpc/platforms/83xx/mpc83xx.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/83xx/mpc83xx.h
++++ linux-2.6.25.4/arch/powerpc/platforms/83xx/mpc83xx.h
@@ -16,6 +16,7 @@
#define MPC83XX_SCCR_USB_DRCM_10 0x00200000
#define MPC8315_SCCR_USB_MASK 0x00c00000
@@ -92468,10 +92468,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/83xx/mpc83xx.h
#define CONTROL_REFSEL_48MHZ 0x00000080
#define CONTROL_PHY_CLK_SEL_ULPI 0x00000400
#define CONTROL_OTG_PORT 0x00000020
-Index: linux-2.6.25.1/arch/powerpc/platforms/83xx/usb.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/83xx/usb.c
++++ linux-2.6.25.4/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,
@@ -92499,10 +92499,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/83xx/usb.c
/* Using external UPLI PHY */
} else if (prop && !strcmp(prop, "ulpi")) {
/* Set PHY_CLK_SEL to ULPI */
-Index: linux-2.6.25.1/arch/powerpc/platforms/85xx/Kconfig
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/85xx/Kconfig
++++ linux-2.6.25.4/arch/powerpc/platforms/85xx/Kconfig
@@ -19,7 +19,6 @@ config MPC8540_ADS
config MPC8560_ADS
bool "Freescale MPC8560 ADS"
@@ -92571,19 +92571,19 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/85xx/Kconfig
help
This option enables support for the Wind River SBC8560 board
-Index: linux-2.6.25.1/arch/powerpc/platforms/85xx/Makefile
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/85xx/Makefile
++++ linux-2.6.25.4/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
-Index: linux-2.6.25.1/arch/powerpc/platforms/85xx/ksi8560.c
+Index: linux-2.6.25.4/arch/powerpc/platforms/85xx/ksi8560.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/platforms/85xx/ksi8560.c
++++ linux-2.6.25.4/arch/powerpc/platforms/85xx/ksi8560.c
@@ -0,0 +1,257 @@
+/*
+ * Board setup routines for the Emerson KSI8560
@@ -92842,10 +92842,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/85xx/ksi8560.c
+ .restart = machine_restart,
+ .calibrate_decr = generic_calibrate_decr,
+};
-Index: linux-2.6.25.1/arch/powerpc/platforms/85xx/mpc85xx_ads.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/85xx/mpc85xx_ads.c
++++ linux-2.6.25.4/arch/powerpc/platforms/85xx/mpc85xx_ads.c
@@ -165,7 +165,7 @@ static void __init init_ioports(void)
int i;
@@ -92855,10 +92855,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/85xx/mpc85xx_ads.c
cpm2_set_pin(pin->port, pin->pin, pin->flags);
}
-Index: linux-2.6.25.1/arch/powerpc/platforms/85xx/mpc85xx_ds.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/85xx/mpc85xx_ds.c
++++ linux-2.6.25.4/arch/powerpc/platforms/85xx/mpc85xx_ds.c
@@ -19,6 +19,7 @@
#include <linux/delay.h>
#include <linux/seq_file.h>
@@ -92895,10 +92895,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/85xx/mpc85xx_ds.c
/*
* Called very early, device-tree isn't unflattened
*/
-Index: linux-2.6.25.1/arch/powerpc/platforms/86xx/Kconfig
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/86xx/Kconfig
++++ linux-2.6.25.4/arch/powerpc/platforms/86xx/Kconfig
@@ -11,6 +11,12 @@ config MPC8641_HPCN
help
This option enables support for the MPC8641 HPCN board.
@@ -92921,20 +92921,20 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/86xx/Kconfig
config MPC8610
bool
-Index: linux-2.6.25.1/arch/powerpc/platforms/86xx/Makefile
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/86xx/Makefile
++++ linux-2.6.25.4/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
-Index: linux-2.6.25.1/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
++++ linux-2.6.25.4/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);
@@ -92953,10 +92953,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
mpc86xx_time_init(void)
{
unsigned int temp;
-Index: linux-2.6.25.1/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
++++ linux-2.6.25.4/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -55,7 +55,7 @@ static void mpc86xx_8259_cascade(unsigne
}
#endif /* CONFIG_PCI */
@@ -92997,10 +92997,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
mpc86xx_time_init(void)
{
unsigned int temp;
-Index: linux-2.6.25.1/arch/powerpc/platforms/86xx/sbc8641d.c
+Index: linux-2.6.25.4/arch/powerpc/platforms/86xx/sbc8641d.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/platforms/86xx/sbc8641d.c
++++ linux-2.6.25.4/arch/powerpc/platforms/86xx/sbc8641d.c
@@ -0,0 +1,164 @@
+/*
+ * SBC8641D board specific routines
@@ -93166,10 +93166,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/86xx/sbc8641d.c
+ .pcibios_fixup_bus = fsl_pcibios_fixup_bus,
+#endif
+};
-Index: linux-2.6.25.1/arch/powerpc/platforms/8xx/Kconfig
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/8xx/Kconfig
++++ linux-2.6.25.4/arch/powerpc/platforms/8xx/Kconfig
@@ -18,7 +18,6 @@ config MPC8XXFADS
config MPC86XADS
bool "MPC86XADS"
@@ -93202,10 +93202,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/8xx/Kconfig
select REDBOOT
help
This enables support for the Analogue & Micro Adder 875
-Index: linux-2.6.25.1/arch/powerpc/platforms/8xx/m8xx_setup.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/8xx/m8xx_setup.c
++++ linux-2.6.25.4/arch/powerpc/platforms/8xx/m8xx_setup.c
@@ -111,17 +111,12 @@ void __init mpc8xx_calibrate_decr(void)
/* Processor frequency is MHz.
@@ -93225,10 +93225,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/8xx/m8xx_setup.c
printk("Decrementer Frequency = 0x%lx\n", ppc_tb_freq);
/* Perform some more timer/timebase initialization. This used
-Index: linux-2.6.25.1/arch/powerpc/platforms/Kconfig
+Index: linux-2.6.25.4/arch/powerpc/platforms/Kconfig
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/platforms/Kconfig
-+++ linux-2.6.25.1/arch/powerpc/platforms/Kconfig
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/Kconfig
++++ linux-2.6.25.4/arch/powerpc/platforms/Kconfig
@@ -290,13 +290,7 @@ config CPM2
config PPC_CPM_NEW_BINDING
bool
@@ -93244,10 +93244,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/Kconfig
config AXON_RAM
tristate "Axon DDR2 memory device driver"
-Index: linux-2.6.25.1/arch/powerpc/platforms/Kconfig.cputype
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/Kconfig.cputype
++++ linux-2.6.25.4/arch/powerpc/platforms/Kconfig.cputype
@@ -41,11 +41,13 @@ config 40x
bool "AMCC 40x"
select PPC_DCR_NATIVE
@@ -93262,10 +93262,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/Kconfig.cputype
config E200
bool "Freescale e200"
-Index: linux-2.6.25.1/arch/powerpc/platforms/cell/iommu.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/cell/iommu.c
++++ linux-2.6.25.4/arch/powerpc/platforms/cell/iommu.c
@@ -28,13 +28,13 @@
#include <linux/notifier.h>
#include <linux/of.h>
@@ -93317,10 +93317,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/cell/iommu.c
iommu->xlate_regs = ioremap(xlate_base, IOC_Reg_Size);
iommu->cmd_regs = iommu->xlate_regs + IOC_IOCmd_Offset;
-Index: linux-2.6.25.1/arch/powerpc/platforms/cell/pervasive.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/cell/pervasive.c
++++ linux-2.6.25.4/arch/powerpc/platforms/cell/pervasive.c
@@ -65,7 +65,7 @@ static void cbe_power_save(void)
break;
default:
@@ -93330,10 +93330,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/cell/pervasive.c
break;
}
mtspr(SPRN_TSC_CELL, thread_switch_control);
-Index: linux-2.6.25.1/arch/powerpc/platforms/cell/ras.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/cell/ras.c
++++ linux-2.6.25.4/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))) {
@@ -93377,10 +93377,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/cell/ras.c
area->nid);
ret = -EIO;
continue;
-Index: linux-2.6.25.1/arch/powerpc/platforms/cell/spu_base.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/cell/spu_base.c
++++ linux-2.6.25.4/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;
@@ -93417,10 +93417,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/cell/spu_base.c
goto out_unregister_sysdev_class;
}
-Index: linux-2.6.25.1/arch/powerpc/platforms/cell/spu_callbacks.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/cell/spu_callbacks.c
++++ linux-2.6.25.4/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);
@@ -93430,10 +93430,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/cell/spu_callbacks.c
return -ENOSYS;
}
-Index: linux-2.6.25.1/arch/powerpc/platforms/cell/spu_manage.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/cell/spu_manage.c
++++ linux-2.6.25.4/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);
@@ -93470,10 +93470,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/cell/spu_manage.c
}
ret = spu_map_interrupts_old(spu, spe);
if (ret) {
-Index: linux-2.6.25.1/arch/powerpc/platforms/cell/spufs/coredump.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/cell/spufs/coredump.c
++++ linux-2.6.25.4/arch/powerpc/platforms/cell/spufs/coredump.c
@@ -133,8 +133,6 @@ static struct spu_context *coredump_next
if (ctx->flags & SPU_CREATE_NOSCHED)
continue;
@@ -93503,10 +93503,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/cell/spufs/coredump.c
}
return 0;
-Index: linux-2.6.25.1/arch/powerpc/platforms/cell/spufs/file.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/cell/spufs/file.c
++++ linux-2.6.25.4/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);
}
@@ -93543,10 +93543,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/cell/spufs/file.c
free_elements, tagstatus, ctx->tagwait);
return mask;
-Index: linux-2.6.25.1/arch/powerpc/platforms/cell/spufs/run.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/cell/spufs/run.c
++++ linux-2.6.25.4/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)) {
@@ -93603,10 +93603,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/cell/spufs/run.c
/* write result, jump over indirect pointer */
memcpy_toio(ls + ls_pointer, &spu_ret, sizeof(spu_ret));
ctx->ops->npc_write(ctx, npc);
-Index: linux-2.6.25.1/arch/powerpc/platforms/cell/spufs/switch.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/cell/spufs/switch.c
++++ linux-2.6.25.4/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. */
@@ -93623,10 +93623,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/cell/spufs/switch.c
reset_ch(prev, spu); /* Step 45. */
}
-Index: linux-2.6.25.1/arch/powerpc/platforms/celleb/beat.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/celleb/beat.c
++++ linux-2.6.25.4/arch/powerpc/platforms/celleb/beat.c
@@ -48,6 +48,7 @@ void beat_power_off(void)
}
@@ -93692,10 +93692,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/celleb/beat.c
-EXPORT_SYMBOL(beat_get_term_char);
-EXPORT_SYMBOL(beat_put_term_char);
-EXPORT_SYMBOL(beat_halt_code);
-Index: linux-2.6.25.1/arch/powerpc/platforms/celleb/beat.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/celleb/beat.h
++++ linux-2.6.25.4/arch/powerpc/platforms/celleb/beat.h
@@ -21,8 +21,8 @@
#ifndef _CELLEB_BEAT_H
#define _CELLEB_BEAT_H
@@ -93707,10 +93707,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/celleb/beat.h
int64_t beat_repository_encode(int, const char *, uint64_t[4]);
void beat_restart(char *);
void beat_power_off(void);
-Index: linux-2.6.25.1/arch/powerpc/platforms/celleb/beat_wrapper.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/celleb/beat_wrapper.h
++++ linux-2.6.25.4/arch/powerpc/platforms/celleb/beat_wrapper.h
@@ -197,7 +197,8 @@ static inline s64 beat_put_characters_to
u64 b[2];
@@ -93721,10 +93721,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/celleb/beat_wrapper.h
}
static inline s64 beat_get_spe_privileged_state_1_registers(
-Index: linux-2.6.25.1/arch/powerpc/platforms/celleb/htab.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/celleb/htab.c
++++ linux-2.6.25.4/arch/powerpc/platforms/celleb/htab.c
@@ -35,9 +35,9 @@
#include "beat_wrapper.h"
@@ -93747,10 +93747,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/celleb/htab.c
if (!(vflags & HPTE_V_BOLTED))
DBG_LOW(" full\n");
spin_unlock(&beat_htab_lock);
-Index: linux-2.6.25.1/arch/powerpc/platforms/celleb/interrupt.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/celleb/interrupt.c
++++ linux-2.6.25.4/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];
@@ -93834,10 +93834,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/celleb/interrupt.c
0);
BUG_ON(beatic_host == NULL);
irq_set_default_host(beatic_host);
-Index: linux-2.6.25.1/arch/powerpc/platforms/celleb/scc_epci.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/celleb/scc_epci.c
++++ linux-2.6.25.4/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) +
@@ -93860,10 +93860,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/celleb/scc_epci.c
{
PCI_IO_ADDR epci_base;
PCI_IO_ADDR addr;
-Index: linux-2.6.25.1/arch/powerpc/platforms/celleb/scc_sio.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/celleb/scc_sio.c
++++ linux-2.6.25.4/arch/powerpc/platforms/celleb/scc_sio.c
@@ -28,7 +28,7 @@
/* sio irq0=0xb00010022 irq0=0xb00010023 irq2=0xb00010024
@@ -93882,10 +93882,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/celleb/scc_sio.c
default:
return 0;
case 2:
-Index: linux-2.6.25.1/arch/powerpc/platforms/celleb/spu_priv1.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/celleb/spu_priv1.c
++++ linux-2.6.25.4/arch/powerpc/platforms/celleb/spu_priv1.c
@@ -183,8 +183,7 @@ static u64 resource_allocation_enable_ge
return enable;
}
@@ -93896,10 +93896,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/celleb/spu_priv1.c
.int_mask_and = int_mask_and,
.int_mask_or = int_mask_or,
.int_mask_set = int_mask_set,
-Index: linux-2.6.25.1/arch/powerpc/platforms/celleb/udbg_beat.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/celleb/udbg_beat.c
++++ linux-2.6.25.4/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. */
@@ -93919,10 +93919,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/celleb/udbg_beat.c
;
} else {
return ch;
-Index: linux-2.6.25.1/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
++++ linux-2.6.25.4/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
@@ -117,11 +117,11 @@ static void __init mpc7448_hpc2_init_IRQ
}
@@ -93958,10 +93958,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
(u32) cascade_pci_irq);
tsi108_pci_int_init(cascade_node);
set_irq_data(cascade_pci_irq, mpic);
-Index: linux-2.6.25.1/arch/powerpc/platforms/embedded6xx/prpmc2800.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/embedded6xx/prpmc2800.c
++++ linux-2.6.25.4/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().
@@ -93978,10 +93978,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/embedded6xx/prpmc2800.c
reg = of_get_property(np, "reg", NULL);
paddr = of_translate_address(np, reg);
of_node_put(np);
-Index: linux-2.6.25.1/arch/powerpc/platforms/iseries/exception.S
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/iseries/exception.S
++++ linux-2.6.25.4/arch/powerpc/platforms/iseries/exception.S
@@ -38,11 +38,19 @@
.globl system_reset_iSeries
@@ -94004,10 +94004,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/iseries/exception.S
cmpwi 0,r24,0 /* Are we processor 0? */
bne 1f
b .__start_initialization_iSeries /* Start up the first processor */
-Index: linux-2.6.25.1/arch/powerpc/platforms/iseries/ipl_parms.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/iseries/ipl_parms.h
++++ linux-2.6.25.4/arch/powerpc/platforms/iseries/ipl_parms.h
@@ -65,6 +65,4 @@ struct ItIplParmsReal {
u64 xRsvd13; // Reserved x38-x3F
};
@@ -94015,10 +94015,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/iseries/ipl_parms.h
-extern struct ItIplParmsReal xItIplParmsReal;
-
#endif /* _ISERIES_IPL_PARMS_H */
-Index: linux-2.6.25.1/arch/powerpc/platforms/iseries/lpardata.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/iseries/lpardata.c
++++ linux-2.6.25.4/arch/powerpc/platforms/iseries/lpardata.c
@@ -14,10 +14,10 @@
#include <asm/ptrace.h>
#include <asm/abs_addr.h>
@@ -94208,10 +94208,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/iseries/lpardata.c
- .xSize = sizeof(struct ItLpRegSave),
- },
-};
-Index: linux-2.6.25.1/arch/powerpc/platforms/iseries/naca.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/iseries/naca.h
++++ linux-2.6.25.4/arch/powerpc/platforms/iseries/naca.h
@@ -14,7 +14,7 @@
struct naca_struct {
@@ -94221,10 +94221,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/iseries/naca.h
void *xRamDisk; /* iSeries ramdisk 0x08 */
u64 xRamDiskSize; /* In pages 0x10 */
};
-Index: linux-2.6.25.1/arch/powerpc/platforms/iseries/pci.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/iseries/pci.c
++++ linux-2.6.25.4/arch/powerpc/platforms/iseries/pci.c
@@ -23,6 +23,7 @@
#undef DEBUG
@@ -94242,10 +94242,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/iseries/pci.c
last_jiffies = jiffies;
num_printed = 0;
}
-Index: linux-2.6.25.1/arch/powerpc/platforms/iseries/release_data.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/iseries/release_data.h
++++ linux-2.6.25.4/arch/powerpc/platforms/iseries/release_data.h
@@ -58,6 +58,6 @@ struct HvReleaseData {
char xRsvd3[20]; /* Reserved x2C-x3F */
};
@@ -94254,10 +94254,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/iseries/release_data.h
+extern const struct HvReleaseData hvReleaseData;
#endif /* _ISERIES_RELEASE_DATA_H */
-Index: linux-2.6.25.1/arch/powerpc/platforms/iseries/spcomm_area.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/iseries/spcomm_area.h
++++ linux-2.6.25.4/arch/powerpc/platforms/iseries/spcomm_area.h
@@ -31,6 +31,4 @@ struct SpCommArea {
u8 xRsvd2[80]; // Reserved 030-07F
};
@@ -94265,10 +94265,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/iseries/spcomm_area.h
-extern struct SpCommArea xSpCommArea;
-
#endif /* _ISERIES_SPCOMM_AREA_H */
-Index: linux-2.6.25.1/arch/powerpc/platforms/iseries/vpd_areas.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/iseries/vpd_areas.h
++++ linux-2.6.25.4/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
@@ -94281,10 +94281,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/iseries/vpd_areas.h
+extern const struct ItVpdAreas itVpdAreas;
#endif /* _ISERIES_VPD_AREAS_H */
-Index: linux-2.6.25.1/arch/powerpc/platforms/maple/pci.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/maple/pci.c
++++ linux-2.6.25.4/arch/powerpc/platforms/maple/pci.c
@@ -592,50 +592,3 @@ int maple_pci_get_legacy_ide_irq(struct
}
return irq;
@@ -94336,10 +94336,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/maple/pci.c
-}
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8111_IDE,
- fixup_maple_ide);
-Index: linux-2.6.25.1/arch/powerpc/platforms/maple/setup.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/maple/setup.c
++++ linux-2.6.25.4/arch/powerpc/platforms/maple/setup.c
@@ -43,6 +43,7 @@
#include <linux/smp.h>
#include <linux/bitops.h>
@@ -94365,10 +94365,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/maple/setup.c
.name = "Maple",
.probe = maple_probe,
.setup_arch = maple_setup_arch,
-Index: linux-2.6.25.1/arch/powerpc/platforms/pasemi/dma_lib.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/pasemi/dma_lib.c
++++ linux-2.6.25.4/arch/powerpc/platforms/pasemi/dma_lib.c
@@ -17,6 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
@@ -94555,10 +94555,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/pasemi/dma_lib.c
printk(KERN_INFO "PA Semi PWRficient DMA library initialized "
"(%d tx, %d rx channels)\n", num_txch, num_rxch);
-Index: linux-2.6.25.1/arch/powerpc/platforms/pasemi/iommu.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/pasemi/iommu.c
++++ linux-2.6.25.4/arch/powerpc/platforms/pasemi/iommu.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005-2007, PA Semi, Inc
@@ -94626,10 +94626,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/pasemi/iommu.c
}
/* set 2GB translation window, based at 0 */
-Index: linux-2.6.25.1/arch/powerpc/platforms/powermac/setup.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/powermac/setup.c
++++ linux-2.6.25.4/arch/powerpc/platforms/powermac/setup.c
@@ -53,6 +53,7 @@
#include <linux/suspend.h>
#include <linux/of_device.h>
@@ -94646,10 +94646,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/powermac/setup.c
#include <asm/udbg.h>
#include "pmac.h"
-Index: linux-2.6.25.1/arch/powerpc/platforms/ps3/device-init.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/ps3/device-init.c
++++ linux-2.6.25.4/arch/powerpc/platforms/ps3/device-init.c
@@ -499,41 +499,14 @@ static int __init ps3_register_graphics_
}
@@ -94762,10 +94762,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/ps3/device-init.c
ps3_register_sound_devices();
-Index: linux-2.6.25.1/arch/powerpc/platforms/ps3/htab.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/ps3/htab.c
++++ linux-2.6.25.4/arch/powerpc/platforms/ps3/htab.c
@@ -19,9 +19,10 @@
*/
@@ -94778,10 +94778,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/ps3/htab.c
#include <asm/udbg.h>
#include <asm/lv1call.h>
#include <asm/ps3fb.h>
-Index: linux-2.6.25.1/arch/powerpc/platforms/ps3/interrupt.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/ps3/interrupt.c
++++ linux-2.6.25.4/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;
@@ -94791,10 +94791,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/ps3/interrupt.c
pr_debug("%s:%d: no plug found: thread_id %lu\n", __func__,
__LINE__, pd->thread_id);
dump_bmp(&per_cpu(ps3_private, 0));
-Index: linux-2.6.25.1/arch/powerpc/platforms/ps3/mm.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/ps3/mm.c
++++ linux-2.6.25.4/arch/powerpc/platforms/ps3/mm.c
@@ -21,9 +21,10 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -94807,10 +94807,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/ps3/mm.c
#include <asm/udbg.h>
#include <asm/lv1call.h>
-Index: linux-2.6.25.1/arch/powerpc/platforms/ps3/os-area.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/ps3/os-area.c
++++ linux-2.6.25.4/arch/powerpc/platforms/ps3/os-area.c
@@ -24,8 +24,9 @@
#include <linux/fs.h>
#include <linux/syscalls.h>
@@ -94822,10 +94822,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/ps3/os-area.c
#include "platform.h"
-Index: linux-2.6.25.1/arch/powerpc/platforms/ps3/setup.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/ps3/setup.c
++++ linux-2.6.25.4/arch/powerpc/platforms/ps3/setup.c
@@ -95,6 +95,14 @@ static void ps3_power_off(void)
ps3_sys_manager_power_off(); /* never returns */
}
@@ -94868,10 +94868,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/ps3/setup.c
#if defined(CONFIG_KEXEC)
.kexec_cpu_down = ps3_kexec_cpu_down,
.machine_kexec = default_machine_kexec,
-Index: linux-2.6.25.1/arch/powerpc/platforms/ps3/spu.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/ps3/spu.c
++++ linux-2.6.25.4/arch/powerpc/platforms/ps3/spu.c
@@ -27,6 +27,7 @@
#include <asm/spu.h>
#include <asm/spu_priv1.h>
@@ -94893,19 +94893,19 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/ps3/spu.c
static unsigned long get_vas_id(void)
{
unsigned long id;
-Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/Makefile
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/pseries/Makefile
++++ linux-2.6.25.4/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
-Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/eeh.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/pseries/eeh.c
++++ linux-2.6.25.4/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;
@@ -94925,10 +94925,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/eeh.c
/* Ignore bad nodes. */
if (!class_code || !vendor_id || !device_id)
-Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/lpar.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/pseries/lpar.c
++++ linux-2.6.25.4/arch/powerpc/platforms/pseries/lpar.c
@@ -40,6 +40,7 @@
#include <asm/smp.h>
@@ -95001,10 +95001,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/lpar.c
ppc_md.flush_hash_range = pSeries_lpar_flush_hash_range;
ppc_md.hpte_clear_all = pSeries_lpar_hptab_clear;
}
-Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/pci_dlpar.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/pseries/pci_dlpar.c
++++ linux-2.6.25.4/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);
@@ -95014,10 +95014,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/pci_dlpar.c
return -EIO;
}
sprintf(child_bus->name, "PCI Bus #%02x", child_bus->number);
-Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/phyp_dump.c
+Index: linux-2.6.25.4/arch/powerpc/platforms/pseries/phyp_dump.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/platforms/pseries/phyp_dump.c
++++ linux-2.6.25.4/arch/powerpc/platforms/pseries/phyp_dump.c
@@ -0,0 +1,507 @@
+/*
+ * Hypervisor-assisted dump
@@ -95526,10 +95526,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/phyp_dump.c
+ return 0;
+}
+early_param("phyp_dump_reserve_size", early_phyp_dump_reserve_size);
-Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/pseries.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/pseries/pseries.h
++++ linux-2.6.25.4/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;
@@ -95537,10 +95537,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/pseries.h
+extern void find_udbg_vterm(void);
+
#endif /* _PSERIES_PSERIES_H */
-Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/reconfig.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/pseries/reconfig.c
++++ linux-2.6.25.4/arch/powerpc/platforms/pseries/reconfig.c
@@ -222,14 +222,14 @@ static char * parse_next_property(char *
tmp = strchr(buf, ' ');
if (!tmp) {
@@ -95588,10 +95588,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/reconfig.c
return NULL;
}
tmp++;
-Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/scanlog.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/pseries/scanlog.c
++++ linux-2.6.25.4/arch/powerpc/platforms/pseries/scanlog.c
@@ -195,31 +195,30 @@ const struct file_operations scanlog_fop
static int __init scanlog_init(void)
{
@@ -95642,10 +95642,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/scanlog.c
}
static void __exit scanlog_cleanup(void)
-Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/setup.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/pseries/setup.c
++++ linux-2.6.25.4/arch/powerpc/platforms/pseries/setup.c
@@ -76,9 +76,6 @@
#define DBG(fmt...)
#endif
@@ -95805,10 +95805,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/setup.c
get_lppaca()->donate_dedicated_cpu = 0;
get_lppaca()->idle = 0;
}
-Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/xics.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/pseries/xics.c
++++ linux-2.6.25.4/arch/powerpc/platforms/pseries/xics.c
@@ -516,6 +516,8 @@ static struct irq_chip xics_pic_lpar = {
.set_affinity = xics_set_affinity
};
@@ -95942,10 +95942,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/xics.c
ppc64_boot_msg(0x21, "XICS Done");
}
-Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/xics.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/platforms/pseries/xics.h
++++ linux-2.6.25.4/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;
@@ -95954,10 +95954,10 @@ Index: linux-2.6.25.1/arch/powerpc/platforms/pseries/xics.h
-extern void pseries_8259_cascade(unsigned int irq, struct irq_desc *desc);
-
#endif /* _POWERPC_KERNEL_XICS_H */
-Index: linux-2.6.25.1/arch/powerpc/sysdev/Makefile
+Index: linux-2.6.25.4/arch/powerpc/sysdev/Makefile
===================================================================
---- linux-2.6.25.1.orig/arch/powerpc/sysdev/Makefile
-+++ linux-2.6.25.1/arch/powerpc/sysdev/Makefile
+--- linux-2.6.25.4.orig/arch/powerpc/sysdev/Makefile
++++ linux-2.6.25.4/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
@@ -95974,10 +95974,10 @@ Index: linux-2.6.25.1/arch/powerpc/sysdev/Makefile
obj-$(CONFIG_XILINX_VIRTEX) += xilinx_intc.o
obj-$(CONFIG_OF_RTC) += of_rtc.o
ifeq ($(CONFIG_PCI),y)
-Index: linux-2.6.25.1/arch/powerpc/sysdev/cpm1.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/sysdev/cpm1.c
++++ linux-2.6.25.4/arch/powerpc/sysdev/cpm1.c
@@ -44,9 +44,6 @@
#define CPM_MAP_SIZE (0x4000)
@@ -96121,10 +96121,10 @@ Index: linux-2.6.25.1/arch/powerpc/sysdev/cpm1.c
struct cpm_ioport16 {
__be16 dir, par, odr_sor, dat, intr;
__be16 res[3];
-Index: linux-2.6.25.1/arch/powerpc/sysdev/cpm2.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/sysdev/cpm2.c
++++ linux-2.6.25.4/arch/powerpc/sysdev/cpm2.c
@@ -46,10 +46,6 @@
#include <sysdev/fsl_soc.h>
@@ -96263,10 +96263,10 @@ Index: linux-2.6.25.1/arch/powerpc/sysdev/cpm2.c
struct cpm2_ioports {
u32 dir, par, sor, odr, dat;
u32 res[3];
-Index: linux-2.6.25.1/arch/powerpc/sysdev/cpm_common.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/sysdev/cpm_common.c
++++ linux-2.6.25.4/arch/powerpc/sysdev/cpm_common.c
@@ -58,7 +58,6 @@ void __init udbg_init_cpm(void)
}
#endif
@@ -96281,10 +96281,10 @@ Index: linux-2.6.25.1/arch/powerpc/sysdev/cpm_common.c
EXPORT_SYMBOL(cpm_muram_dma);
-
-#endif /* CONFIG_PPC_CPM_NEW_BINDING */
-Index: linux-2.6.25.1/arch/powerpc/sysdev/dart_iommu.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/sysdev/dart_iommu.c
++++ linux-2.6.25.4/arch/powerpc/sysdev/dart_iommu.c
@@ -37,6 +37,7 @@
#include <linux/dma-mapping.h>
#include <linux/vmalloc.h>
@@ -96301,10 +96301,10 @@ Index: linux-2.6.25.1/arch/powerpc/sysdev/dart_iommu.c
#include <asm/ppc-pci.h>
#include "dart.h"
-Index: linux-2.6.25.1/arch/powerpc/sysdev/fsl_lbc.c
+Index: linux-2.6.25.4/arch/powerpc/sysdev/fsl_lbc.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/sysdev/fsl_lbc.c
++++ linux-2.6.25.4/arch/powerpc/sysdev/fsl_lbc.c
@@ -0,0 +1,129 @@
+/*
+ * Freescale LBC and UPM routines.
@@ -96435,10 +96435,10 @@ Index: linux-2.6.25.1/arch/powerpc/sysdev/fsl_lbc.c
+ return 0;
+}
+EXPORT_SYMBOL(fsl_upm_find);
-Index: linux-2.6.25.1/arch/powerpc/sysdev/fsl_soc.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/sysdev/fsl_soc.c
++++ linux-2.6.25.4/arch/powerpc/sysdev/fsl_soc.c
@@ -75,6 +75,33 @@ phys_addr_t get_immrbase(void)
EXPORT_SYMBOL(get_immrbase);
@@ -97103,10 +97103,10 @@ Index: linux-2.6.25.1/arch/powerpc/sysdev/fsl_soc.c
}
ret = of_fsl_spi_probe(NULL, "fsl,spi", sysclk, board_infos,
-Index: linux-2.6.25.1/arch/powerpc/sysdev/fsl_soc.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/sysdev/fsl_soc.h
++++ linux-2.6.25.4/arch/powerpc/sysdev/fsl_soc.h
@@ -7,6 +7,7 @@
extern phys_addr_t get_immrbase(void);
extern u32 get_brgfreq(void);
@@ -97115,10 +97115,10 @@ Index: linux-2.6.25.1/arch/powerpc/sysdev/fsl_soc.h
struct spi_board_info;
-Index: linux-2.6.25.1/arch/powerpc/sysdev/mpic.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/sysdev/mpic.c
++++ linux-2.6.25.4/arch/powerpc/sysdev/mpic.c
@@ -175,13 +175,16 @@ static inline void _mpic_write(enum mpic
switch(type) {
#ifdef CONFIG_PPC_DCR
@@ -97236,10 +97236,10 @@ Index: linux-2.6.25.1/arch/powerpc/sysdev/mpic.c
spin_unlock_irqrestore(&mpic_lock, flags);
}
-Index: linux-2.6.25.1/arch/powerpc/sysdev/mv64x60_dev.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/sysdev/mv64x60_dev.c
++++ linux-2.6.25.4/arch/powerpc/sysdev/mv64x60_dev.c
@@ -127,7 +127,7 @@ static int __init mv64x60_mpsc_device_se
if (err)
return err;
@@ -97423,10 +97423,10 @@ Index: linux-2.6.25.1/arch/powerpc/sysdev/mv64x60_dev.c
if (!prop)
goto not_mpsc;
-Index: linux-2.6.25.1/arch/powerpc/sysdev/mv64x60_pci.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/sysdev/mv64x60_pci.c
++++ linux-2.6.25.4/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;
@@ -97452,10 +97452,10 @@ Index: linux-2.6.25.1/arch/powerpc/sysdev/mv64x60_pci.c
+ for_each_compatible_node(np, "pci", "marvell,mv64360-pci")
mv64x60_add_bridge(np);
}
-Index: linux-2.6.25.1/arch/powerpc/sysdev/mv64x60_pic.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/sysdev/mv64x60_pic.c
++++ linux-2.6.25.4/arch/powerpc/sysdev/mv64x60_pic.c
@@ -238,13 +238,13 @@ void __init mv64x60_init_irq(void)
const unsigned int *reg;
unsigned long flags;
@@ -97472,10 +97472,10 @@ Index: linux-2.6.25.1/arch/powerpc/sysdev/mv64x60_pic.c
reg = of_get_property(np, "reg", &size);
paddr = of_translate_address(np, reg);
mv64x60_irq_reg_base = ioremap(paddr, reg[1]);
-Index: linux-2.6.25.1/arch/powerpc/sysdev/mv64x60_udbg.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/sysdev/mv64x60_udbg.c
++++ linux-2.6.25.4/arch/powerpc/sysdev/mv64x60_udbg.c
@@ -85,7 +85,7 @@ static void mv64x60_udbg_init(void)
if (!stdout)
return;
@@ -97485,10 +97485,10 @@ Index: linux-2.6.25.1/arch/powerpc/sysdev/mv64x60_udbg.c
if (np == stdout)
break;
}
-Index: linux-2.6.25.1/arch/powerpc/sysdev/ppc4xx_pci.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/sysdev/ppc4xx_pci.c
++++ linux-2.6.25.4/arch/powerpc/sysdev/ppc4xx_pci.c
@@ -527,6 +527,7 @@ static void __init ppc4xx_probe_pcix_bri
*
* ibm,plb-pciex-440spe
@@ -97681,10 +97681,10 @@ Index: linux-2.6.25.1/arch/powerpc/sysdev/ppc4xx_pci.c
msleep(100);
return 0;
-Index: linux-2.6.25.1/arch/powerpc/sysdev/ppc4xx_pci.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/sysdev/ppc4xx_pci.h
++++ linux-2.6.25.4/arch/powerpc/sysdev/ppc4xx_pci.h
@@ -271,6 +271,59 @@
#define PESDR1_405EX_PHYSTA 0x044C
@@ -97758,10 +97758,10 @@ Index: linux-2.6.25.1/arch/powerpc/sysdev/ppc4xx_pci.h
enum
{
-Index: linux-2.6.25.1/arch/powerpc/sysdev/ppc4xx_soc.c
+Index: linux-2.6.25.4/arch/powerpc/sysdev/ppc4xx_soc.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/powerpc/sysdev/ppc4xx_soc.c
++++ linux-2.6.25.4/arch/powerpc/sysdev/ppc4xx_soc.c
@@ -0,0 +1,200 @@
+/*
+ * IBM/AMCC PPC4xx SoC setup code
@@ -97963,10 +97963,10 @@ Index: linux-2.6.25.1/arch/powerpc/sysdev/ppc4xx_soc.c
+ while (1)
+ ; /* Just in case the reset doesn't work */
+}
-Index: linux-2.6.25.1/arch/powerpc/sysdev/qe_lib/qe.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/sysdev/qe_lib/qe.c
++++ linux-2.6.25.4/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.
@@ -98015,10 +98015,10 @@ Index: linux-2.6.25.1/arch/powerpc/sysdev/qe_lib/qe.c
/* The maximum number of RISCs we support */
#define MAX_QE_RISC 2
-Index: linux-2.6.25.1/arch/powerpc/sysdev/qe_lib/qe_io.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/sysdev/qe_lib/qe_io.c
++++ linux-2.6.25.4/arch/powerpc/sysdev/qe_lib/qe_io.c
@@ -22,6 +22,7 @@
#include <linux/ioport.h>
@@ -98054,10 +98054,10 @@ Index: linux-2.6.25.1/arch/powerpc/sysdev/qe_lib/qe_io.c
for (i = 0; i < num_par_io_ports; i++) {
printk(KERN_INFO " cpodr[%u]=%08x\n", i,
in_be32(&par_io[i].cpodr));
-Index: linux-2.6.25.1/arch/powerpc/sysdev/qe_lib/ucc_fast.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/sysdev/qe_lib/ucc_fast.c
++++ linux-2.6.25.4/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. */
@@ -98180,10 +98180,10 @@ Index: linux-2.6.25.1/arch/powerpc/sysdev/qe_lib/ucc_fast.c
ucc_fast_free(uccf);
return -EINVAL;
}
-Index: linux-2.6.25.1/arch/powerpc/sysdev/qe_lib/ucc_slow.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/sysdev/qe_lib/ucc_slow.c
++++ linux-2.6.25.4/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. */
@@ -98265,20 +98265,20 @@ Index: linux-2.6.25.1/arch/powerpc/sysdev/qe_lib/ucc_slow.c
ucc_slow_free(uccs);
return -EINVAL;
}
-Index: linux-2.6.25.1/arch/powerpc/sysdev/rtc_cmos_setup.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/sysdev/rtc_cmos_setup.c
++++ linux-2.6.25.4/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");
-Index: linux-2.6.25.1/arch/powerpc/sysdev/tsi108_dev.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/sysdev/tsi108_dev.c
++++ linux-2.6.25.4/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]);
@@ -98297,10 +98297,10 @@ Index: linux-2.6.25.1/arch/powerpc/sysdev/tsi108_dev.c
tsi_eth_dev =
platform_device_register_simple("tsi-ethernet", i++, &r[0],
-Index: linux-2.6.25.1/arch/powerpc/sysdev/tsi108_pci.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/sysdev/tsi108_pci.c
++++ linux-2.6.25.4/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);
@@ -98319,10 +98319,10 @@ Index: linux-2.6.25.1/arch/powerpc/sysdev/tsi108_pci.c
if ((virq >= 1) && (virq <= 4)){
irq = virq + IRQ_PCI_INTAD_BASE - 1;
get_irq_desc(irq)->status |= IRQ_LEVEL;
-Index: linux-2.6.25.1/arch/powerpc/xmon/xmon.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/powerpc/xmon/xmon.c
++++ linux-2.6.25.4/arch/powerpc/xmon/xmon.c
@@ -45,7 +45,6 @@
#ifdef CONFIG_PPC64
#include <asm/hvcall.h>
@@ -98384,10 +98384,10 @@ Index: linux-2.6.25.1/arch/powerpc/xmon/xmon.c
}
#endif
-Index: linux-2.6.25.1/arch/ppc/8xx_io/commproc.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/ppc/8xx_io/commproc.c
++++ linux-2.6.25.4/arch/ppc/8xx_io/commproc.c
@@ -43,7 +43,7 @@
({ \
u32 offset = offsetof(immap_t, member); \
@@ -98397,10 +98397,10 @@ Index: linux-2.6.25.1/arch/ppc/8xx_io/commproc.c
addr; \
})
-Index: linux-2.6.25.1/arch/ppc/8xx_io/fec.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/ppc/8xx_io/fec.c
++++ linux-2.6.25.4/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);
@@ -98419,10 +98419,10 @@ Index: linux-2.6.25.1/arch/ppc/8xx_io/fec.c
#endif /* CONFIG_USE_MDIO */
#ifndef CONFIG_RPXCLASSIC
-Index: linux-2.6.25.1/arch/ppc/kernel/head.S
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/ppc/kernel/head.S
++++ linux-2.6.25.4/arch/ppc/kernel/head.S
@@ -701,23 +701,6 @@ load_up_altivec:
b fast_exception_return
@@ -98447,10 +98447,10 @@ Index: linux-2.6.25.1/arch/ppc/kernel/head.S
* giveup_altivec(tsk)
* Disable AltiVec for the task given as the argument,
* and save the AltiVec registers in its thread_struct.
-Index: linux-2.6.25.1/arch/ppc/mm/init.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/ppc/mm/init.c
++++ linux-2.6.25.4/arch/ppc/mm/init.c
@@ -109,7 +109,6 @@ void show_mem(void)
printk("Mem-info:\n");
@@ -98459,10 +98459,10 @@ Index: linux-2.6.25.1/arch/ppc/mm/init.c
i = max_mapnr;
while (i-- > 0) {
total++;
-Index: linux-2.6.25.1/arch/ppc/platforms/radstone_ppc7d.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/ppc/platforms/radstone_ppc7d.c
++++ linux-2.6.25.4/arch/ppc/platforms/radstone_ppc7d.c
@@ -512,7 +512,7 @@ static void __init ppc7d_init_irq(void)
{
int irq;
@@ -98499,10 +98499,10 @@ Index: linux-2.6.25.1/arch/ppc/platforms/radstone_ppc7d.c
}
/* Called from machine_init(), early, before any of the __init functions
-Index: linux-2.6.25.1/arch/ppc/syslib/mpc52xx_setup.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/ppc/syslib/mpc52xx_setup.c
++++ linux-2.6.25.4/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)
@@ -98512,10 +98512,10 @@ Index: linux-2.6.25.1/arch/ppc/syslib/mpc52xx_setup.c
struct mpc52xx_cdm __iomem *cdm;
unsigned long flags;
u16 mclken_div;
-Index: linux-2.6.25.1/arch/sparc64/Kconfig
+Index: linux-2.6.25.4/arch/sparc64/Kconfig
===================================================================
---- linux-2.6.25.1.orig/arch/sparc64/Kconfig
-+++ linux-2.6.25.1/arch/sparc64/Kconfig
+--- linux-2.6.25.4.orig/arch/sparc64/Kconfig
++++ linux-2.6.25.4/arch/sparc64/Kconfig
@@ -16,6 +16,7 @@ config SPARC64
bool
default y
@@ -98524,10 +98524,10 @@ Index: linux-2.6.25.1/arch/sparc64/Kconfig
help
SPARC is a family of RISC microprocessors designed and marketed by
Sun Microsystems, incorporated. This port covers the newer 64-bit
-Index: linux-2.6.25.1/drivers/block/viodasd.c
+Index: linux-2.6.25.4/drivers/block/viodasd.c
===================================================================
---- linux-2.6.25.1.orig/drivers/block/viodasd.c
-+++ linux-2.6.25.1/drivers/block/viodasd.c
+--- linux-2.6.25.4.orig/drivers/block/viodasd.c
++++ linux-2.6.25.4/drivers/block/viodasd.c
@@ -69,7 +69,7 @@ MODULE_LICENSE("GPL");
enum {
PARTITION_SHIFT = 3,
@@ -98537,10 +98537,10 @@ Index: linux-2.6.25.1/drivers/block/viodasd.c
};
static DEFINE_SPINLOCK(viodasd_spinlock);
-Index: linux-2.6.25.1/drivers/char/hvc_beat.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/drivers/char/hvc_beat.c
++++ linux-2.6.25.4/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;
@@ -98552,10 +98552,10 @@ Index: linux-2.6.25.1/drivers/char/hvc_beat.c
}
return cnt;
}
-Index: linux-2.6.25.1/drivers/char/xilinx_hwicap/buffer_icap.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/drivers/char/xilinx_hwicap/buffer_icap.c
++++ linux-2.6.25.4/drivers/char/xilinx_hwicap/buffer_icap.c
@@ -74,7 +74,7 @@
/**
@@ -98600,10 +98600,10 @@ Index: linux-2.6.25.1/drivers/char/xilinx_hwicap/buffer_icap.c
}
/**
-Index: linux-2.6.25.1/drivers/char/xilinx_hwicap/buffer_icap.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/drivers/char/xilinx_hwicap/buffer_icap.h
++++ linux-2.6.25.4/drivers/char/xilinx_hwicap/buffer_icap.h
@@ -44,8 +44,6 @@
#include <asm/io.h>
#include "xilinx_hwicap.h"
@@ -98621,10 +98621,10 @@ Index: linux-2.6.25.1/drivers/char/xilinx_hwicap/buffer_icap.h
+void buffer_icap_reset(struct hwicap_drvdata *drvdata);
+
#endif
-Index: linux-2.6.25.1/drivers/char/xilinx_hwicap/fifo_icap.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/drivers/char/xilinx_hwicap/fifo_icap.c
++++ linux-2.6.25.4/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 */
@@ -98676,10 +98676,10 @@ Index: linux-2.6.25.1/drivers/char/xilinx_hwicap/fifo_icap.c
return (status & XHI_SR_DONE_MASK) ? 0 : 1;
}
-Index: linux-2.6.25.1/drivers/char/xilinx_hwicap/fifo_icap.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/drivers/char/xilinx_hwicap/fifo_icap.h
++++ linux-2.6.25.4/drivers/char/xilinx_hwicap/fifo_icap.h
@@ -56,6 +56,7 @@ int fifo_icap_set_configuration(
u32 *FrameBuffer,
u32 NumWords);
@@ -98688,10 +98688,10 @@ Index: linux-2.6.25.1/drivers/char/xilinx_hwicap/fifo_icap.h
void fifo_icap_reset(struct hwicap_drvdata *drvdata);
void fifo_icap_flush_fifo(struct hwicap_drvdata *drvdata);
-Index: linux-2.6.25.1/drivers/char/xilinx_hwicap/xilinx_hwicap.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/drivers/char/xilinx_hwicap/xilinx_hwicap.c
++++ linux-2.6.25.4/drivers/char/xilinx_hwicap/xilinx_hwicap.c
@@ -36,7 +36,7 @@
*****************************************************************************/
@@ -98831,10 +98831,10 @@ Index: linux-2.6.25.1/drivers/char/xilinx_hwicap/xilinx_hwicap.c
class_destroy(icap_class);
-Index: linux-2.6.25.1/drivers/char/xilinx_hwicap/xilinx_hwicap.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/drivers/char/xilinx_hwicap/xilinx_hwicap.h
++++ linux-2.6.25.4/drivers/char/xilinx_hwicap/xilinx_hwicap.h
@@ -65,10 +65,27 @@ struct hwicap_drvdata {
};
@@ -98877,10 +98877,10 @@ Index: linux-2.6.25.1/drivers/char/xilinx_hwicap/xilinx_hwicap.h
/**
* hwicap_type_1_read - Generates a Type 1 read packet header.
* @reg: is the address of the register to be read back.
-Index: linux-2.6.25.1/drivers/mtd/nand/fsl_elbc_nand.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/drivers/mtd/nand/fsl_elbc_nand.c
++++ linux-2.6.25.4/drivers/mtd/nand/fsl_elbc_nand.c
@@ -36,207 +36,12 @@
#include <linux/mtd/partitions.h>
@@ -99189,10 +99189,10 @@ Index: linux-2.6.25.1/drivers/mtd/nand/fsl_elbc_nand.c
__be32 status = in_be32(&lbc->ltesr) & LTESR_NAND_MASK;
if (status) {
-Index: linux-2.6.25.1/drivers/net/Makefile
+Index: linux-2.6.25.4/drivers/net/Makefile
===================================================================
---- linux-2.6.25.1.orig/drivers/net/Makefile
-+++ linux-2.6.25.1/drivers/net/Makefile
+--- linux-2.6.25.4.orig/drivers/net/Makefile
++++ linux-2.6.25.4/drivers/net/Makefile
@@ -219,7 +219,8 @@ obj-$(CONFIG_SMC911X) += smc911x.o
obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
obj-$(CONFIG_DM9000) += dm9000.o
@@ -99203,10 +99203,10 @@ Index: linux-2.6.25.1/drivers/net/Makefile
obj-$(CONFIG_MLX4_CORE) += mlx4/
obj-$(CONFIG_ENC28J60) += enc28j60.o
-Index: linux-2.6.25.1/drivers/net/iseries_veth.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/drivers/net/iseries_veth.c
++++ linux-2.6.25.4/drivers/net/iseries_veth.c
@@ -308,7 +308,8 @@ static void veth_complete_allocation(voi
static int veth_allocate_events(HvLpIndex rlp, int number)
@@ -99217,10 +99217,10 @@ Index: linux-2.6.25.1/drivers/net/iseries_veth.c
mf_allocate_lp_events(rlp, HvLpEvent_Type_VirtualLan,
sizeof(struct veth_lpevent), number,
-Index: linux-2.6.25.1/drivers/net/pasemi_mac.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/drivers/net/pasemi_mac.c
++++ linux-2.6.25.4/drivers/net/pasemi_mac.c
@@ -55,15 +55,10 @@
* - Multiqueue RX/TX
*/
@@ -99738,10 +99738,10 @@ Index: linux-2.6.25.1/drivers/net/pasemi_mac.c
if (err)
goto out;
-Index: linux-2.6.25.1/drivers/net/pasemi_mac.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/drivers/net/pasemi_mac.h
++++ linux-2.6.25.4/drivers/net/pasemi_mac.h
@@ -26,7 +26,14 @@
#include <linux/spinlock.h>
#include <linux/phy.h>
@@ -99835,10 +99835,10 @@ Index: linux-2.6.25.1/drivers/net/pasemi_mac.h
+
#endif /* PASEMI_MAC_H */
-Index: linux-2.6.25.1/drivers/net/pasemi_mac_ethtool.c
+Index: linux-2.6.25.4/drivers/net/pasemi_mac_ethtool.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/drivers/net/pasemi_mac_ethtool.c
++++ linux-2.6.25.4/drivers/net/pasemi_mac_ethtool.c
@@ -0,0 +1,159 @@
+/*
+ * Copyright (C) 2006-2008 PA Semi, Inc
@@ -99999,10 +99999,10 @@ Index: linux-2.6.25.1/drivers/net/pasemi_mac_ethtool.c
+ .get_ethtool_stats = pasemi_mac_get_ethtool_stats,
+};
+
-Index: linux-2.6.25.1/drivers/net/ps3_gelic_net.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/drivers/net/ps3_gelic_net.c
++++ linux-2.6.25.4/drivers/net/ps3_gelic_net.c
@@ -1266,6 +1266,85 @@ int gelic_net_set_rx_csum(struct net_dev
return 0;
}
@@ -100098,10 +100098,10 @@ Index: linux-2.6.25.1/drivers/net/ps3_gelic_net.c
};
/**
-Index: linux-2.6.25.1/drivers/net/ps3_gelic_net.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/drivers/net/ps3_gelic_net.h
++++ linux-2.6.25.4/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,
@@ -100135,10 +100135,10 @@ Index: linux-2.6.25.1/drivers/net/ps3_gelic_net.h
/* status returened from GET_ETH_PORT_STATUS */
enum gelic_lv1_ether_port_status {
GELIC_LV1_ETHER_LINK_UP = 0x0000000000000001L,
-Index: linux-2.6.25.1/drivers/net/ucc_geth.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/drivers/net/ucc_geth.c
++++ linux-2.6.25.4/drivers/net/ucc_geth.c
@@ -3853,7 +3853,13 @@ static int ucc_geth_probe(struct of_devi
ugeth_vdbg("%s: IN", __FUNCTION__);
@@ -100154,10 +100154,10 @@ Index: linux-2.6.25.1/drivers/net/ucc_geth.c
ucc_num = *prop - 1;
if ((ucc_num < 0) || (ucc_num > 7))
return -ENODEV;
-Index: linux-2.6.25.1/drivers/net/ucc_geth_mii.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/drivers/net/ucc_geth_mii.c
++++ linux-2.6.25.4/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)) {
@@ -100176,10 +100176,10 @@ Index: linux-2.6.25.1/drivers/net/ucc_geth_mii.c
ucc_set_qe_mux_mii_mng(*id - 1);
-Index: linux-2.6.25.1/drivers/of/Kconfig
+Index: linux-2.6.25.4/drivers/of/Kconfig
===================================================================
---- linux-2.6.25.1.orig/drivers/of/Kconfig
-+++ linux-2.6.25.1/drivers/of/Kconfig
+--- linux-2.6.25.4.orig/drivers/of/Kconfig
++++ linux-2.6.25.4/drivers/of/Kconfig
@@ -1,3 +1,15 @@
config OF_DEVICE
def_bool y
@@ -100196,19 +100196,19 @@ Index: linux-2.6.25.1/drivers/of/Kconfig
+ depends on OF && I2C
+ help
+ OpenFirmware I2C accessors
-Index: linux-2.6.25.1/drivers/of/Makefile
+Index: linux-2.6.25.4/drivers/of/Makefile
===================================================================
---- linux-2.6.25.1.orig/drivers/of/Makefile
-+++ linux-2.6.25.1/drivers/of/Makefile
+--- linux-2.6.25.4.orig/drivers/of/Makefile
++++ linux-2.6.25.4/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
-Index: linux-2.6.25.1/drivers/of/base.c
+Index: linux-2.6.25.4/drivers/of/base.c
===================================================================
---- linux-2.6.25.1.orig/drivers/of/base.c
-+++ linux-2.6.25.1/drivers/of/base.c
+--- linux-2.6.25.4.orig/drivers/of/base.c
++++ linux-2.6.25.4/drivers/of/base.c
@@ -117,6 +117,32 @@ int of_device_is_compatible(const struct
EXPORT_SYMBOL(of_device_is_compatible);
@@ -100242,10 +100242,10 @@ Index: linux-2.6.25.1/drivers/of/base.c
* of_get_parent - Get a node's parent if any
* @node: Node to get parent
*
-Index: linux-2.6.25.1/drivers/of/gpio.c
+Index: linux-2.6.25.4/drivers/of/gpio.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/drivers/of/gpio.c
++++ linux-2.6.25.4/drivers/of/gpio.c
@@ -0,0 +1,242 @@
+/*
+ * OF helpers for the GPIO API
@@ -100489,10 +100489,10 @@ Index: linux-2.6.25.1/drivers/of/gpio.c
+ return ret;
+}
+EXPORT_SYMBOL(of_mm_gpiochip_add);
-Index: linux-2.6.25.1/drivers/of/i2c.c
+Index: linux-2.6.25.4/drivers/of/i2c.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/drivers/of/i2c.c
++++ linux-2.6.25.4/drivers/of/i2c.c
@@ -0,0 +1,115 @@
+/*
+ * OF helpers for the I2C API
@@ -100609,10 +100609,10 @@ Index: linux-2.6.25.1/drivers/of/i2c.c
+ }
+}
+EXPORT_SYMBOL(of_register_i2c_devices);
-Index: linux-2.6.25.1/drivers/ps3/ps3-sys-manager.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/drivers/ps3/ps3-sys-manager.c
++++ linux-2.6.25.4/drivers/ps3/ps3-sys-manager.c
@@ -24,6 +24,7 @@
#include <linux/reboot.h>
@@ -100737,10 +100737,10 @@ Index: linux-2.6.25.1/drivers/ps3/ps3-sys-manager.c
/**
* ps3_sys_manager_work - Asynchronous read handler.
-Index: linux-2.6.25.1/drivers/ps3/sys-manager-core.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/drivers/ps3/sys-manager-core.c
++++ linux-2.6.25.4/drivers/ps3/sys-manager-core.c
@@ -19,6 +19,7 @@
*/
@@ -100778,10 +100778,10 @@ Index: linux-2.6.25.1/drivers/ps3/sys-manager-core.c
+ lv1_pause(1);
}
+
-Index: linux-2.6.25.1/drivers/serial/cpm_uart/cpm_uart.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/drivers/serial/cpm_uart/cpm_uart.h
++++ linux-2.6.25.4/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 */
@@ -100792,10 +100792,10 @@ Index: linux-2.6.25.1/drivers/serial/cpm_uart/cpm_uart.h
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);
-Index: linux-2.6.25.1/drivers/serial/cpm_uart/cpm_uart_core.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/drivers/serial/cpm_uart/cpm_uart_core.c
++++ linux-2.6.25.4/drivers/serial/cpm_uart/cpm_uart_core.c
@@ -966,24 +966,23 @@ static int cpm_uart_init_port(struct dev
if (!mem)
return -ENOMEM;
@@ -100838,10 +100838,10 @@ Index: linux-2.6.25.1/drivers/serial/cpm_uart/cpm_uart_core.c
out_mem:
iounmap(mem);
return ret;
-Index: linux-2.6.25.1/drivers/serial/cpm_uart/cpm_uart_cpm1.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/drivers/serial/cpm_uart/cpm_uart_cpm1.c
++++ linux-2.6.25.4/drivers/serial/cpm_uart/cpm_uart_cpm1.c
@@ -45,6 +45,8 @@
#include <linux/serial_core.h>
#include <linux/kernel.h>
@@ -100870,10 +100870,10 @@ Index: linux-2.6.25.1/drivers/serial/cpm_uart/cpm_uart_cpm1.c
#else
void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd)
{
-Index: linux-2.6.25.1/drivers/serial/cpm_uart/cpm_uart_cpm2.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/drivers/serial/cpm_uart/cpm_uart_cpm2.c
++++ linux-2.6.25.4/drivers/serial/cpm_uart/cpm_uart_cpm2.c
@@ -41,6 +41,9 @@
#include <asm/io.h>
#include <asm/irq.h>
@@ -100940,10 +100940,10 @@ Index: linux-2.6.25.1/drivers/serial/cpm_uart/cpm_uart_cpm2.c
#else
void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd)
{
-Index: linux-2.6.25.1/drivers/serial/of_serial.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/drivers/serial/of_serial.c
++++ linux-2.6.25.4/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;
@@ -100955,10 +100955,10 @@ Index: linux-2.6.25.1/drivers/serial/of_serial.c
return 0;
}
-Index: linux-2.6.25.1/drivers/serial/ucc_uart.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/drivers/serial/ucc_uart.c
++++ linux-2.6.25.4/drivers/serial/ucc_uart.c
@@ -1270,10 +1270,18 @@ static int ucc_uart_probe(struct of_devi
/* Get the UCC number (device ID) */
@@ -100982,10 +100982,10 @@ Index: linux-2.6.25.1/drivers/serial/ucc_uart.c
kfree(qe_port);
return -ENODEV;
}
-Index: linux-2.6.25.1/include/asm-powerpc/Kbuild
+Index: linux-2.6.25.4/include/asm-powerpc/Kbuild
===================================================================
---- linux-2.6.25.1.orig/include/asm-powerpc/Kbuild
-+++ linux-2.6.25.1/include/asm-powerpc/Kbuild
+--- linux-2.6.25.4.orig/include/asm-powerpc/Kbuild
++++ linux-2.6.25.4/include/asm-powerpc/Kbuild
@@ -1,5 +1,6 @@
include include/asm-generic/Kbuild.asm
@@ -101001,10 +101001,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/Kbuild
unifdef-y += asm-compat.h
unifdef-y += bootx.h
unifdef-y += byteorder.h
-Index: linux-2.6.25.1/include/asm-powerpc/abs_addr.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/abs_addr.h
++++ linux-2.6.25.4/include/asm-powerpc/abs_addr.h
@@ -12,10 +12,11 @@
* 2 of the License, or (at your option) any later version.
*/
@@ -101018,10 +101018,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/abs_addr.h
#include <asm/firmware.h>
struct mschunks_map {
-Index: linux-2.6.25.1/include/asm-powerpc/bitops.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/bitops.h
++++ linux-2.6.25.4/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;
@@ -101064,10 +101064,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/bitops.h
/* Little-endian versions */
-Index: linux-2.6.25.1/include/asm-powerpc/cpm.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/cpm.h
++++ linux-2.6.25.4/include/asm-powerpc/cpm.h
@@ -4,6 +4,20 @@
#include <linux/compiler.h>
#include <linux/types.h>
@@ -101089,10 +101089,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/cpm.h
/* Buffer descriptors used by many of the CPM protocols. */
typedef struct cpm_buf_desc {
ushort cbd_sc; /* Status and Control */
-Index: linux-2.6.25.1/include/asm-powerpc/cpm1.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/cpm1.h
++++ linux-2.6.25.4/include/asm-powerpc/cpm1.h
@@ -28,19 +28,6 @@
#define CPM_CR_CHAN ((ushort)0x00f0)
#define CPM_CR_FLG ((ushort)0x0001)
@@ -101113,10 +101113,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/cpm1.h
/* Channel numbers.
*/
#define CPM_CR_CH_SCC1 ((ushort)0x0000)
-Index: linux-2.6.25.1/include/asm-powerpc/cpm2.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/cpm2.h
++++ linux-2.6.25.4/include/asm-powerpc/cpm2.h
@@ -71,18 +71,9 @@
#define CPM_CR_FCC_PAGE(x) (x + 0x04)
@@ -101137,10 +101137,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/cpm2.h
#define mk_cr_cmd(PG, SBC, MCN, OP) \
((PG << 26) | (SBC << 21) | (MCN << 6) | OP)
-Index: linux-2.6.25.1/include/asm-powerpc/cputhreads.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/cputhreads.h
++++ linux-2.6.25.4/include/asm-powerpc/cputhreads.h
@@ -35,7 +35,7 @@ static inline cpumask_t cpu_thread_mask_
res = CPU_MASK_NONE;
@@ -101150,10 +101150,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/cputhreads.h
if (cpus_intersects(threads, tmp))
cpu_set(i, res);
}
-Index: linux-2.6.25.1/include/asm-powerpc/dcr-native.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/dcr-native.h
++++ linux-2.6.25.4/include/asm-powerpc/dcr-native.h
@@ -82,6 +82,19 @@ static inline void __mtdcri(int base_add
spin_unlock_irqrestore(&dcr_ind_lock, flags);
}
@@ -101185,10 +101185,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/dcr-native.h
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_DCR_NATIVE_H */
-Index: linux-2.6.25.1/include/asm-powerpc/dcr-regs.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/dcr-regs.h
++++ linux-2.6.25.4/include/asm-powerpc/dcr-regs.h
@@ -68,4 +68,82 @@
#define SDR0_UART3 0x0123
#define SDR0_CUST0 0x4000
@@ -101272,10 +101272,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/dcr-regs.h
+#define L2C_SNP_ESR 0x00000800
+
#endif /* __DCR_REGS_H__ */
-Index: linux-2.6.25.1/include/asm-powerpc/exception.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/exception.h
++++ linux-2.6.25.4/include/asm-powerpc/exception.h
@@ -228,18 +228,18 @@ label##_pSeries: \
BEGIN_FW_FTR_SECTION; \
stb r11,PACAHARDIRQEN(r13); \
@@ -101298,10 +101298,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/exception.h
#endif /* CONFIG_PPC_ISERIES */
#define ENABLE_INTS \
-Index: linux-2.6.25.1/include/asm-powerpc/fsl_lbc.h
+Index: linux-2.6.25.4/include/asm-powerpc/fsl_lbc.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/asm-powerpc/fsl_lbc.h
++++ linux-2.6.25.4/include/asm-powerpc/fsl_lbc.h
@@ -0,0 +1,311 @@
+/* Freescale Local Bus Controller
+ *
@@ -101614,10 +101614,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/fsl_lbc.h
+}
+
+#endif /* __ASM_FSL_LBC_H */
-Index: linux-2.6.25.1/include/asm-powerpc/gpio.h
+Index: linux-2.6.25.4/include/asm-powerpc/gpio.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/asm-powerpc/gpio.h
++++ linux-2.6.25.4/include/asm-powerpc/gpio.h
@@ -0,0 +1,56 @@
+/*
+ * Generic GPIO API implementation for PowerPC.
@@ -101675,10 +101675,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/gpio.h
+#endif /* CONFIG_HAVE_GPIO_LIB */
+
+#endif /* __ASM_POWERPC_GPIO_H */
-Index: linux-2.6.25.1/include/asm-powerpc/hw_irq.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/hw_irq.h
++++ linux-2.6.25.4/include/asm-powerpc/hw_irq.h
@@ -27,7 +27,7 @@ static inline unsigned long local_get_fl
return flags;
}
@@ -101709,10 +101709,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/hw_irq.h
#define __hard_irq_enable() __mtmsrd(mfmsr() | MSR_EE, 1)
#define __hard_irq_disable() __mtmsrd(mfmsr() & ~MSR_EE, 1)
-Index: linux-2.6.25.1/include/asm-powerpc/immap_qe.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/immap_qe.h
++++ linux-2.6.25.4/include/asm-powerpc/immap_qe.h
@@ -20,6 +20,7 @@
#ifdef __KERNEL__
@@ -101730,10 +101730,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/immap_qe.h
extern phys_addr_t get_qe_base(void);
static inline unsigned long immrbar_virt_to_phys(void *address)
-Index: linux-2.6.25.1/include/asm-powerpc/irqflags.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/irqflags.h
++++ linux-2.6.25.4/include/asm-powerpc/irqflags.h
@@ -2,30 +2,43 @@
* include/asm-powerpc/irqflags.h
*
@@ -101790,10 +101790,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/irqflags.h
#endif
#endif
-Index: linux-2.6.25.1/include/asm-powerpc/iseries/alpaca.h
+Index: linux-2.6.25.4/include/asm-powerpc/iseries/alpaca.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/asm-powerpc/iseries/alpaca.h
++++ linux-2.6.25.4/include/asm-powerpc/iseries/alpaca.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright © 2008 Stephen Rothwell IBM Corporation
@@ -101826,9 +101826,9 @@ Index: linux-2.6.25.1/include/asm-powerpc/iseries/alpaca.h
+};
+
+#endif /* _ASM_POWERPC_ISERIES_ALPACA_H */
-Index: linux-2.6.25.1/include/asm-powerpc/iseries/it_lp_reg_save.h
+Index: linux-2.6.25.4/include/asm-powerpc/iseries/it_lp_reg_save.h
===================================================================
---- linux-2.6.25.1.orig/include/asm-powerpc/iseries/it_lp_reg_save.h
+--- linux-2.6.25.4.orig/include/asm-powerpc/iseries/it_lp_reg_save.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
@@ -101916,10 +101916,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/iseries/it_lp_reg_save.h
-extern struct ItLpRegSave iseries_reg_save[];
-
-#endif /* _ASM_POWERPC_ISERIES_IT_LP_REG_SAVE_H */
-Index: linux-2.6.25.1/include/asm-powerpc/lmb.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/lmb.h
++++ linux-2.6.25.4/include/asm-powerpc/lmb.h
@@ -1,81 +1,15 @@
#ifndef _ASM_POWERPC_LMB_H
#define _ASM_POWERPC_LMB_H
@@ -102010,10 +102010,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/lmb.h
-
-#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_LMB_H */
-Index: linux-2.6.25.1/include/asm-powerpc/machdep.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/machdep.h
++++ linux-2.6.25.4/include/asm-powerpc/machdep.h
@@ -68,6 +68,8 @@ struct machdep_calls {
unsigned long vflags,
int psize, int ssize);
@@ -102033,10 +102033,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/machdep.h
void (*kgdb_map_scc)(void);
/*
-Index: linux-2.6.25.1/include/asm-powerpc/macio.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/macio.h
++++ linux-2.6.25.4/include/asm-powerpc/macio.h
@@ -2,7 +2,7 @@
#define __MACIO_ASIC_H__
#ifdef __KERNEL__
@@ -102046,10 +102046,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/macio.h
extern struct bus_type macio_bus_type;
-Index: linux-2.6.25.1/include/asm-powerpc/mmu-40x.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/mmu-40x.h
++++ linux-2.6.25.4/include/asm-powerpc/mmu-40x.h
@@ -53,8 +53,6 @@
#ifndef __ASSEMBLY__
@@ -102059,10 +102059,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/mmu-40x.h
typedef struct {
unsigned long id;
unsigned long vdso_base;
-Index: linux-2.6.25.1/include/asm-powerpc/mmu-44x.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/mmu-44x.h
++++ linux-2.6.25.4/include/asm-powerpc/mmu-44x.h
@@ -53,8 +53,6 @@
#ifndef __ASSEMBLY__
@@ -102072,10 +102072,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/mmu-44x.h
typedef struct {
unsigned long id;
unsigned long vdso_base;
-Index: linux-2.6.25.1/include/asm-powerpc/mmu-8xx.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/mmu-8xx.h
++++ linux-2.6.25.4/include/asm-powerpc/mmu-8xx.h
@@ -136,8 +136,6 @@
#define SPRN_M_TW 799
@@ -102085,10 +102085,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/mmu-8xx.h
typedef struct {
unsigned long id;
unsigned long vdso_base;
-Index: linux-2.6.25.1/include/asm-powerpc/mmu-fsl-booke.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/mmu-fsl-booke.h
++++ linux-2.6.25.4/include/asm-powerpc/mmu-fsl-booke.h
@@ -73,12 +73,6 @@
#ifndef __ASSEMBLY__
@@ -102102,10 +102102,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/mmu-fsl-booke.h
typedef struct {
unsigned long id;
unsigned long vdso_base;
-Index: linux-2.6.25.1/include/asm-powerpc/mmu-hash32.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/mmu-hash32.h
++++ linux-2.6.25.4/include/asm-powerpc/mmu-hash32.h
@@ -84,8 +84,6 @@ typedef struct {
unsigned long vdso_base;
} mm_context_t;
@@ -102115,10 +102115,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/mmu-hash32.h
#endif /* !__ASSEMBLY__ */
#endif /* _ASM_POWERPC_MMU_HASH32_H_ */
-Index: linux-2.6.25.1/include/asm-powerpc/mmu-hash64.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/mmu-hash64.h
++++ linux-2.6.25.4/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))
@@ -102129,10 +102129,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/mmu-hash64.h
#endif /* __ASSEMBLY__ */
#endif /* _ASM_POWERPC_MMU_HASH64_H_ */
-Index: linux-2.6.25.1/include/asm-powerpc/paca.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/paca.h
++++ linux-2.6.25.4/include/asm-powerpc/paca.h
@@ -42,10 +42,7 @@ struct task_struct;
* Defines the layout of the paca.
*
@@ -102160,10 +102160,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/paca.h
/*
* MAGIC: the spinlock functions in arch/powerpc/lib/locks.c
-Index: linux-2.6.25.1/include/asm-powerpc/page.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/page.h
++++ linux-2.6.25.4/include/asm-powerpc/page.h
@@ -53,6 +53,7 @@
#define PAGE_OFFSET ASM_CONST(CONFIG_KERNEL_START)
@@ -102172,10 +102172,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/page.h
#ifdef CONFIG_FLATMEM
#define pfn_valid(pfn) ((pfn) < max_mapnr)
-Index: linux-2.6.25.1/include/asm-powerpc/page_32.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/page_32.h
++++ linux-2.6.25.4/include/asm-powerpc/page_32.h
@@ -3,8 +3,6 @@
#define VM_DATA_DEFAULT_FLAGS VM_DATA_DEFAULT_FLAGS32
@@ -102185,10 +102185,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/page_32.h
#ifdef CONFIG_NOT_COHERENT_CACHE
#define ARCH_KMALLOC_MINALIGN L1_CACHE_BYTES
#endif
-Index: linux-2.6.25.1/include/asm-powerpc/pasemi_dma.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/pasemi_dma.h
++++ linux-2.6.25.4/include/asm-powerpc/pasemi_dma.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006 PA Semi, Inc
@@ -102307,10 +102307,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/pasemi_dma.h
/* Initialize the library, must be called before any other functions */
extern int pasemi_dma_init(void);
-Index: linux-2.6.25.1/include/asm-powerpc/pci-bridge.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/pci-bridge.h
++++ linux-2.6.25.4/include/asm-powerpc/pci-bridge.h
@@ -117,7 +117,7 @@ struct pci_controller {
#ifndef CONFIG_PPC64
@@ -102329,10 +102329,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/pci-bridge.h
{
struct device_node *busdn = bus->sysdata;
-Index: linux-2.6.25.1/include/asm-powerpc/pgtable-ppc32.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/pgtable-ppc32.h
++++ linux-2.6.25.4/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
@@ -102362,10 +102362,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/pgtable-ppc32.h
#endif
/* to find an entry in a kernel page-table-directory */
-Index: linux-2.6.25.1/include/asm-powerpc/phyp_dump.h
+Index: linux-2.6.25.4/include/asm-powerpc/phyp_dump.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/asm-powerpc/phyp_dump.h
++++ linux-2.6.25.4/include/asm-powerpc/phyp_dump.h
@@ -0,0 +1,47 @@
+/*
+ * Hypervisor-assisted dump
@@ -102414,10 +102414,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/phyp_dump.h
+
+#endif /* CONFIG_PHYP_DUMP */
+#endif /* _PPC64_PHYP_DUMP_H */
-Index: linux-2.6.25.1/include/asm-powerpc/pmi.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/pmi.h
++++ linux-2.6.25.4/include/asm-powerpc/pmi.h
@@ -29,8 +29,6 @@
#ifdef __KERNEL__
@@ -102427,10 +102427,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/pmi.h
#define PMI_TYPE_FREQ_CHANGE 0x01
#define PMI_READ_TYPE 0
#define PMI_READ_DATA0 1
-Index: linux-2.6.25.1/include/asm-powerpc/ppc4xx.h
+Index: linux-2.6.25.4/include/asm-powerpc/ppc4xx.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/asm-powerpc/ppc4xx.h
++++ linux-2.6.25.4/include/asm-powerpc/ppc4xx.h
@@ -0,0 +1,18 @@
+/*
+ * PPC4xx Prototypes and definitions
@@ -102450,10 +102450,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/ppc4xx.h
+extern void ppc4xx_reset_system(char *cmd);
+
+#endif /* __ASM_POWERPC_PPC4xx_H__ */
-Index: linux-2.6.25.1/include/asm-powerpc/ps3.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/ps3.h
++++ linux-2.6.25.4/include/asm-powerpc/ps3.h
@@ -434,8 +434,11 @@ struct ps3_sys_manager_ops {
};
@@ -102468,10 +102468,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/ps3.h
struct ps3_prealloc {
const char *name;
-Index: linux-2.6.25.1/include/asm-powerpc/ptrace.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/ptrace.h
++++ linux-2.6.25.4/include/asm-powerpc/ptrace.h
@@ -58,6 +58,11 @@ struct pt_regs {
#define __ARCH_WANT_COMPAT_SYS_PTRACE
@@ -102495,10 +102495,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/ptrace.h
/* Size of stack frame allocated when calling signal handler. */
#define __SIGNAL_FRAMESIZE 64
-Index: linux-2.6.25.1/include/asm-powerpc/qe.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/qe.h
++++ linux-2.6.25.4/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);
@@ -102525,10 +102525,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/qe.h
/* Structure that defines QE firmware binary files.
*
-Index: linux-2.6.25.1/include/asm-powerpc/rwsem.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/rwsem.h
++++ linux-2.6.25.4/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;
@@ -102595,10 +102595,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/rwsem.h
static inline int __down_write_trylock(struct rw_semaphore *sem)
{
int tmp;
-Index: linux-2.6.25.1/include/asm-powerpc/sparsemem.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/sparsemem.h
++++ linux-2.6.25.4/include/asm-powerpc/sparsemem.h
@@ -15,6 +15,7 @@
#ifdef CONFIG_MEMORY_HOTPLUG
@@ -102607,10 +102607,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/sparsemem.h
#ifdef CONFIG_NUMA
extern int hot_add_scn_to_nid(unsigned long scn_addr);
#else
-Index: linux-2.6.25.1/include/asm-powerpc/spinlock.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/spinlock.h
++++ linux-2.6.25.4/include/asm-powerpc/spinlock.h
@@ -19,6 +19,7 @@
*
* (the type definitions are in asm/spinlock_types.h)
@@ -102619,10 +102619,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/spinlock.h
#ifdef CONFIG_PPC64
#include <asm/paca.h>
#include <asm/hvcall.h>
-Index: linux-2.6.25.1/include/asm-powerpc/string.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/string.h
++++ linux-2.6.25.4/include/asm-powerpc/string.h
@@ -7,6 +7,7 @@
#define __HAVE_ARCH_STRNCPY
#define __HAVE_ARCH_STRLEN
@@ -102639,10 +102639,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/string.h
extern char * strcat(char *, const char *);
extern void * memset(void *,int,__kernel_size_t);
extern void * memcpy(void *,const void *,__kernel_size_t);
-Index: linux-2.6.25.1/include/asm-powerpc/types.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-powerpc/types.h
++++ linux-2.6.25.4/include/asm-powerpc/types.h
@@ -84,6 +84,13 @@ typedef unsigned long long u64;
typedef __vector128 vector128;
@@ -102657,10 +102657,10 @@ Index: linux-2.6.25.1/include/asm-powerpc/types.h
#ifdef __powerpc64__
typedef u64 dma_addr_t;
#else
-Index: linux-2.6.25.1/include/asm-sparc64/lmb.h
+Index: linux-2.6.25.4/include/asm-sparc64/lmb.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/asm-sparc64/lmb.h
++++ linux-2.6.25.4/include/asm-sparc64/lmb.h
@@ -0,0 +1,10 @@
+#ifndef _SPARC64_LMB_H
+#define _SPARC64_LMB_H
@@ -102672,10 +102672,10 @@ Index: linux-2.6.25.1/include/asm-sparc64/lmb.h
+#define LMB_REAL_LIMIT 0
+
+#endif /* !(_SPARC64_LMB_H) */
-Index: linux-2.6.25.1/include/linux/lmb.h
+Index: linux-2.6.25.4/include/linux/lmb.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/lmb.h
++++ linux-2.6.25.4/include/linux/lmb.h
@@ -0,0 +1,85 @@
+#ifndef _LINUX_LMB_H
+#define _LINUX_LMB_H
@@ -102762,10 +102762,10 @@ Index: linux-2.6.25.1/include/linux/lmb.h
+#endif /* __KERNEL__ */
+
+#endif /* _LINUX_LMB_H */
-Index: linux-2.6.25.1/include/linux/of.h
+Index: linux-2.6.25.4/include/linux/of.h
===================================================================
---- linux-2.6.25.1.orig/include/linux/of.h
-+++ linux-2.6.25.1/include/linux/of.h
+--- linux-2.6.25.4.orig/include/linux/of.h
++++ linux-2.6.25.4/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,
@@ -102774,10 +102774,10 @@ Index: linux-2.6.25.1/include/linux/of.h
extern const void *of_get_property(const struct device_node *node,
const char *name,
int *lenp);
-Index: linux-2.6.25.1/include/linux/of_gpio.h
+Index: linux-2.6.25.4/include/linux/of_gpio.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/of_gpio.h
++++ linux-2.6.25.4/include/linux/of_gpio.h
@@ -0,0 +1,69 @@
+/*
+ * OF helpers for the GPIO API
@@ -102848,10 +102848,10 @@ Index: linux-2.6.25.1/include/linux/of_gpio.h
+#endif /* CONFIG_OF_GPIO */
+
+#endif /* __LINUX_OF_GPIO_H */
-Index: linux-2.6.25.1/include/linux/of_i2c.h
+Index: linux-2.6.25.4/include/linux/of_i2c.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/of_i2c.h
++++ linux-2.6.25.4/include/linux/of_i2c.h
@@ -0,0 +1,24 @@
+/*
+ * Generic I2C API implementation for PowerPC.
@@ -102877,10 +102877,10 @@ Index: linux-2.6.25.1/include/linux/of_i2c.h
+#endif /* CONFIG_OF_I2C */
+
+#endif /* __LINUX_OF_I2C_H */
-Index: linux-2.6.25.1/lib/Kconfig
+Index: linux-2.6.25.4/lib/Kconfig
===================================================================
---- linux-2.6.25.1.orig/lib/Kconfig
-+++ linux-2.6.25.1/lib/Kconfig
+--- linux-2.6.25.4.orig/lib/Kconfig
++++ linux-2.6.25.4/lib/Kconfig
@@ -141,4 +141,7 @@ config HAS_DMA
config CHECK_SIGNATURE
bool
@@ -102889,10 +102889,10 @@ Index: linux-2.6.25.1/lib/Kconfig
+ boolean
+
endmenu
-Index: linux-2.6.25.1/lib/Makefile
+Index: linux-2.6.25.4/lib/Makefile
===================================================================
---- linux-2.6.25.1.orig/lib/Makefile
-+++ linux-2.6.25.1/lib/Makefile
+--- linux-2.6.25.4.orig/lib/Makefile
++++ linux-2.6.25.4/lib/Makefile
@@ -70,6 +70,8 @@ obj-$(CONFIG_FAULT_INJECTION) += fault-i
lib-$(CONFIG_GENERIC_BUG) += bug.o
@@ -102902,10 +102902,10 @@ Index: linux-2.6.25.1/lib/Makefile
hostprogs-y := gen_crc32table
clean-files := crc32table.h
-Index: linux-2.6.25.1/lib/lmb.c
+Index: linux-2.6.25.4/lib/lmb.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/lib/lmb.c
++++ linux-2.6.25.4/lib/lmb.c
@@ -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 b81c2a65f7..4cffc5bec2 100644
--- 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,7 +1,7 @@
-Index: linux-2.6.25.1/drivers/usb/serial/usb-serial.c
+Index: linux-2.6.25.4/drivers/usb/serial/usb-serial.c
===================================================================
---- linux-2.6.25.1.orig/drivers/usb/serial/usb-serial.c
-+++ linux-2.6.25.1/drivers/usb/serial/usb-serial.c
+--- linux-2.6.25.4.orig/drivers/usb/serial/usb-serial.c
++++ linux-2.6.25.4/drivers/usb/serial/usb-serial.c
@@ -58,6 +58,7 @@ static struct usb_driver usb_serial_driv
drivers depend on it.
*/
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 c1a5b96318..bb106a51db 100644
--- 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,7 +1,7 @@
-Index: linux-2.6.25.1/init/main.c
+Index: linux-2.6.25.4/init/main.c
===================================================================
---- linux-2.6.25.1.orig/init/main.c
-+++ linux-2.6.25.1/init/main.c
+--- linux-2.6.25.4.orig/init/main.c
++++ linux-2.6.25.4/init/main.c
@@ -775,7 +775,7 @@ static int noinline init_post(void)
numa_default_policy();
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 667e276377..c593d0a46c 100644
--- 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,7 @@
-Index: linux-2.6.25.1/fs/jffs2/erase.c
+Index: linux-2.6.25.4/fs/jffs2/erase.c
===================================================================
---- linux-2.6.25.1.orig/fs/jffs2/erase.c
-+++ linux-2.6.25.1/fs/jffs2/erase.c
+--- linux-2.6.25.4.orig/fs/jffs2/erase.c
++++ linux-2.6.25.4/fs/jffs2/erase.c
@@ -35,6 +35,8 @@ static void jffs2_erase_block(struct jff
{
int ret;
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 d8c75c3128..07c5129d08 100644
--- 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.25.1/include/linux/time.h
+Index: linux-2.6.25.4/include/linux/time.h
===================================================================
---- linux-2.6.25.1.orig/include/linux/time.h
-+++ linux-2.6.25.1/include/linux/time.h
+--- linux-2.6.25.4.orig/include/linux/time.h
++++ linux-2.6.25.4/include/linux/time.h
@@ -1,6 +1,10 @@
#ifndef _LINUX_TIME_H
#define _LINUX_TIME_H
@@ -20,10 +20,10 @@ Index: linux-2.6.25.1/include/linux/time.h
+#endif /* __KERNEL__ DEBIAN */
+
#endif
-Index: linux-2.6.25.1/include/linux/types.h
+Index: linux-2.6.25.4/include/linux/types.h
===================================================================
---- linux-2.6.25.1.orig/include/linux/types.h
-+++ linux-2.6.25.1/include/linux/types.h
+--- linux-2.6.25.4.orig/include/linux/types.h
++++ linux-2.6.25.4/include/linux/types.h
@@ -1,6 +1,14 @@
#ifndef _LINUX_TYPES_H
#define _LINUX_TYPES_H
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 68f1f7afb9..1e115430a3 100644
--- 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,7 +1,7 @@
-Index: linux-2.6.25.1/scripts/genksyms/parse.c_shipped
+Index: linux-2.6.25.4/scripts/genksyms/parse.c_shipped
===================================================================
---- linux-2.6.25.1.orig/scripts/genksyms/parse.c_shipped
-+++ linux-2.6.25.1/scripts/genksyms/parse.c_shipped
+--- linux-2.6.25.4.orig/scripts/genksyms/parse.c_shipped
++++ linux-2.6.25.4/scripts/genksyms/parse.c_shipped
@@ -160,7 +160,9 @@
@@ -12,10 +12,10 @@ Index: linux-2.6.25.1/scripts/genksyms/parse.c_shipped
#include "genksyms.h"
static int is_typedef;
-Index: linux-2.6.25.1/scripts/genksyms/parse.y
+Index: linux-2.6.25.4/scripts/genksyms/parse.y
===================================================================
---- linux-2.6.25.1.orig/scripts/genksyms/parse.y
-+++ linux-2.6.25.1/scripts/genksyms/parse.y
+--- linux-2.6.25.4.orig/scripts/genksyms/parse.y
++++ linux-2.6.25.4/scripts/genksyms/parse.y
@@ -24,7 +24,9 @@
%{
@@ -26,10 +26,10 @@ Index: linux-2.6.25.1/scripts/genksyms/parse.y
#include "genksyms.h"
static int is_typedef;
-Index: linux-2.6.25.1/scripts/kallsyms.c
+Index: linux-2.6.25.4/scripts/kallsyms.c
===================================================================
---- linux-2.6.25.1.orig/scripts/kallsyms.c
-+++ linux-2.6.25.1/scripts/kallsyms.c
+--- linux-2.6.25.4.orig/scripts/kallsyms.c
++++ linux-2.6.25.4/scripts/kallsyms.c
@@ -28,6 +28,35 @@
#include <stdlib.h>
#include <string.h>
@@ -66,10 +66,10 @@ Index: linux-2.6.25.1/scripts/kallsyms.c
#define KSYM_NAME_LEN 128
-Index: linux-2.6.25.1/scripts/kconfig/Makefile
+Index: linux-2.6.25.4/scripts/kconfig/Makefile
===================================================================
---- linux-2.6.25.1.orig/scripts/kconfig/Makefile
-+++ linux-2.6.25.1/scripts/kconfig/Makefile
+--- linux-2.6.25.4.orig/scripts/kconfig/Makefile
++++ linux-2.6.25.4/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)
@@ -80,10 +80,10 @@ Index: linux-2.6.25.1/scripts/kconfig/Makefile
HOST_EXTRACFLAGS += -DLOCALE
-Index: linux-2.6.25.1/scripts/mod/mk_elfconfig.c
+Index: linux-2.6.25.4/scripts/mod/mk_elfconfig.c
===================================================================
---- linux-2.6.25.1.orig/scripts/mod/mk_elfconfig.c
-+++ linux-2.6.25.1/scripts/mod/mk_elfconfig.c
+--- linux-2.6.25.4.orig/scripts/mod/mk_elfconfig.c
++++ linux-2.6.25.4/scripts/mod/mk_elfconfig.c
@@ -1,7 +1,11 @@
#include <stdio.h>
#include <stdlib.h>
@@ -96,10 +96,10 @@ Index: linux-2.6.25.1/scripts/mod/mk_elfconfig.c
int
main(int argc, char **argv)
-Index: linux-2.6.25.1/scripts/mod/modpost.h
+Index: linux-2.6.25.4/scripts/mod/modpost.h
===================================================================
---- linux-2.6.25.1.orig/scripts/mod/modpost.h
-+++ linux-2.6.25.1/scripts/mod/modpost.h
+--- linux-2.6.25.4.orig/scripts/mod/modpost.h
++++ linux-2.6.25.4/scripts/mod/modpost.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 0125a85c3d..4312856a4c 100644
--- 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,7 @@
-Index: linux-2.6.25.1/drivers/net/wireless/hostap/hostap_ap.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/drivers/net/wireless/hostap/hostap_ap.c
++++ linux-2.6.25.4/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);
@@ -42,10 +42,10 @@ Index: linux-2.6.25.1/drivers/net/wireless/hostap/hostap_ap.c
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,
-Index: linux-2.6.25.1/drivers/net/wireless/hostap/hostap_config.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/drivers/net/wireless/hostap/hostap_config.h
++++ linux-2.6.25.4/drivers/net/wireless/hostap/hostap_config.h
@@ -45,4 +45,9 @@
*/
/* #define PRISM2_NO_STATION_MODES */
@@ -56,10 +56,10 @@ Index: linux-2.6.25.1/drivers/net/wireless/hostap/hostap_config.h
+#define RAW_TXPOWER_SETTING
+
#endif /* HOSTAP_CONFIG_H */
-Index: linux-2.6.25.1/drivers/net/wireless/hostap/hostap.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/drivers/net/wireless/hostap/hostap.h
++++ linux-2.6.25.4/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;
@@ -68,10 +68,10 @@ Index: linux-2.6.25.1/drivers/net/wireless/hostap/hostap.h
#endif /* HOSTAP_H */
-Index: linux-2.6.25.1/drivers/net/wireless/hostap/hostap_hw.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/drivers/net/wireless/hostap/hostap_hw.c
++++ linux-2.6.25.4/drivers/net/wireless/hostap/hostap_hw.c
@@ -933,6 +933,7 @@ static int hfa384x_set_rid(struct net_de
prism2_hw_reset(dev);
}
@@ -80,10 +80,10 @@ Index: linux-2.6.25.1/drivers/net/wireless/hostap/hostap_hw.c
return res;
}
-Index: linux-2.6.25.1/drivers/net/wireless/hostap/hostap_info.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/drivers/net/wireless/hostap/hostap_info.c
++++ linux-2.6.25.4/drivers/net/wireless/hostap/hostap_info.c
@@ -434,6 +434,11 @@ static void handle_info_queue_linkstatus
}
@@ -96,10 +96,10 @@ Index: linux-2.6.25.1/drivers/net/wireless/hostap/hostap_info.c
if (connected) {
netif_carrier_on(local->dev);
netif_carrier_on(local->ddev);
-Index: linux-2.6.25.1/drivers/net/wireless/hostap/hostap_ioctl.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/drivers/net/wireless/hostap/hostap_ioctl.c
++++ linux-2.6.25.4/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -1500,23 +1500,20 @@ static int prism2_txpower_hfa386x_to_dBm
val = 255;
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 79896f2419..7dd82f4591 100644
--- 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,7 +1,7 @@
-Index: linux-2.6.25.1/include/linux/stddef.h
+Index: linux-2.6.25.4/include/linux/stddef.h
===================================================================
---- linux-2.6.25.1.orig/include/linux/stddef.h
-+++ linux-2.6.25.1/include/linux/stddef.h
+--- linux-2.6.25.4.orig/include/linux/stddef.h
++++ linux-2.6.25.4/include/linux/stddef.h
@@ -16,6 +16,7 @@ enum {
false = 0,
true = 1
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 fb1a30d823..c9a8e30777 100644
--- 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,7 +1,7 @@
-Index: linux-2.6.25.1/scripts/gen_initramfs_list.sh
+Index: linux-2.6.25.4/scripts/gen_initramfs_list.sh
===================================================================
---- linux-2.6.25.1.orig/scripts/gen_initramfs_list.sh
-+++ linux-2.6.25.1/scripts/gen_initramfs_list.sh
+--- linux-2.6.25.4.orig/scripts/gen_initramfs_list.sh
++++ linux-2.6.25.4/scripts/gen_initramfs_list.sh
@@ -125,7 +125,7 @@ parse() {
str="${ftype} ${name} ${location} ${str}"
;;
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 18a8f5e9cc..0db1e89dcc 100644
--- 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.25.1/arch/x86/boot/tools/build.c
+Index: linux-2.6.25.4/arch/x86/boot/tools/build.c
===================================================================
---- linux-2.6.25.1.orig/arch/x86/boot/tools/build.c
-+++ linux-2.6.25.1/arch/x86/boot/tools/build.c
+--- linux-2.6.25.4.orig/arch/x86/boot/tools/build.c
++++ linux-2.6.25.4/arch/x86/boot/tools/build.c
@@ -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 547f39b32f..083e048267 100644
--- 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.25.1/drivers/spi/Kconfig
+Index: linux-2.6.25.4/drivers/spi/Kconfig
===================================================================
---- linux-2.6.25.1.orig/drivers/spi/Kconfig
-+++ linux-2.6.25.1/drivers/spi/Kconfig
+--- linux-2.6.25.4.orig/drivers/spi/Kconfig
++++ linux-2.6.25.4/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.
@@ -14,10 +14,10 @@ Index: linux-2.6.25.1/drivers/spi/Kconfig
config SPI_IMX
tristate "Freescale iMX SPI controller"
depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL
-Index: linux-2.6.25.1/drivers/spi/Makefile
+Index: linux-2.6.25.4/drivers/spi/Makefile
===================================================================
---- linux-2.6.25.1.orig/drivers/spi/Makefile
-+++ linux-2.6.25.1/drivers/spi/Makefile
+--- linux-2.6.25.4.orig/drivers/spi/Makefile
++++ linux-2.6.25.4/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
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 2a68457cb9..f616efbf31 100644
--- 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,10 @@ and didn't make it with the ppc32 equivalent. Thanks.
---
-Index: linux-2.6.25.1/include/asm-ppc/io.h
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/include/asm-ppc/io.h
++++ linux-2.6.25.4/include/asm-ppc/io.h
@@ -413,11 +413,21 @@ static inline unsigned int ioread16(void
return readw(addr);
}
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 898b2fd849..7414920cd3 100644
--- 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,7 +1,7 @@
-Index: linux-2.6.25.1/arch/arm/tools/mach-types
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/arch/arm/tools/mach-types
++++ linux-2.6.25.4/arch/arm/tools/mach-types
@@ -12,7 +12,7 @@
#
# http://www.arm.linux.org.uk/developer/machines/?action=new
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 851cf6ceac..af3e3aaa8d 100644
--- 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,7 +1,7 @@
-Index: linux-2.6.25.1/net/netfilter/nf_conntrack_core.c
+Index: linux-2.6.25.4/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
+--- linux-2.6.25.4.orig/net/netfilter/nf_conntrack_core.c
++++ linux-2.6.25.4/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)