diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2008-05-30 16:30:51 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2008-05-30 16:30:51 +0000 |
| commit | f664b7cb17d20e7a32e9bd07e85c9bb7ecb9e2ce (patch) | |
| tree | eee31435ae91d4838abf2a566762712522a30f1f /target/linux/generic-2.6 | |
| parent | 83072a149a7d7e6faf7276db7a5f6440d7fa0d24 (diff) | |
| download | upstream-f664b7cb17d20e7a32e9bd07e85c9bb7ecb9e2ce.tar.gz upstream-f664b7cb17d20e7a32e9bd07e85c9bb7ecb9e2ce.tar.bz2 upstream-f664b7cb17d20e7a32e9bd07e85c9bb7ecb9e2ce.zip | |
refresh generic 2.6.25 patches to match upstream style
SVN-Revision: 11296
Diffstat (limited to 'target/linux/generic-2.6')
59 files changed, 2003 insertions, 3309 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 bb84e3c1a2..4f55eb539b 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,8 +1,6 @@ -Index: linux-2.6.25.4/fs/Kconfig -=================================================================== ---- linux-2.6.25.4.orig/fs/Kconfig -+++ linux-2.6.25.4/fs/Kconfig -@@ -1367,6 +1367,71 @@ config CRAMFS +--- a/fs/Kconfig ++++ b/fs/Kconfig +@@ -1367,6 +1367,71 @@ If unsure, say N. @@ -74,11 +72,9 @@ Index: linux-2.6.25.4/fs/Kconfig config VXFS_FS tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)" depends on BLOCK -Index: linux-2.6.25.4/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/ +--- a/fs/Makefile ++++ b/fs/Makefile +@@ -73,6 +73,7 @@ obj-$(CONFIG_JBD2) += jbd2/ obj-$(CONFIG_EXT2_FS) += ext2/ obj-$(CONFIG_CRAMFS) += cramfs/ @@ -86,10 +82,8 @@ Index: linux-2.6.25.4/fs/Makefile obj-y += ramfs/ obj-$(CONFIG_HUGETLBFS) += hugetlbfs/ obj-$(CONFIG_CODA_FS) += coda/ -Index: linux-2.6.25.4/fs/squashfs/inode.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/fs/squashfs/inode.c ++++ b/fs/squashfs/inode.c @@ -0,0 +1,2122 @@ +/* + * Squashfs - a compressed read only filesystem for Linux @@ -2213,10 +2207,8 @@ Index: linux-2.6.25.4/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.4/fs/squashfs/Makefile -=================================================================== --- /dev/null -+++ linux-2.6.25.4/fs/squashfs/Makefile ++++ b/fs/squashfs/Makefile @@ -0,0 +1,7 @@ +# +# Makefile for the linux squashfs routines. @@ -2225,10 +2217,8 @@ Index: linux-2.6.25.4/fs/squashfs/Makefile +obj-$(CONFIG_SQUASHFS) += squashfs.o +squashfs-y += inode.o +squashfs-y += squashfs2_0.o -Index: linux-2.6.25.4/fs/squashfs/squashfs2_0.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/fs/squashfs/squashfs2_0.c ++++ b/fs/squashfs/squashfs2_0.c @@ -0,0 +1,758 @@ +/* + * Squashfs - a compressed read only filesystem for Linux @@ -2988,10 +2978,8 @@ Index: linux-2.6.25.4/fs/squashfs/squashfs2_0.c + + return 1; +} -Index: linux-2.6.25.4/fs/squashfs/squashfs.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/fs/squashfs/squashfs.h ++++ b/fs/squashfs/squashfs.h @@ -0,0 +1,86 @@ +/* + * Squashfs - a compressed read only filesystem for Linux @@ -3079,10 +3067,8 @@ Index: linux-2.6.25.4/fs/squashfs/squashfs.h + return 0; +} +#endif -Index: linux-2.6.25.4/include/linux/magic.h -=================================================================== ---- linux-2.6.25.4.orig/include/linux/magic.h -+++ linux-2.6.25.4/include/linux/magic.h +--- a/include/linux/magic.h ++++ b/include/linux/magic.h @@ -35,6 +35,9 @@ #define REISER2FS_SUPER_MAGIC_STRING "ReIsEr2Fs" #define REISER2FS_JR_SUPER_MAGIC_STRING "ReIsEr3Fs" @@ -3093,10 +3079,8 @@ Index: linux-2.6.25.4/include/linux/magic.h #define SMB_SUPER_MAGIC 0x517B #define USBDEVICE_SUPER_MAGIC 0x9fa2 #define CGROUP_SUPER_MAGIC 0x27e0eb -Index: linux-2.6.25.4/include/linux/squashfs_fs.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/squashfs_fs.h ++++ b/include/linux/squashfs_fs.h @@ -0,0 +1,911 @@ +#ifndef SQUASHFS_FS +#define SQUASHFS_FS @@ -4009,10 +3993,8 @@ Index: linux-2.6.25.4/include/linux/squashfs_fs.h + +#endif +#endif -Index: linux-2.6.25.4/include/linux/squashfs_fs_i.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/squashfs_fs_i.h ++++ b/include/linux/squashfs_fs_i.h @@ -0,0 +1,45 @@ +#ifndef SQUASHFS_FS_I +#define SQUASHFS_FS_I @@ -4059,10 +4041,8 @@ Index: linux-2.6.25.4/include/linux/squashfs_fs_i.h + struct inode vfs_inode; +}; +#endif -Index: linux-2.6.25.4/include/linux/squashfs_fs_sb.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/squashfs_fs_sb.h ++++ b/include/linux/squashfs_fs_sb.h @@ -0,0 +1,74 @@ +#ifndef SQUASHFS_FS_SB +#define SQUASHFS_FS_SB @@ -4138,10 +4118,8 @@ Index: linux-2.6.25.4/include/linux/squashfs_fs_sb.h + int (*read_fragment_index_table)(struct super_block *s); +}; +#endif -Index: linux-2.6.25.4/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 +--- a/init/do_mounts_rd.c ++++ b/init/do_mounts_rd.c @@ -5,6 +5,7 @@ #include <linux/ext2_fs.h> #include <linux/romfs_fs.h> @@ -4150,7 +4128,7 @@ Index: linux-2.6.25.4/init/do_mounts_rd.c #include <linux/initrd.h> #include <linux/string.h> -@@ -39,6 +40,7 @@ static int __init crd_load(int in_fd, in +@@ -39,6 +40,7 @@ * numbers could not be found. * * We currently check for the following magic numbers: @@ -4158,7 +4136,7 @@ Index: linux-2.6.25.4/init/do_mounts_rd.c * minix * ext2 * romfs -@@ -53,6 +55,7 @@ identify_ramdisk_image(int fd, int start +@@ -53,6 +55,7 @@ struct ext2_super_block *ext2sb; struct romfs_super_block *romfsb; struct cramfs_super *cramfsb; @@ -4166,7 +4144,7 @@ Index: linux-2.6.25.4/init/do_mounts_rd.c int nblocks = -1; unsigned char *buf; -@@ -64,6 +67,7 @@ identify_ramdisk_image(int fd, int start +@@ -64,6 +67,7 @@ ext2sb = (struct ext2_super_block *) buf; romfsb = (struct romfs_super_block *) buf; cramfsb = (struct cramfs_super *) buf; @@ -4174,7 +4152,7 @@ Index: linux-2.6.25.4/init/do_mounts_rd.c memset(buf, 0xe5, size); /* -@@ -101,6 +105,15 @@ identify_ramdisk_image(int fd, int start +@@ -101,6 +105,15 @@ goto done; } diff --git a/target/linux/generic-2.6/patches-2.6.25/002-lzma_decompress.patch b/target/linux/generic-2.6/patches-2.6.25/002-lzma_decompress.patch index 73cf22a9b4..fdc3039863 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,5 @@ -Index: linux-2.6.25.4/include/linux/LzmaDecode.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/LzmaDecode.h ++++ b/include/linux/LzmaDecode.h @@ -0,0 +1,100 @@ +/* + LzmaDecode.h @@ -103,10 +101,8 @@ Index: linux-2.6.25.4/include/linux/LzmaDecode.h + UInt32 *outSizeProcessed); + +#endif -Index: linux-2.6.25.4/lib/LzmaDecode.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/lib/LzmaDecode.c ++++ b/lib/LzmaDecode.c @@ -0,0 +1,663 @@ +/* + LzmaDecode.c @@ -771,11 +767,9 @@ Index: linux-2.6.25.4/lib/LzmaDecode.c + *outSizeProcessed = nowPos; + return LZMA_RESULT_OK; +} -Index: linux-2.6.25.4/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 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -14,7 +14,7 @@ lib-y += kobject.o kref.o klist.o obj-y += div64.o sort.o parser.o halfmd4.o debug_locks.o random32.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 5a42f25bdc..16cc873199 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,5 @@ -Index: linux-2.6.25.4/fs/squashfs/inode.c -=================================================================== ---- linux-2.6.25.4.orig/fs/squashfs/inode.c -+++ linux-2.6.25.4/fs/squashfs/inode.c +--- a/fs/squashfs/inode.c ++++ b/fs/squashfs/inode.c @@ -4,6 +4,9 @@ * Copyright (c) 2002, 2003, 2004, 2005, 2006 * Phillip Lougher <phillip@lougher.org.uk> @@ -40,7 +38,7 @@ Index: linux-2.6.25.4/fs/squashfs/inode.c static void squashfs_put_super(struct super_block *); static int squashfs_statfs(struct dentry *, struct kstatfs *); static int squashfs_symlink_readpage(struct file *file, struct page *page); -@@ -64,7 +81,11 @@ static int squashfs_get_sb(struct file_s +@@ -64,7 +81,11 @@ const char *, void *, struct vfsmount *); @@ -52,7 +50,7 @@ Index: linux-2.6.25.4/fs/squashfs/inode.c static struct file_system_type squashfs_fs_type = { .owner = THIS_MODULE, -@@ -249,6 +270,15 @@ SQSH_EXTERN unsigned int squashfs_read_d +@@ -249,6 +270,15 @@ if (compressed) { int zlib_err; @@ -68,7 +66,7 @@ Index: linux-2.6.25.4/fs/squashfs/inode.c stream.next_in = c_buffer; stream.avail_in = c_byte; stream.next_out = buffer; -@@ -263,7 +293,7 @@ SQSH_EXTERN unsigned int squashfs_read_d +@@ -263,7 +293,7 @@ bytes = 0; } else bytes = stream.total_out; @@ -77,7 +75,7 @@ Index: linux-2.6.25.4/fs/squashfs/inode.c up(&msblk->read_data_mutex); } -@@ -2045,15 +2075,19 @@ static int __init init_squashfs_fs(void) +@@ -2045,15 +2075,19 @@ printk(KERN_INFO "squashfs: version 3.0 (2006/03/15) " "Phillip Lougher\n"); @@ -97,7 +95,7 @@ Index: linux-2.6.25.4/fs/squashfs/inode.c destroy_inodecache(); } -@@ -2064,7 +2098,9 @@ out: +@@ -2064,7 +2098,9 @@ static void __exit exit_squashfs_fs(void) { diff --git a/target/linux/generic-2.6/patches-2.6.25/004-extra_optimization.patch b/target/linux/generic-2.6/patches-2.6.25/004-extra_optimization.patch index 999b2e27ad..d3898f1fc6 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,8 +1,6 @@ -Index: linux-2.6.25.4/Makefile -=================================================================== ---- linux-2.6.25.4.orig/Makefile -+++ linux-2.6.25.4/Makefile -@@ -533,6 +533,9 @@ endif +--- a/Makefile ++++ b/Makefile +@@ -533,6 +533,9 @@ 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 3987223945..961829e580 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,5 @@ -Index: linux-2.6.25.4/fs/squashfs/inode.c -=================================================================== ---- linux-2.6.25.4.orig/fs/squashfs/inode.c -+++ linux-2.6.25.4/fs/squashfs/inode.c +--- a/fs/squashfs/inode.c ++++ b/fs/squashfs/inode.c @@ -33,6 +33,7 @@ #include <linux/fs.h> #include <linux/smp_lock.h> @@ -10,7 +8,7 @@ Index: linux-2.6.25.4/fs/squashfs/inode.c #include <linux/squashfs_fs_sb.h> #include <linux/squashfs_fs_i.h> #include <linux/buffer_head.h> -@@ -2125,7 +2126,7 @@ static void squashfs_destroy_inode(struc +@@ -2125,7 +2126,7 @@ } 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 b344eb2425..dbb7e7c87e 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,8 +1,6 @@ -Index: linux-2.6.25.4/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 +--- a/include/asm-mips/system.h ++++ b/include/asm-mips/system.h +@@ -185,7 +185,7 @@ 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 8ae8eaa38a..f1279c29f8 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,5 @@ -Index: linux-2.6.25.4/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 +--- a/drivers/mtd/chips/cfi_cmdset_0002.c ++++ b/drivers/mtd/chips/cfi_cmdset_0002.c @@ -51,6 +51,7 @@ #define SST49LF040B 0x0050 #define SST49LF008A 0x005a @@ -10,7 +8,7 @@ Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0002.c static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *); static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *); -@@ -298,12 +299,19 @@ struct mtd_info *cfi_cmdset_0002(struct +@@ -298,12 +299,19 @@ if (extp->MajorVersion != '1' || (extp->MinorVersion < '0' || extp->MinorVersion > '4')) { diff --git a/target/linux/generic-2.6/patches-2.6.25/009-revert_intel_flash_breakage.patch b/target/linux/generic-2.6/patches-2.6.25/009-revert_intel_flash_breakage.patch index d38cba2836..d2c1dc5d4b 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,8 +1,6 @@ -Index: linux-2.6.25.4/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 +--- a/drivers/mtd/chips/cfi_cmdset_0001.c ++++ b/drivers/mtd/chips/cfi_cmdset_0001.c +@@ -1008,7 +1008,7 @@ static int __xipram xip_wait_for_operation( struct map_info *map, struct flchip *chip, @@ -11,7 +9,7 @@ Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0001.c { struct cfi_private *cfi = map->fldrv_priv; struct cfi_pri_intelext *cfip = cfi->cmdset_priv; -@@ -1017,7 +1017,7 @@ static int __xipram xip_wait_for_operati +@@ -1017,7 +1017,7 @@ flstate_t oldstate, newstate; start = xip_currtime(); @@ -20,7 +18,7 @@ Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0001.c if (usec == 0) usec = 500000; done = 0; -@@ -1127,8 +1127,8 @@ static int __xipram xip_wait_for_operati +@@ -1127,8 +1127,8 @@ #define XIP_INVAL_CACHED_RANGE(map, from, size) \ INVALIDATE_CACHED_RANGE(map, from, size) @@ -31,7 +29,7 @@ Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0001.c #else -@@ -1140,65 +1140,65 @@ static int __xipram xip_wait_for_operati +@@ -1140,65 +1140,65 @@ static int inval_cache_and_wait_for_operation( struct map_info *map, struct flchip *chip, unsigned long cmd_adr, unsigned long inval_adr, int inval_len, @@ -132,7 +130,7 @@ Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0001.c /* Done and happy. */ chip->state = FL_STATUS; return 0; -@@ -1207,7 +1207,8 @@ static int inval_cache_and_wait_for_oper +@@ -1207,7 +1207,8 @@ #endif #define WAIT_TIMEOUT(map, chip, adr, udelay) \ @@ -142,7 +140,7 @@ Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0001.c static int do_point_onechip (struct map_info *map, struct flchip *chip, loff_t adr, size_t len) -@@ -1438,7 +1439,7 @@ static int __xipram do_write_oneword(str +@@ -1438,7 +1439,7 @@ ret = INVAL_CACHE_AND_WAIT(map, chip, adr, adr, map_bankwidth(map), @@ -151,7 +149,7 @@ Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0001.c if (ret) { xip_enable(map, chip, adr); printk(KERN_ERR "%s: word write error (status timeout)\n", map->name); -@@ -1678,7 +1679,7 @@ static int __xipram do_write_buffer(stru +@@ -1678,7 +1679,7 @@ ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr, initial_adr, initial_len, @@ -160,7 +158,7 @@ Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0001.c if (ret) { map_write(map, CMD(0x70), cmd_adr); chip->state = FL_STATUS; -@@ -1813,7 +1814,7 @@ static int __xipram do_erase_oneblock(st +@@ -1813,7 +1814,7 @@ ret = INVAL_CACHE_AND_WAIT(map, chip, adr, adr, len, diff --git a/target/linux/generic-2.6/patches-2.6.25/010-disable_old_squashfs_compatibility.patch b/target/linux/generic-2.6/patches-2.6.25/010-disable_old_squashfs_compatibility.patch index 52fe135372..01e27573bc 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,12 @@ -Index: linux-2.6.25.4/fs/squashfs/Makefile -=================================================================== ---- linux-2.6.25.4.orig/fs/squashfs/Makefile -+++ linux-2.6.25.4/fs/squashfs/Makefile +--- a/fs/squashfs/Makefile ++++ b/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.4/fs/squashfs/squashfs.h -=================================================================== ---- linux-2.6.25.4.orig/fs/squashfs/squashfs.h -+++ linux-2.6.25.4/fs/squashfs/squashfs.h +--- a/fs/squashfs/squashfs.h ++++ b/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 4d09b6531a..4eba9095cf 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,5 @@ -Index: linux-2.6.25.4/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 +--- a/arch/mips/kernel/head.S ++++ b/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 f2f1b2f7c0..4a1c9581f5 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,5 @@ -Index: linux-2.6.25.4/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 +--- a/drivers/mtd/devices/block2mtd.c ++++ b/drivers/mtd/devices/block2mtd.c @@ -16,6 +16,7 @@ #include <linux/list.h> #include <linux/init.h> @@ -10,7 +8,7 @@ Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c #include <linux/buffer_head.h> #include <linux/mutex.h> #include <linux/mount.h> -@@ -237,10 +238,11 @@ static void block2mtd_free_device(struct +@@ -237,10 +238,11 @@ /* FIXME: ensure that mtd->size % erase_size == 0 */ @@ -23,7 +21,7 @@ Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c if (!devname) return NULL; -@@ -279,14 +281,18 @@ static struct block2mtd_dev *add_device( +@@ -279,14 +281,18 @@ /* Setup the MTD structure */ /* make the name contain the block device in */ @@ -47,7 +45,7 @@ Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c dev->mtd.erasesize = erase_size; dev->mtd.writesize = 1; dev->mtd.type = MTD_RAM; -@@ -298,15 +304,18 @@ static struct block2mtd_dev *add_device( +@@ -298,15 +304,18 @@ dev->mtd.read = block2mtd_read; dev->mtd.priv = dev; dev->mtd.owner = THIS_MODULE; @@ -70,7 +68,7 @@ Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c return dev; devinit_err: -@@ -379,9 +388,9 @@ static char block2mtd_paramline[80 + 12] +@@ -379,9 +388,9 @@ static int block2mtd_setup2(const char *val) { @@ -82,7 +80,7 @@ Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c char *name; size_t erase_size = PAGE_SIZE; int i, ret; -@@ -392,7 +401,7 @@ static int block2mtd_setup2(const char * +@@ -392,7 +401,7 @@ strcpy(str, val); kill_final_newline(str); @@ -91,7 +89,7 @@ Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c token[i] = strsep(&str, ","); if (str) -@@ -411,8 +420,10 @@ static int block2mtd_setup2(const char * +@@ -411,8 +420,10 @@ parse_err("illegal erase size"); } } @@ -103,7 +101,7 @@ Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c return 0; } -@@ -446,7 +457,7 @@ static int block2mtd_setup(const char *v +@@ -446,7 +457,7 @@ module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200); diff --git a/target/linux/generic-2.6/patches-2.6.25/065-rootfs_split.patch b/target/linux/generic-2.6/patches-2.6.25/065-rootfs_split.patch index e12e8d4ded..62a7e252e3 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,8 +1,6 @@ -Index: linux-2.6.25.4/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 +--- a/drivers/mtd/Kconfig ++++ b/drivers/mtd/Kconfig +@@ -47,6 +47,16 @@ devices. Partitioning on NFTL 'devices' is a different - that's the 'normal' form of partitioning used on a block device. @@ -19,10 +17,8 @@ Index: linux-2.6.25.4/drivers/mtd/Kconfig config MTD_REDBOOT_PARTS tristate "RedBoot partition table parsing" depends on MTD_PARTITIONS -Index: linux-2.6.25.4/drivers/mtd/mtdpart.c -=================================================================== ---- linux-2.6.25.4.orig/drivers/mtd/mtdpart.c -+++ linux-2.6.25.4/drivers/mtd/mtdpart.c +--- a/drivers/mtd/mtdpart.c ++++ b/drivers/mtd/mtdpart.c @@ -20,6 +20,8 @@ #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> @@ -32,7 +28,7 @@ Index: linux-2.6.25.4/drivers/mtd/mtdpart.c /* Our partition linked list */ static LIST_HEAD(mtd_partitions); -@@ -39,7 +41,7 @@ struct mtd_part { +@@ -39,7 +41,7 @@ * the pointer to that structure with this macro. */ #define PART(x) ((struct mtd_part *)(x)) @@ -41,7 +37,7 @@ Index: linux-2.6.25.4/drivers/mtd/mtdpart.c /* * MTD methods which simply translate the effective address and pass through -@@ -322,6 +324,316 @@ int del_mtd_partitions(struct mtd_info * +@@ -322,6 +324,316 @@ return 0; } @@ -358,7 +354,7 @@ Index: linux-2.6.25.4/drivers/mtd/mtdpart.c /* * This function, given a master MTD object and a partition table, creates * and registers slave MTD objects which are bound to the master according to -@@ -334,171 +646,31 @@ int add_mtd_partitions(struct mtd_info * +@@ -334,171 +646,31 @@ int nbparts) { struct mtd_part *slave; @@ -551,7 +547,7 @@ Index: linux-2.6.25.4/drivers/mtd/mtdpart.c } } -@@ -574,6 +746,32 @@ int parse_mtd_partitions(struct mtd_info +@@ -574,6 +746,32 @@ return ret; } @@ -584,11 +580,9 @@ Index: linux-2.6.25.4/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.4/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 { +--- a/drivers/mtd/devices/block2mtd.c ++++ b/drivers/mtd/devices/block2mtd.c +@@ -34,6 +34,8 @@ struct block_device *blkdev; struct mtd_info mtd; struct mutex write_mutex; @@ -597,7 +591,7 @@ Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c }; -@@ -86,6 +88,12 @@ static int block2mtd_erase(struct mtd_in +@@ -86,6 +88,12 @@ size_t len = instr->len; int err; @@ -610,7 +604,7 @@ Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c instr->state = MTD_ERASING; mutex_lock(&dev->write_mutex); err = _block2mtd_erase(dev, from, len); -@@ -98,6 +106,10 @@ static int block2mtd_erase(struct mtd_in +@@ -98,6 +106,10 @@ instr->state = MTD_ERASE_DONE; mtd_erase_callback(instr); @@ -621,7 +615,7 @@ Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c return err; } -@@ -109,10 +121,14 @@ static int block2mtd_read(struct mtd_inf +@@ -109,10 +121,14 @@ struct page *page; int index = from >> PAGE_SHIFT; int offset = from & (PAGE_SIZE-1); @@ -639,7 +633,7 @@ Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c if (from + len > mtd->size) len = mtd->size - from; -@@ -127,10 +143,14 @@ static int block2mtd_read(struct mtd_inf +@@ -127,10 +143,14 @@ len = len - cpylen; page = page_read(dev->blkdev->bd_inode->i_mapping, index); @@ -658,7 +652,7 @@ Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c memcpy(buf, page_address(page) + offset, cpylen); page_cache_release(page); -@@ -141,7 +161,10 @@ static int block2mtd_read(struct mtd_inf +@@ -141,7 +161,10 @@ offset = 0; index++; } @@ -670,7 +664,7 @@ Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c } -@@ -193,12 +216,22 @@ static int block2mtd_write(struct mtd_in +@@ -193,12 +216,22 @@ size_t *retlen, const u_char *buf) { struct block2mtd_dev *dev = mtd->priv; @@ -697,7 +691,7 @@ Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c if (to + len > mtd->size) len = mtd->size - to; -@@ -207,6 +240,9 @@ static int block2mtd_write(struct mtd_in +@@ -207,6 +240,9 @@ mutex_unlock(&dev->write_mutex); if (err > 0) err = 0; @@ -707,7 +701,7 @@ Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c return err; } -@@ -215,51 +251,29 @@ static int block2mtd_write(struct mtd_in +@@ -215,51 +251,29 @@ static void block2mtd_sync(struct mtd_info *mtd) { struct block2mtd_dev *dev = mtd->priv; @@ -767,7 +761,7 @@ Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c if (devt) { bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ); } -@@ -267,17 +281,96 @@ static struct block2mtd_dev *add_device( +@@ -267,17 +281,96 @@ #endif if (IS_ERR(bdev)) { @@ -867,7 +861,7 @@ Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c /* Setup the MTD structure */ /* make the name contain the block device in */ -@@ -304,6 +397,7 @@ static struct block2mtd_dev *add_device( +@@ -304,6 +397,7 @@ dev->mtd.read = block2mtd_read; dev->mtd.priv = dev; dev->mtd.owner = THIS_MODULE; @@ -875,10 +869,8 @@ Index: linux-2.6.25.4/drivers/mtd/devices/block2mtd.c part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL); part->name = dev->mtd.name; -Index: linux-2.6.25.4/drivers/mtd/mtdchar.c -=================================================================== ---- linux-2.6.25.4.orig/drivers/mtd/mtdchar.c -+++ linux-2.6.25.4/drivers/mtd/mtdchar.c +--- a/drivers/mtd/mtdchar.c ++++ b/drivers/mtd/mtdchar.c @@ -17,6 +17,7 @@ #include <linux/mtd/mtd.h> @@ -887,7 +879,7 @@ Index: linux-2.6.25.4/drivers/mtd/mtdchar.c #include <asm/uaccess.h> -@@ -756,6 +757,13 @@ static int mtd_ioctl(struct inode *inode +@@ -756,6 +757,13 @@ file->f_pos = 0; break; } @@ -901,11 +893,9 @@ Index: linux-2.6.25.4/drivers/mtd/mtdchar.c default: ret = -ENOTTY; -Index: linux-2.6.25.4/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 { +--- a/include/linux/mtd/mtd.h ++++ b/include/linux/mtd/mtd.h +@@ -98,6 +98,7 @@ uint8_t *oobbuf; }; @@ -913,7 +903,7 @@ Index: linux-2.6.25.4/include/linux/mtd/mtd.h struct mtd_info { u_char type; u_int32_t flags; -@@ -211,6 +212,9 @@ struct mtd_info { +@@ -211,6 +212,9 @@ struct module *owner; int usecount; @@ -923,10 +913,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/include/linux/mtd/partitions.h ++++ b/include/linux/mtd/partitions.h @@ -36,6 +36,7 @@ * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK). */ @@ -935,7 +923,7 @@ Index: linux-2.6.25.4/include/linux/mtd/partitions.h struct mtd_partition { char *name; /* identifier string */ u_int32_t size; /* partition size */ -@@ -43,6 +44,7 @@ struct mtd_partition { +@@ -43,6 +44,7 @@ u_int32_t mask_flags; /* master MTD flags to mask out for this partition */ struct nand_ecclayout *ecclayout; /* out of band layout for this partition (NAND only)*/ struct mtd_info **mtdp; /* pointer to store the MTD object */ @@ -943,7 +931,7 @@ Index: linux-2.6.25.4/include/linux/mtd/partitions.h }; #define MTDPART_OFS_NXTBLK (-2) -@@ -52,6 +54,7 @@ struct mtd_partition { +@@ -52,6 +54,7 @@ int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int); int del_mtd_partitions(struct mtd_info *); @@ -951,11 +939,9 @@ Index: linux-2.6.25.4/include/linux/mtd/partitions.h /* * Functions dealing with the various ways of partitioning the space -Index: linux-2.6.25.4/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 { +--- a/include/mtd/mtd-abi.h ++++ b/include/mtd/mtd-abi.h +@@ -95,6 +95,7 @@ #define ECCGETLAYOUT _IOR('M', 17, struct nand_ecclayout) #define ECCGETSTATS _IOR('M', 18, struct mtd_ecc_stats) #define MTDFILEMODE _IO('M', 19) diff --git a/target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch index 787f17e5c3..b473d59eca 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,8 +1,6 @@ -Index: linux-2.6.25.4/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 +--- a/drivers/mtd/redboot.c ++++ b/drivers/mtd/redboot.c +@@ -251,14 +251,21 @@ #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 66fa504a8c..917adc51a0 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,8 +1,6 @@ -Index: linux-2.6.25.4/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 +--- a/net/netfilter/Kconfig ++++ b/net/netfilter/Kconfig +@@ -735,6 +735,27 @@ To compile it as a module, choose M here. If unsure, say N. @@ -30,11 +28,9 @@ Index: linux-2.6.25.4/net/netfilter/Kconfig config NETFILTER_XT_MATCH_STATISTIC tristate '"statistic" match support' depends on NETFILTER_XTABLES -Index: linux-2.6.25.4/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) +--- a/net/netfilter/Makefile ++++ b/net/netfilter/Makefile +@@ -77,6 +77,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_REALM) += xt_realm.o obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o @@ -42,10 +38,8 @@ Index: linux-2.6.25.4/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.4/net/netfilter/xt_layer7.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/netfilter/xt_layer7.c ++++ b/net/netfilter/xt_layer7.c @@ -0,0 +1,634 @@ +/* + Kernel module to match application layer (OSI layer 7) data in connections. @@ -681,10 +675,8 @@ Index: linux-2.6.25.4/net/netfilter/xt_layer7.c + +module_init(xt_layer7_init); +module_exit(xt_layer7_fini); -Index: linux-2.6.25.4/net/netfilter/regexp/regexp.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/netfilter/regexp/regexp.c ++++ b/net/netfilter/regexp/regexp.c @@ -0,0 +1,1197 @@ +/* + * regcomp and regexec -- regsub and regerror are elsewhere @@ -1883,10 +1875,8 @@ Index: linux-2.6.25.4/net/netfilter/regexp/regexp.c +#endif + + -Index: linux-2.6.25.4/net/netfilter/regexp/regexp.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/netfilter/regexp/regexp.h ++++ b/net/netfilter/regexp/regexp.h @@ -0,0 +1,41 @@ +/* + * Definitions etc. for regexp(3) routines. @@ -1929,20 +1919,16 @@ Index: linux-2.6.25.4/net/netfilter/regexp/regexp.h +void regerror(char *s); + +#endif -Index: linux-2.6.25.4/net/netfilter/regexp/regmagic.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/netfilter/regexp/regmagic.h ++++ b/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.4/net/netfilter/regexp/regsub.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/netfilter/regexp/regsub.c ++++ b/net/netfilter/regexp/regsub.c @@ -0,0 +1,95 @@ +/* + * regsub @@ -2039,11 +2025,9 @@ Index: linux-2.6.25.4/net/netfilter/regexp/regsub.c + } + *dst++ = '\0'; +} -Index: linux-2.6.25.4/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 +--- a/net/netfilter/nf_conntrack_core.c ++++ b/net/netfilter/nf_conntrack_core.c +@@ -210,6 +210,14 @@ * too. */ nf_ct_remove_expectations(ct); @@ -2058,11 +2042,9 @@ Index: linux-2.6.25.4/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.4/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 * +--- a/net/netfilter/nf_conntrack_standalone.c ++++ b/net/netfilter/nf_conntrack_standalone.c +@@ -181,7 +181,12 @@ return -ENOSPC; #endif @@ -2076,11 +2058,9 @@ Index: linux-2.6.25.4/net/netfilter/nf_conntrack_standalone.c return -ENOSPC; return 0; -Index: linux-2.6.25.4/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 +--- a/include/net/netfilter/nf_conntrack.h ++++ b/include/net/netfilter/nf_conntrack.h +@@ -124,6 +124,22 @@ u_int32_t secmark; #endif @@ -2103,10 +2083,8 @@ Index: linux-2.6.25.4/include/net/netfilter/nf_conntrack.h /* Storage reserved for other modules: */ union nf_conntrack_proto proto; -Index: linux-2.6.25.4/include/linux/netfilter/xt_layer7.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter/xt_layer7.h ++++ b/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 e8bd21bb21..167d578cf1 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,8 +1,6 @@ -Index: linux-2.6.25.4/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 { +--- a/include/linux/netfilter/xt_layer7.h ++++ b/include/linux/netfilter/xt_layer7.h +@@ -8,6 +8,7 @@ char protocol[MAX_PROTOCOL_LEN]; char pattern[MAX_PATTERN_LEN]; u_int8_t invert; @@ -10,11 +8,9 @@ Index: linux-2.6.25.4/include/linux/netfilter/xt_layer7.h }; #endif /* _XT_LAYER7_H */ -Index: linux-2.6.25.4/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 +--- a/net/netfilter/xt_layer7.c ++++ b/net/netfilter/xt_layer7.c +@@ -297,34 +297,36 @@ } /* add the new app data to the conntrack. Return number of bytes added. */ @@ -65,7 +61,7 @@ Index: linux-2.6.25.4/net/netfilter/xt_layer7.c return length; } -@@ -411,7 +413,7 @@ match(const struct sk_buff *skbin, +@@ -411,7 +413,7 @@ const struct xt_layer7_info * info = matchinfo; enum ip_conntrack_info master_ctinfo, ctinfo; struct nf_conn *master_conntrack, *conntrack; @@ -74,7 +70,7 @@ Index: linux-2.6.25.4/net/netfilter/xt_layer7.c unsigned int pattern_result, appdatalen; regexp * comppattern; -@@ -439,8 +441,8 @@ match(const struct sk_buff *skbin, +@@ -439,8 +441,8 @@ master_conntrack = master_ct(master_conntrack); /* if we've classified it or seen too many packets */ @@ -85,7 +81,7 @@ Index: linux-2.6.25.4/net/netfilter/xt_layer7.c pattern_result = match_no_append(conntrack, master_conntrack, ctinfo, master_ctinfo, info); -@@ -473,6 +475,25 @@ match(const struct sk_buff *skbin, +@@ -473,6 +475,25 @@ /* the return value gets checked later, when we're ready to use it */ comppattern = compile_and_cache(info->pattern, info->protocol); 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 0ed18b404c..cd1abfaf6d 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,5 @@ -Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_ipp2p.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_ipp2p.h ++++ b/include/linux/netfilter_ipv4/ipt_ipp2p.h @@ -0,0 +1,31 @@ +#ifndef __IPT_IPP2P_H +#define __IPT_IPP2P_H @@ -34,10 +32,8 @@ Index: linux-2.6.25.4/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.4/net/ipv4/netfilter/ipt_ipp2p.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/ipv4/netfilter/ipt_ipp2p.c ++++ b/net/ipv4/netfilter/ipt_ipp2p.c @@ -0,0 +1,856 @@ +#if defined(MODVERSIONS) +#include <linux/modversions.h> @@ -895,11 +891,9 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/ipt_ipp2p.c +module_exit(fini); + + -Index: linux-2.6.25.4/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 +--- a/net/ipv4/netfilter/Kconfig ++++ b/net/ipv4/netfilter/Kconfig +@@ -57,6 +57,12 @@ To compile it as a module, choose M here. If unsure, say N. # The matches. @@ -912,11 +906,9 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/Kconfig config IP_NF_MATCH_RECENT tristate '"recent" match support' depends on IP_NF_IPTABLES -Index: linux-2.6.25.4/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 +--- a/net/ipv4/netfilter/Makefile ++++ b/net/ipv4/netfilter/Makefile +@@ -47,6 +47,8 @@ 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 294210ba37..88e33d5cff 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,5 @@ -Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set.h ++++ b/include/linux/netfilter_ipv4/ip_set.h @@ -0,0 +1,498 @@ +#ifndef _IP_SET_H +#define _IP_SET_H @@ -501,10 +499,8 @@ Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set.h +#endif /* __KERNEL__ */ + +#endif /*_IP_SET_H*/ -Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_iphash.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_iphash.h ++++ b/include/linux/netfilter_ipv4/ip_set_iphash.h @@ -0,0 +1,30 @@ +#ifndef __IP_SET_IPHASH_H +#define __IP_SET_IPHASH_H @@ -536,10 +532,8 @@ Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_iphash.h +}; + +#endif /* __IP_SET_IPHASH_H */ -Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_ipmap.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_ipmap.h ++++ b/include/linux/netfilter_ipv4/ip_set_ipmap.h @@ -0,0 +1,56 @@ +#ifndef __IP_SET_IPMAP_H +#define __IP_SET_IPMAP_H @@ -597,10 +591,8 @@ Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_ipmap.h +} + +#endif /* __IP_SET_IPMAP_H */ -Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_ipporthash.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_ipporthash.h ++++ b/include/linux/netfilter_ipv4/ip_set_ipporthash.h @@ -0,0 +1,34 @@ +#ifndef __IP_SET_IPPORTHASH_H +#define __IP_SET_IPPORTHASH_H @@ -636,10 +628,8 @@ Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_ipporthash.h +}; + +#endif /* __IP_SET_IPPORTHASH_H */ -Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_iptree.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_iptree.h ++++ b/include/linux/netfilter_ipv4/ip_set_iptree.h @@ -0,0 +1,40 @@ +#ifndef __IP_SET_IPTREE_H +#define __IP_SET_IPTREE_H @@ -681,10 +671,8 @@ Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_iptree.h +}; + +#endif /* __IP_SET_IPTREE_H */ -Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_iptreemap.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_iptreemap.h ++++ b/include/linux/netfilter_ipv4/ip_set_iptreemap.h @@ -0,0 +1,40 @@ +#ifndef __IP_SET_IPTREEMAP_H +#define __IP_SET_IPTREEMAP_H @@ -726,10 +714,8 @@ Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_iptreemap.h +}; + +#endif /* __IP_SET_IPTREEMAP_H */ -Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_jhash.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_jhash.h ++++ b/include/linux/netfilter_ipv4/ip_set_jhash.h @@ -0,0 +1,148 @@ +#ifndef _LINUX_IPSET_JHASH_H +#define _LINUX_IPSET_JHASH_H @@ -879,10 +865,8 @@ Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_jhash.h +} + +#endif /* _LINUX_IPSET_JHASH_H */ -Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_macipmap.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_macipmap.h ++++ b/include/linux/netfilter_ipv4/ip_set_macipmap.h @@ -0,0 +1,38 @@ +#ifndef __IP_SET_MACIPMAP_H +#define __IP_SET_MACIPMAP_H @@ -922,10 +906,8 @@ Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_macipmap.h +}; + +#endif /* __IP_SET_MACIPMAP_H */ -Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_malloc.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_malloc.h ++++ b/include/linux/netfilter_ipv4/ip_set_malloc.h @@ -0,0 +1,116 @@ +#ifndef _IP_SET_MALLOC_H +#define _IP_SET_MALLOC_H @@ -1043,10 +1025,8 @@ Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_malloc.h +#endif /* __KERNEL__ */ + +#endif /*_IP_SET_MALLOC_H*/ -Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_nethash.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_nethash.h ++++ b/include/linux/netfilter_ipv4/ip_set_nethash.h @@ -0,0 +1,55 @@ +#ifndef __IP_SET_NETHASH_H +#define __IP_SET_NETHASH_H @@ -1103,10 +1083,8 @@ Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_nethash.h +} + +#endif /* __IP_SET_NETHASH_H */ -Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_portmap.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_portmap.h ++++ b/include/linux/netfilter_ipv4/ip_set_portmap.h @@ -0,0 +1,25 @@ +#ifndef __IP_SET_PORTMAP_H +#define __IP_SET_PORTMAP_H @@ -1133,10 +1111,8 @@ Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ip_set_portmap.h +}; + +#endif /* __IP_SET_PORTMAP_H */ -Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_set.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_set.h ++++ b/include/linux/netfilter_ipv4/ipt_set.h @@ -0,0 +1,21 @@ +#ifndef _IPT_SET_H +#define _IPT_SET_H @@ -1159,10 +1135,8 @@ Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_set.h +}; + +#endif /*_IPT_SET_H*/ -Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/ipv4/netfilter/ip_set.c ++++ b/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 +3141,8 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set.c + +module_init(ip_set_init); +module_exit(ip_set_fini); -Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_iphash.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/ipv4/netfilter/ip_set_iphash.c ++++ b/net/ipv4/netfilter/ip_set_iphash.c @@ -0,0 +1,429 @@ +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> + * @@ -3601,10 +3573,8 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_iphash.c + +module_init(ip_set_iphash_init); +module_exit(ip_set_iphash_fini); -Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_ipmap.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/ipv4/netfilter/ip_set_ipmap.c ++++ b/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 +3912,8 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_ipmap.c + +module_init(ip_set_ipmap_init); +module_exit(ip_set_ipmap_fini); -Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_ipporthash.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/ipv4/netfilter/ip_set_ipporthash.c ++++ b/net/ipv4/netfilter/ip_set_ipporthash.c @@ -0,0 +1,581 @@ +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> + * @@ -4528,10 +4496,8 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_ipporthash.c + +module_init(ip_set_ipporthash_init); +module_exit(ip_set_ipporthash_fini); -Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_iptree.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/ipv4/netfilter/ip_set_iptree.c ++++ b/net/ipv4/netfilter/ip_set_iptree.c @@ -0,0 +1,612 @@ +/* Copyright (C) 2005 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> + * @@ -5145,10 +5111,8 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_iptree.c + +module_init(ip_set_iptree_init); +module_exit(ip_set_iptree_fini); -Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_iptreemap.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/ipv4/netfilter/ip_set_iptreemap.c ++++ b/net/ipv4/netfilter/ip_set_iptreemap.c @@ -0,0 +1,829 @@ +/* Copyright (C) 2007 Sven Wegener <sven.wegener@stealer.net> + * @@ -5979,10 +5943,8 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_iptreemap.c + +module_init(ip_set_iptreemap_init); +module_exit(ip_set_iptreemap_fini); -Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_macipmap.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/ipv4/netfilter/ip_set_macipmap.c ++++ b/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 +6321,8 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_macipmap.c + +module_init(ip_set_macipmap_init); +module_exit(ip_set_macipmap_fini); -Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_nethash.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/ipv4/netfilter/ip_set_nethash.c ++++ b/net/ipv4/netfilter/ip_set_nethash.c @@ -0,0 +1,497 @@ +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> + * @@ -6861,10 +6821,8 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_nethash.c + +module_init(ip_set_nethash_init); +module_exit(ip_set_nethash_fini); -Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_portmap.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/ipv4/netfilter/ip_set_portmap.c ++++ b/net/ipv4/netfilter/ip_set_portmap.c @@ -0,0 +1,346 @@ +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> + * @@ -7212,10 +7170,8 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/ip_set_portmap.c + +module_init(ip_set_portmap_init); +module_exit(ip_set_portmap_fini); -Index: linux-2.6.25.4/net/ipv4/netfilter/ipt_set.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/ipv4/netfilter/ipt_set.c ++++ b/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 +7333,8 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/ipt_set.c + +module_init(ipt_ipset_init); +module_exit(ipt_ipset_fini); -Index: linux-2.6.25.4/net/ipv4/netfilter/ipt_SET.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/ipv4/netfilter/ipt_SET.c ++++ b/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,11 +7515,9 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/ipt_SET.c + +module_init(ipt_SET_init); +module_exit(ipt_SET_fini); -Index: linux-2.6.25.4/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 +--- a/net/ipv4/netfilter/Kconfig ++++ b/net/ipv4/netfilter/Kconfig +@@ -385,5 +385,122 @@ Allows altering the ARP packet payload: source and destination hardware and network addresses. @@ -7688,11 +7640,9 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/Kconfig + endmenu -Index: linux-2.6.25.4/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 +--- a/net/ipv4/netfilter/Makefile ++++ b/net/ipv4/netfilter/Makefile +@@ -46,6 +46,7 @@ obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o @@ -7700,7 +7650,7 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/Makefile obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o -@@ -59,6 +60,18 @@ obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += i +@@ -59,6 +60,18 @@ obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o 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 41787ccfc5..ba6b5dc320 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,5 @@ -Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_time.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_time.h ++++ b/include/linux/netfilter_ipv4/ipt_time.h @@ -0,0 +1,18 @@ +#ifndef __ipt_time_h_included__ +#define __ipt_time_h_included__ @@ -21,10 +19,8 @@ Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_time.h + + +#endif /* __ipt_time_h_included__ */ -Index: linux-2.6.25.4/net/ipv4/netfilter/ipt_time.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/ipv4/netfilter/ipt_time.c ++++ b/net/ipv4/netfilter/ipt_time.c @@ -0,0 +1,180 @@ +/* + This is a module which is used for time matching @@ -206,11 +202,9 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/ipt_time.c + r->tm_mon=i; + r->tm_mday=work-__spm[i]+1; +} -Index: linux-2.6.25.4/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 +--- a/net/ipv4/netfilter/Kconfig ++++ b/net/ipv4/netfilter/Kconfig +@@ -63,6 +63,22 @@ help Module for matching traffic of various Peer-to-Peer applications @@ -233,11 +227,9 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/Kconfig config IP_NF_MATCH_RECENT tristate '"recent" match support' depends on IP_NF_IPTABLES -Index: linux-2.6.25.4/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 +--- a/net/ipv4/netfilter/Makefile ++++ b/net/ipv4/netfilter/Makefile +@@ -47,6 +47,7 @@ obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o 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 c3c5f8bada..f3c3735482 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,5 @@ -Index: linux-2.6.25.4/drivers/net/imq.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/drivers/net/imq.c ++++ b/drivers/net/imq.c @@ -0,0 +1,409 @@ +/* + * Pseudo-driver for the intermediate queue device. @@ -412,11 +410,9 @@ Index: linux-2.6.25.4/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.4/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 +--- a/drivers/net/Kconfig ++++ b/drivers/net/Kconfig +@@ -117,6 +117,129 @@ To compile this driver as a module, choose M here: the module will be called eql. If unsure, say N. @@ -546,11 +542,9 @@ Index: linux-2.6.25.4/drivers/net/Kconfig config TUN tristate "Universal TUN/TAP device driver support" select CRC32 -Index: linux-2.6.25.4/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 +--- a/drivers/net/Makefile ++++ b/drivers/net/Makefile +@@ -143,6 +143,7 @@ obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o obj-$(CONFIG_DUMMY) += dummy.o @@ -558,10 +552,8 @@ Index: linux-2.6.25.4/drivers/net/Makefile obj-$(CONFIG_IFB) += ifb.o obj-$(CONFIG_MACVLAN) += macvlan.o obj-$(CONFIG_DE600) += de600.o -Index: linux-2.6.25.4/include/linux/imq.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/imq.h ++++ b/include/linux/imq.h @@ -0,0 +1,9 @@ +#ifndef _IMQ_H +#define _IMQ_H @@ -572,10 +564,8 @@ Index: linux-2.6.25.4/include/linux/imq.h +#define IMQ_F_ENQUEUE 0x80 + +#endif /* _IMQ_H */ -Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_IMQ.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_IMQ.h ++++ b/include/linux/netfilter_ipv4/ipt_IMQ.h @@ -0,0 +1,8 @@ +#ifndef _IPT_IMQ_H +#define _IPT_IMQ_H @@ -585,10 +575,8 @@ Index: linux-2.6.25.4/include/linux/netfilter_ipv4/ipt_IMQ.h +}; + +#endif /* _IPT_IMQ_H */ -Index: linux-2.6.25.4/include/linux/netfilter_ipv6/ip6t_IMQ.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter_ipv6/ip6t_IMQ.h ++++ b/include/linux/netfilter_ipv6/ip6t_IMQ.h @@ -0,0 +1,8 @@ +#ifndef _IP6T_IMQ_H +#define _IP6T_IMQ_H @@ -598,11 +586,9 @@ Index: linux-2.6.25.4/include/linux/netfilter_ipv6/ip6t_IMQ.h +}; + +#endif /* _IP6T_IMQ_H */ -Index: linux-2.6.25.4/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 { +--- a/include/linux/skbuff.h ++++ b/include/linux/skbuff.h +@@ -296,6 +296,10 @@ struct nf_conntrack *nfct; struct sk_buff *nfct_reasm; #endif @@ -613,7 +599,7 @@ Index: linux-2.6.25.4/include/linux/skbuff.h #ifdef CONFIG_BRIDGE_NETFILTER struct nf_bridge_info *nf_bridge; #endif -@@ -1736,6 +1740,10 @@ static inline void __nf_copy(struct sk_b +@@ -1736,6 +1740,10 @@ dst->nfct_reasm = src->nfct_reasm; nf_conntrack_get_reasm(src->nfct_reasm); #endif @@ -624,10 +610,8 @@ Index: linux-2.6.25.4/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.4/net/core/dev.c -=================================================================== ---- linux-2.6.25.4.orig/net/core/dev.c -+++ linux-2.6.25.4/net/core/dev.c +--- a/net/core/dev.c ++++ b/net/core/dev.c @@ -95,6 +95,9 @@ #include <net/net_namespace.h> #include <net/sock.h> @@ -638,7 +622,7 @@ Index: linux-2.6.25.4/net/core/dev.c #include <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/stat.h> -@@ -1537,7 +1540,11 @@ static int dev_gso_segment(struct sk_buf +@@ -1537,7 +1540,11 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) { if (likely(!skb->next)) { @@ -651,10 +635,8 @@ Index: linux-2.6.25.4/net/core/dev.c dev_queue_xmit_nit(skb, dev); if (netif_needs_gso(dev, skb)) { -Index: linux-2.6.25.4/net/ipv4/netfilter/ipt_IMQ.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/ipv4/netfilter/ipt_IMQ.c ++++ b/net/ipv4/netfilter/ipt_IMQ.c @@ -0,0 +1,69 @@ +/* + * This target marks packets to be enqueued to an imq device @@ -725,11 +707,9 @@ Index: linux-2.6.25.4/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.4/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 +--- a/net/ipv4/netfilter/Kconfig ++++ b/net/ipv4/netfilter/Kconfig +@@ -315,6 +315,17 @@ To compile it as a module, choose M here. If unsure, say N. @@ -747,11 +727,9 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/Kconfig config IP_NF_TARGET_ECN tristate "ECN target support" depends on IP_NF_MANGLE -Index: linux-2.6.25.4/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 +--- a/net/ipv4/netfilter/Makefile ++++ b/net/ipv4/netfilter/Makefile +@@ -55,6 +55,7 @@ obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o @@ -759,10 +737,8 @@ Index: linux-2.6.25.4/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.4/net/ipv6/netfilter/ip6t_IMQ.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/ipv6/netfilter/ip6t_IMQ.c ++++ b/net/ipv6/netfilter/ip6t_IMQ.c @@ -0,0 +1,69 @@ +/* + * This target marks packets to be enqueued to an imq device @@ -833,11 +809,9 @@ Index: linux-2.6.25.4/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.4/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 +--- a/net/ipv6/netfilter/Kconfig ++++ b/net/ipv6/netfilter/Kconfig +@@ -179,6 +179,15 @@ To compile it as a module, choose M here. If unsure, say N. @@ -853,10 +827,8 @@ Index: linux-2.6.25.4/net/ipv6/netfilter/Kconfig config IP6_NF_TARGET_HL tristate 'HL (hoplimit) target support' depends on IP6_NF_MANGLE -Index: linux-2.6.25.4/net/ipv6/netfilter/Makefile -=================================================================== ---- linux-2.6.25.4.orig/net/ipv6/netfilter/Makefile -+++ linux-2.6.25.4/net/ipv6/netfilter/Makefile +--- a/net/ipv6/netfilter/Makefile ++++ b/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,11 +837,9 @@ Index: linux-2.6.25.4/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.4/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 +--- a/net/sched/sch_generic.c ++++ b/net/sched/sch_generic.c +@@ -182,6 +182,13 @@ 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 3acc1aadb0..d059973f2f 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,13 @@ -Index: linux-2.6.25.4/include/linux/netfilter/oot_conntrack.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter/oot_conntrack.h ++++ b/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.4/include/linux/netfilter/oot_trans.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter/oot_trans.h ++++ b/include/linux/netfilter/oot_trans.h @@ -0,0 +1,14 @@ +/* Out of tree workarounds */ +#include <linux/version.h> @@ -27,10 +23,8 @@ Index: linux-2.6.25.4/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.4/include/linux/netfilter/xt_CHAOS.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter/xt_CHAOS.h ++++ b/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 +40,8 @@ Index: linux-2.6.25.4/include/linux/netfilter/xt_CHAOS.h +}; + +#endif /* _LINUX_NETFILTER_XT_CHAOS_H */ -Index: linux-2.6.25.4/include/linux/netfilter/xt_portscan.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter/xt_portscan.h ++++ b/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 +51,8 @@ Index: linux-2.6.25.4/include/linux/netfilter/xt_portscan.h +}; + +#endif /* _LINUX_NETFILTER_XT_PORTSCAN_H */ -Index: linux-2.6.25.4/net/netfilter/find_match.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/netfilter/find_match.c ++++ b/net/netfilter/find_match.c @@ -0,0 +1,39 @@ +/* + xt_request_find_match @@ -103,11 +93,9 @@ Index: linux-2.6.25.4/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.4/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 +--- a/net/netfilter/Kconfig ++++ b/net/netfilter/Kconfig +@@ -276,6 +276,14 @@ # alphabetically ordered list of targets @@ -122,7 +110,7 @@ Index: linux-2.6.25.4/net/netfilter/Kconfig config NETFILTER_XT_TARGET_CLASSIFY tristate '"CLASSIFY" target support' depends on NETFILTER_XTABLES -@@ -305,6 +313,14 @@ config NETFILTER_XT_TARGET_CONNMARK +@@ -305,6 +313,14 @@ <file:Documentation/kbuild/modules.txt>. The module will be called ipt_CONNMARK.ko. If unsure, say `N'. @@ -137,7 +125,7 @@ Index: linux-2.6.25.4/net/netfilter/Kconfig config NETFILTER_XT_TARGET_DSCP tristate '"DSCP" and "TOS" target support' depends on NETFILTER_XTABLES -@@ -640,6 +656,14 @@ config NETFILTER_XT_MATCH_POLICY +@@ -640,6 +656,14 @@ To compile it as a module, choose M here. If unsure, say N. @@ -152,11 +140,9 @@ Index: linux-2.6.25.4/net/netfilter/Kconfig config NETFILTER_XT_MATCH_MULTIPORT tristate '"multiport" Multiple port match support' depends on NETFILTER_XTABLES -Index: linux-2.6.25.4/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 +--- a/net/netfilter/Makefile ++++ b/net/netfilter/Makefile +@@ -50,6 +50,8 @@ 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 @@ -165,15 +151,13 @@ Index: linux-2.6.25.4/net/netfilter/Makefile # matches obj-$(CONFIG_NETFILTER_XT_MATCH_COMMENT) += xt_comment.o -@@ -83,3 +85,4 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) +@@ -83,3 +85,4 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o obj-$(CONFIG_NETFILTER_XT_MATCH_TIME) += xt_time.o obj-$(CONFIG_NETFILTER_XT_MATCH_U32) += xt_u32.o +obj-$(CONFIG_NETFILTER_XT_MATCH_PORTSCAN) += xt_portscan.o -Index: linux-2.6.25.4/net/netfilter/xt_CHAOS.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/netfilter/xt_CHAOS.c ++++ b/net/netfilter/xt_CHAOS.c @@ -0,0 +1,200 @@ +/* + * CHAOS target for netfilter @@ -375,10 +359,8 @@ Index: linux-2.6.25.4/net/netfilter/xt_CHAOS.c +MODULE_DESCRIPTION("netfilter \"CHAOS\" target"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("ipt_CHAOS"); -Index: linux-2.6.25.4/net/netfilter/xt_DELUDE.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/netfilter/xt_DELUDE.c ++++ b/net/netfilter/xt_DELUDE.c @@ -0,0 +1,197 @@ +/* + * DELUDE target @@ -577,10 +559,8 @@ Index: linux-2.6.25.4/net/netfilter/xt_DELUDE.c +MODULE_DESCRIPTION("netfilter \"DELUDE\" target"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("ipt_DELUDE"); -Index: linux-2.6.25.4/net/netfilter/xt_portscan.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/netfilter/xt_portscan.c ++++ b/net/netfilter/xt_portscan.c @@ -0,0 +1,269 @@ +/* + * portscan match for netfilter @@ -851,11 +831,9 @@ Index: linux-2.6.25.4/net/netfilter/xt_portscan.c +MODULE_DESCRIPTION("netfilter \"portscan\" match"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("ipt_portscan"); -Index: linux-2.6.25.4/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 +--- a/drivers/char/random.c ++++ b/drivers/char/random.c +@@ -1563,6 +1563,8 @@ 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 7add5f5b93..8575368699 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,8 +1,6 @@ -Index: linux-2.6.25.4/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 +--- a/net/netfilter/Kconfig ++++ b/net/netfilter/Kconfig +@@ -437,6 +437,23 @@ To compile it as a module, choose M here. If unsure, say N. @@ -26,11 +24,9 @@ Index: linux-2.6.25.4/net/netfilter/Kconfig config NETFILTER_XT_TARGET_TCPMSS tristate '"TCPMSS" target support' depends on NETFILTER_XTABLES && (IPV6 || IPV6=n) -Index: linux-2.6.25.4/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 +--- a/net/netfilter/Makefile ++++ b/net/netfilter/Makefile +@@ -47,6 +47,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK) += xt_NOTRACK.o obj-$(CONFIG_NETFILTER_XT_TARGET_RATEEST) += xt_RATEEST.o obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK) += xt_SECMARK.o @@ -38,10 +34,8 @@ Index: linux-2.6.25.4/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.4/net/netfilter/xt_TARPIT.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/netfilter/xt_TARPIT.c ++++ b/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 9a49199f0c..dbdcf39e7b 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,8 +1,6 @@ -Index: linux-2.6.25.4/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 +--- a/net/netfilter/Kconfig ++++ b/net/netfilter/Kconfig +@@ -145,7 +145,7 @@ config NF_CONNTRACK_H323 tristate "H.323 protocol support" @@ -11,7 +9,7 @@ Index: linux-2.6.25.4/net/netfilter/Kconfig depends on NETFILTER_ADVANCED help H.323 is a VoIP signalling protocol from ITU-T. As one of the most -@@ -456,7 +456,7 @@ config NETFILTER_XT_TARGET_TARPIT +@@ -456,7 +456,7 @@ config NETFILTER_XT_TARGET_TCPMSS tristate '"TCPMSS" target support' diff --git a/target/linux/generic-2.6/patches-2.6.25/190-netfilter_rtsp.patch b/target/linux/generic-2.6/patches-2.6.25/190-netfilter_rtsp.patch index 1859ff1e6e..ead8cb2be4 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,5 @@ -Index: linux-2.6.25.4/include/linux/netfilter/nf_conntrack_rtsp.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter/nf_conntrack_rtsp.h ++++ b/include/linux/netfilter/nf_conntrack_rtsp.h @@ -0,0 +1,63 @@ +/* + * RTSP extension for IP connection tracking. @@ -66,10 +64,8 @@ Index: linux-2.6.25.4/include/linux/netfilter/nf_conntrack_rtsp.h +#endif /* __KERNEL__ */ + +#endif /* _IP_CONNTRACK_RTSP_H */ -Index: linux-2.6.25.4/include/linux/netfilter_helpers.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter_helpers.h ++++ b/include/linux/netfilter_helpers.h @@ -0,0 +1,133 @@ +/* + * Helpers for netfiler modules. This file provides implementations for basic @@ -204,10 +200,8 @@ Index: linux-2.6.25.4/include/linux/netfilter_helpers.h +#endif /* __KERNEL__ */ + +#endif /* _NETFILTER_HELPERS_H */ -Index: linux-2.6.25.4/include/linux/netfilter_mime.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/netfilter_mime.h ++++ b/include/linux/netfilter_mime.h @@ -0,0 +1,89 @@ +/* + * MIME functions for netfilter modules. This file provides implementations @@ -298,11 +292,9 @@ Index: linux-2.6.25.4/include/linux/netfilter_mime.h +#endif /* __KERNEL__ */ + +#endif /* _NETFILTER_MIME_H */ -Index: linux-2.6.25.4/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 +--- a/net/ipv4/netfilter/Makefile ++++ b/net/ipv4/netfilter/Makefile +@@ -23,6 +23,7 @@ obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o @@ -310,11 +302,9 @@ Index: linux-2.6.25.4/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.4/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 +--- a/net/netfilter/Kconfig ++++ b/net/netfilter/Kconfig +@@ -258,6 +258,16 @@ To compile it as a module, choose M here. If unsure, say N. @@ -331,11 +321,9 @@ Index: linux-2.6.25.4/net/netfilter/Kconfig config NF_CT_NETLINK tristate 'Connection tracking netlink interface' depends on NF_CONNTRACK -Index: linux-2.6.25.4/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 +--- a/net/netfilter/Makefile ++++ b/net/netfilter/Makefile +@@ -32,6 +32,7 @@ obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o @@ -343,11 +331,9 @@ Index: linux-2.6.25.4/net/netfilter/Makefile # generic X tables obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o -Index: linux-2.6.25.4/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 +--- a/net/ipv4/netfilter/Kconfig ++++ b/net/ipv4/netfilter/Kconfig +@@ -277,6 +277,11 @@ depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT default NF_NAT && NF_CONNTRACK_IRC @@ -359,10 +345,8 @@ Index: linux-2.6.25.4/net/ipv4/netfilter/Kconfig config NF_NAT_TFTP tristate depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT -Index: linux-2.6.25.4/net/netfilter/nf_conntrack_rtsp.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/netfilter/nf_conntrack_rtsp.c ++++ b/net/netfilter/nf_conntrack_rtsp.c @@ -0,0 +1,513 @@ +/* + * RTSP extension for IP connection tracking @@ -877,10 +861,8 @@ Index: linux-2.6.25.4/net/netfilter/nf_conntrack_rtsp.c + +EXPORT_SYMBOL(nf_nat_rtsp_hook_expectfn); + -Index: linux-2.6.25.4/net/ipv4/netfilter/nf_nat_rtsp.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/ipv4/netfilter/nf_nat_rtsp.c ++++ b/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 ac39a8c72f..1dfd95e82b 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,8 +1,6 @@ -Index: linux-2.6.25.4/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 +--- a/include/linux/pkt_sched.h ++++ b/include/linux/pkt_sched.h +@@ -162,8 +162,37 @@ * * The only reason for this is efficiency, it is possible * to change these parameters in compile time. @@ -40,11 +38,9 @@ Index: linux-2.6.25.4/include/linux/pkt_sched.h /* RED section */ enum -Index: linux-2.6.25.4/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 +--- a/net/sched/Kconfig ++++ b/net/sched/Kconfig +@@ -139,6 +139,37 @@ To compile this code as a module, choose M here: the module will be called sch_sfq. @@ -82,11 +78,9 @@ Index: linux-2.6.25.4/net/sched/Kconfig config NET_SCH_TEQL tristate "True Link Equalizer (TEQL)" ---help--- -Index: linux-2.6.25.4/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 +--- a/net/sched/Makefile ++++ b/net/sched/Makefile +@@ -23,6 +23,7 @@ obj-$(CONFIG_NET_SCH_INGRESS) += sch_ingress.o obj-$(CONFIG_NET_SCH_DSMARK) += sch_dsmark.o obj-$(CONFIG_NET_SCH_SFQ) += sch_sfq.o @@ -94,10 +88,8 @@ Index: linux-2.6.25.4/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.4/net/sched/sch_esfq.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/net/sched/sch_esfq.c ++++ b/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 165c0cb867..cd961e5a83 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,8 +1,6 @@ -Index: linux-2.6.25.4/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/ +--- a/arch/mips/Makefile ++++ b/arch/mips/Makefile +@@ -593,6 +593,9 @@ 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 787ac6d218..5053401f11 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,8 +1,6 @@ -Index: linux-2.6.25.4/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 +--- a/fs/jffs2/build.c ++++ b/fs/jffs2/build.c +@@ -105,6 +105,17 @@ dbg_fsbuild("scanned flash completely\n"); jffs2_dbg_dump_block_lists_nolock(c); @@ -20,11 +18,9 @@ Index: linux-2.6.25.4/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.4/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 +--- a/fs/jffs2/scan.c ++++ b/fs/jffs2/scan.c +@@ -142,9 +142,12 @@ /* reset summary info for next eraseblock scan */ jffs2_sum_reset_collected(s); @@ -40,7 +36,7 @@ Index: linux-2.6.25.4/fs/jffs2/scan.c if (ret < 0) goto out; -@@ -545,6 +548,17 @@ static int jffs2_scan_eraseblock (struct +@@ -545,6 +548,17 @@ return err; } diff --git a/target/linux/generic-2.6/patches-2.6.25/207-powerpc_asm_segment_h.patch b/target/linux/generic-2.6/patches-2.6.25/207-powerpc_asm_segment_h.patch index 55bc40eb82..1272e82c75 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,5 @@ -Index: linux-2.6.25.4/include/asm-powerpc/segment.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/asm-powerpc/segment.h ++++ b/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 3a377c2e87..2339bd2625 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,8 +1,6 @@ -Index: linux-2.6.25.4/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 { +--- a/drivers/net/r8169.c ++++ b/drivers/net/r8169.c +@@ -1537,7 +1537,7 @@ .hw_start = rtl_hw_start_8169, .region = 1, .align = 0, @@ -11,7 +9,7 @@ Index: linux-2.6.25.4/drivers/net/r8169.c RxFIFOOver | TxErr | TxOK | RxOK | RxErr, .napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow, .msi = 0 -@@ -1546,7 +1546,7 @@ static const struct rtl_cfg_info { +@@ -1546,7 +1546,7 @@ .hw_start = rtl_hw_start_8168, .region = 2, .align = 8, @@ -20,7 +18,7 @@ Index: linux-2.6.25.4/drivers/net/r8169.c TxErr | TxOK | RxOK | RxErr, .napi_event = TxErr | TxOK | RxOK | RxOverflow, .msi = RTL_FEATURE_MSI -@@ -1555,7 +1555,7 @@ static const struct rtl_cfg_info { +@@ -1555,7 +1555,7 @@ .hw_start = rtl_hw_start_8101, .region = 2, .align = 8, @@ -29,7 +27,7 @@ Index: linux-2.6.25.4/drivers/net/r8169.c RxFIFOOver | TxErr | TxOK | RxOK | RxErr, .napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow, .msi = RTL_FEATURE_MSI -@@ -2903,10 +2903,12 @@ static irqreturn_t rtl8169_interrupt(int +@@ -2903,10 +2903,12 @@ break; } diff --git a/target/linux/generic-2.6/patches-2.6.25/209-mini_fo.patch b/target/linux/generic-2.6/patches-2.6.25/209-mini_fo.patch index 9ff09b3b35..9b585463b7 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,8 +1,6 @@ -Index: linux-2.6.25.4/fs/Kconfig -=================================================================== ---- linux-2.6.25.4.orig/fs/Kconfig -+++ linux-2.6.25.4/fs/Kconfig -@@ -1449,6 +1449,9 @@ config VXFS_FS +--- a/fs/Kconfig ++++ b/fs/Kconfig +@@ -1449,6 +1449,9 @@ To compile this as a module, choose M here: the module will be called freevxfs. If unsure, say N. @@ -12,11 +10,9 @@ Index: linux-2.6.25.4/fs/Kconfig config MINIX_FS tristate "Minix file system support" depends on BLOCK -Index: linux-2.6.25.4/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/ +--- a/fs/Makefile ++++ b/fs/Makefile +@@ -77,6 +77,7 @@ obj-y += ramfs/ obj-$(CONFIG_HUGETLBFS) += hugetlbfs/ obj-$(CONFIG_CODA_FS) += coda/ @@ -24,10 +20,8 @@ Index: linux-2.6.25.4/fs/Makefile obj-$(CONFIG_MINIX_FS) += minix/ obj-$(CONFIG_FAT_FS) += fat/ obj-$(CONFIG_MSDOS_FS) += msdos/ -Index: linux-2.6.25.4/fs/mini_fo/aux.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/fs/mini_fo/aux.c ++++ b/fs/mini_fo/aux.c @@ -0,0 +1,577 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -606,10 +600,8 @@ Index: linux-2.6.25.4/fs/mini_fo/aux.c + +#endif /* unused */ + -Index: linux-2.6.25.4/fs/mini_fo/ChangeLog -=================================================================== --- /dev/null -+++ linux-2.6.25.4/fs/mini_fo/ChangeLog ++++ b/fs/mini_fo/ChangeLog @@ -0,0 +1,281 @@ +2006-01-24 Markus Klotzbuecher <mk@mary.denx.de> + @@ -892,10 +884,8 @@ Index: linux-2.6.25.4/fs/mini_fo/ChangeLog + * Implementation of mini_fo_mknod and mini_fo_rename, support + for device files. + -Index: linux-2.6.25.4/fs/mini_fo/dentry.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/fs/mini_fo/dentry.c ++++ b/fs/mini_fo/dentry.c @@ -0,0 +1,244 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -1141,10 +1131,8 @@ Index: linux-2.6.25.4/fs/mini_fo/dentry.c + d_delete: mini_fo_d_delete, + d_iput: mini_fo_d_iput, +}; -Index: linux-2.6.25.4/fs/mini_fo/file.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/fs/mini_fo/file.c ++++ b/fs/mini_fo/file.c @@ -0,0 +1,713 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -1859,10 +1847,8 @@ Index: linux-2.6.25.4/fs/mini_fo/file.c + /* not implemented: sendpage */ + /* not implemented: get_unmapped_area */ + }; -Index: linux-2.6.25.4/fs/mini_fo/fist.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/fs/mini_fo/fist.h ++++ b/fs/mini_fo/fist.h @@ -0,0 +1,252 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -2116,10 +2102,8 @@ Index: linux-2.6.25.4/fs/mini_fo/fist.h +# define FIST_IOCTL_SET_DEBUG_VALUE _IOW(0x15, 2, int) + +#endif /* not __FIST_H_ */ -Index: linux-2.6.25.4/fs/mini_fo/inode.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/fs/mini_fo/inode.c ++++ b/fs/mini_fo/inode.c @@ -0,0 +1,1564 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -3685,10 +3669,8 @@ Index: linux-2.6.25.4/fs/mini_fo/inode.c + removexattr: mini_fo_removexattr +# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */ + }; -Index: linux-2.6.25.4/fs/mini_fo/main.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/fs/mini_fo/main.c ++++ b/fs/mini_fo/main.c @@ -0,0 +1,423 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -4113,10 +4095,8 @@ Index: linux-2.6.25.4/fs/mini_fo/main.c + +module_init(init_mini_fo_fs) +module_exit(exit_mini_fo_fs) -Index: linux-2.6.25.4/fs/mini_fo/Makefile -=================================================================== --- /dev/null -+++ linux-2.6.25.4/fs/mini_fo/Makefile ++++ b/fs/mini_fo/Makefile @@ -0,0 +1,17 @@ +# +# Makefile for mini_fo 2.4 and 2.6 Linux kernels @@ -4135,10 +4115,8 @@ Index: linux-2.6.25.4/fs/mini_fo/Makefile +# dependencies +${mini_fo-objs}: mini_fo.h fist.h + -Index: linux-2.6.25.4/fs/mini_fo/meta.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/fs/mini_fo/meta.c ++++ b/fs/mini_fo/meta.c @@ -0,0 +1,1000 @@ +/* + * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de> @@ -5140,10 +5118,8 @@ Index: linux-2.6.25.4/fs/mini_fo/meta.c + return 0; +} + -Index: linux-2.6.25.4/fs/mini_fo/mini_fo.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/fs/mini_fo/mini_fo.h ++++ b/fs/mini_fo/mini_fo.h @@ -0,0 +1,510 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -5655,10 +5631,8 @@ Index: linux-2.6.25.4/fs/mini_fo/mini_fo.h +/* ioctls */ + +#endif /* not __MINI_FO_H_ */ -Index: linux-2.6.25.4/fs/mini_fo/mini_fo-merge -=================================================================== --- /dev/null -+++ linux-2.6.25.4/fs/mini_fo/mini_fo-merge ++++ b/fs/mini_fo/mini_fo-merge @@ -0,0 +1,180 @@ +#!/bin/bash +# @@ -5840,10 +5814,8 @@ Index: linux-2.6.25.4/fs/mini_fo/mini_fo-merge +#rm $TMP/$SKIP_DEL_LIST + +echo "Done!" -Index: linux-2.6.25.4/fs/mini_fo/mini_fo-overlay -=================================================================== --- /dev/null -+++ linux-2.6.25.4/fs/mini_fo/mini_fo-overlay ++++ b/fs/mini_fo/mini_fo-overlay @@ -0,0 +1,130 @@ +#!/bin/bash +# @@ -5975,10 +5947,8 @@ Index: linux-2.6.25.4/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.4/fs/mini_fo/mmap.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/fs/mini_fo/mmap.c ++++ b/fs/mini_fo/mmap.c @@ -0,0 +1,637 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -6617,10 +6587,8 @@ Index: linux-2.6.25.4/fs/mini_fo/mmap.c + print_exit_status(err); + return err; +} -Index: linux-2.6.25.4/fs/mini_fo/README -=================================================================== --- /dev/null -+++ linux-2.6.25.4/fs/mini_fo/README ++++ b/fs/mini_fo/README @@ -0,0 +1,163 @@ +README for the mini_fo overlay file system +========================================= @@ -6785,10 +6753,8 @@ Index: linux-2.6.25.4/fs/mini_fo/README +2 of the License, or (at your option) any later version. + + -Index: linux-2.6.25.4/fs/mini_fo/RELEASE_NOTES -=================================================================== --- /dev/null -+++ linux-2.6.25.4/fs/mini_fo/RELEASE_NOTES ++++ b/fs/mini_fo/RELEASE_NOTES @@ -0,0 +1,111 @@ +Release: mini_fo-0.6.1 (v0-6-1) +Date: 21.09.2005 @@ -6901,10 +6867,8 @@ Index: linux-2.6.25.4/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.4/fs/mini_fo/state.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/fs/mini_fo/state.c ++++ b/fs/mini_fo/state.c @@ -0,0 +1,620 @@ +/* + * Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de> @@ -7526,10 +7490,8 @@ Index: linux-2.6.25.4/fs/mini_fo/state.c + return err; +} + -Index: linux-2.6.25.4/fs/mini_fo/super.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/fs/mini_fo/super.c ++++ b/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 bb83133b34..22ca3900e9 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,8 +1,6 @@ -Index: linux-2.6.25.4/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 +--- a/fs/mini_fo/main.c ++++ b/fs/mini_fo/main.c +@@ -79,6 +79,7 @@ * of the new inode's fields */ @@ -10,7 +8,7 @@ Index: linux-2.6.25.4/fs/mini_fo/main.c /* * original: inode = iget(sb, hidden_inode->i_ino); */ -@@ -87,6 +88,13 @@ mini_fo_tri_interpose(dentry_t *hidden_d +@@ -87,6 +88,13 @@ err = -EACCES; /* should be impossible??? */ goto out; } @@ -24,7 +22,7 @@ Index: linux-2.6.25.4/fs/mini_fo/main.c /* * interpose the inode if not already interposed -@@ -184,9 +192,9 @@ mini_fo_parse_options(super_block_t *sb, +@@ -184,9 +192,9 @@ hidden_root = ERR_PTR(err); goto out; } @@ -37,7 +35,7 @@ Index: linux-2.6.25.4/fs/mini_fo/main.c } else if(!strncmp("sto=", options, 4)) { /* parse the storage dir */ -@@ -204,9 +212,9 @@ mini_fo_parse_options(super_block_t *sb, +@@ -204,9 +212,9 @@ hidden_root2 = ERR_PTR(err); goto out; } @@ -50,11 +48,9 @@ Index: linux-2.6.25.4/fs/mini_fo/main.c stohs2(sb) = hidden_root2->d_sb; /* validate storage dir, this is done in -Index: linux-2.6.25.4/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_ +--- a/fs/mini_fo/mini_fo.h ++++ b/fs/mini_fo/mini_fo.h +@@ -302,6 +302,10 @@ extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt, dentry_t *src_dentry, struct vfsmount *src_mnt); @@ -65,7 +61,7 @@ Index: linux-2.6.25.4/fs/mini_fo/mini_fo.h #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd); -@@ -501,6 +505,29 @@ static inline void double_unlock(struct +@@ -501,6 +505,29 @@ #endif /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */ #endif /* __KERNEL__ */ @@ -95,11 +91,9 @@ Index: linux-2.6.25.4/fs/mini_fo/mini_fo.h /* * Definitions for user and kernel code */ -Index: linux-2.6.25.4/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) +--- a/fs/mini_fo/super.c ++++ b/fs/mini_fo/super.c +@@ -262,10 +262,31 @@ } #endif @@ -131,11 +125,9 @@ Index: linux-2.6.25.4/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.4/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, +--- a/fs/mini_fo/aux.c ++++ b/fs/mini_fo/aux.c +@@ -164,11 +164,11 @@ err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd); /* validate */ 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 a9e42ac07a..14a9f37666 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,8 +1,6 @@ -Index: linux-2.6.25.4/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, +--- a/fs/mini_fo/meta.c ++++ b/fs/mini_fo/meta.c +@@ -442,6 +442,11 @@ S_IRUSR | S_IWUSR); #endif } @@ -14,7 +12,7 @@ Index: linux-2.6.25.4/fs/mini_fo/meta.c /* open META-file for writing */ meta_file = dentry_open(meta_dentry, meta_mnt, 0x1); if(!meta_file || IS_ERR(meta_file)) { -@@ -535,6 +540,11 @@ int meta_write_r_entry(dentry_t *dentry, +@@ -535,6 +540,11 @@ meta_dentry, S_IRUSR | S_IWUSR); #endif } @@ -26,7 +24,7 @@ Index: linux-2.6.25.4/fs/mini_fo/meta.c /* open META-file for writing */ meta_file = dentry_open(meta_dentry, meta_mnt, 0x1); if(!meta_file || IS_ERR(meta_file)) { -@@ -671,14 +681,16 @@ int meta_sync_d_list(dentry_t *dentry, i +@@ -671,14 +681,16 @@ } } @@ -46,7 +44,7 @@ Index: linux-2.6.25.4/fs/mini_fo/meta.c dput(meta_dentry); err = -1; goto out; -@@ -811,14 +823,16 @@ int meta_sync_r_list(dentry_t *dentry, i +@@ -811,14 +823,16 @@ } } 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 4d90fc0f6d..2711366795 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,8 +1,6 @@ -Index: linux-2.6.25.4/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; +--- a/lib/kobject_uevent.c ++++ b/lib/kobject_uevent.c +@@ -27,7 +27,8 @@ char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH; static DEFINE_SPINLOCK(sequence_lock); #if defined(CONFIG_NET) @@ -12,7 +10,7 @@ Index: linux-2.6.25.4/lib/kobject_uevent.c #endif /* the strings here must match the enum in include/linux/kobject.h */ -@@ -40,6 +41,18 @@ static const char *kobject_actions[] = { +@@ -40,6 +41,18 @@ [KOBJ_OFFLINE] = "offline", }; @@ -31,7 +29,7 @@ Index: linux-2.6.25.4/lib/kobject_uevent.c /** * kobject_action_type - translate action string to numeric type * -@@ -192,9 +205,7 @@ int kobject_uevent_env(struct kobject *k +@@ -192,9 +205,7 @@ kobj->state_remove_uevent_sent = 1; /* we will send an event, so request a new sequence number */ 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 e2f83a7581..c052f2ad29 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,8 +1,6 @@ -Index: linux-2.6.25.4/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 +--- a/sound/core/Kconfig ++++ b/sound/core/Kconfig +@@ -9,7 +9,7 @@ depends on SND config SND_HWDEP diff --git a/target/linux/generic-2.6/patches-2.6.25/400-ledtrig_morse.patch b/target/linux/generic-2.6/patches-2.6.25/400-ledtrig_morse.patch index b9a352abef..2e1f8b8b38 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,8 +1,6 @@ -Index: linux-2.6.25.4/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 +--- a/drivers/leds/Kconfig ++++ b/drivers/leds/Kconfig +@@ -181,4 +181,8 @@ load average. If unsure, say Y. @@ -11,11 +9,9 @@ Index: linux-2.6.25.4/drivers/leds/Kconfig + depends on LEDS_TRIGGERS + endif # NEW_LEDS -Index: linux-2.6.25.4/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. +--- a/drivers/leds/Makefile ++++ b/drivers/leds/Makefile +@@ -26,3 +26,4 @@ obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK) += ledtrig-ide-disk.o obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += ledtrig-heartbeat.o diff --git a/target/linux/generic-2.6/patches-2.6.25/401-led_alix.patch b/target/linux/generic-2.6/patches-2.6.25/401-led_alix.patch index ec96c23ae2..7216683048 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,8 +1,6 @@ -Index: linux-2.6.25.4/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 +--- a/drivers/leds/Kconfig ++++ b/drivers/leds/Kconfig +@@ -79,6 +79,12 @@ help This option enables support for the PCEngines WRAP programmable LEDs. @@ -15,11 +13,9 @@ Index: linux-2.6.25.4/drivers/leds/Kconfig config LEDS_H1940 tristate "LED Support for iPAQ H1940 device" depends on LEDS_CLASS && ARCH_H1940 -Index: linux-2.6.25.4/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 +--- a/drivers/leds/Makefile ++++ b/drivers/leds/Makefile +@@ -14,6 +14,7 @@ obj-$(CONFIG_LEDS_AMS_DELTA) += leds-ams-delta.o obj-$(CONFIG_LEDS_NET48XX) += leds-net48xx.o obj-$(CONFIG_LEDS_WRAP) += leds-wrap.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 83d1cf6fef..b1f8c5076e 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,8 +1,6 @@ -Index: linux-2.6.25.4/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 +--- a/drivers/leds/Kconfig ++++ b/drivers/leds/Kconfig +@@ -191,4 +191,11 @@ tristate "LED Morse Trigger" depends on LEDS_TRIGGERS @@ -14,11 +12,9 @@ Index: linux-2.6.25.4/drivers/leds/Kconfig + If unsure, say Y. + endif # NEW_LEDS -Index: linux-2.6.25.4/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 +--- a/drivers/leds/Makefile ++++ b/drivers/leds/Makefile +@@ -28,3 +28,4 @@ obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK) += ledtrig-ide-disk.o obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += ledtrig-heartbeat.o obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o diff --git a/target/linux/generic-2.6/patches-2.6.25/403-ds1672_detect.patch b/target/linux/generic-2.6/patches-2.6.25/403-ds1672_detect.patch index 5c75c51cf1..86c26346a8 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,5 @@ -Index: linux-2.6.25.4/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 +--- a/drivers/rtc/rtc-ds1672.c ++++ b/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 45e8448f25..6ae2cd7df5 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,8 +1,6 @@ -Index: linux-2.6.25.4/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 +--- a/drivers/input/misc/Kconfig ++++ b/drivers/input/misc/Kconfig +@@ -197,4 +197,20 @@ Say Y here if you want to support the built-in real time clock of the HP SDC controller. @@ -23,11 +21,9 @@ Index: linux-2.6.25.4/drivers/input/misc/Kconfig + module will be called gpio-buttons. + endif -Index: linux-2.6.25.4/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. +--- a/drivers/input/misc/Makefile ++++ b/drivers/input/misc/Makefile +@@ -19,3 +19,4 @@ obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o obj-$(CONFIG_INPUT_UINPUT) += uinput.o obj-$(CONFIG_INPUT_APANEL) += apanel.o diff --git a/target/linux/generic-2.6/patches-2.6.25/420-gpiodev.patch b/target/linux/generic-2.6/patches-2.6.25/420-gpiodev.patch index ea7c244557..5eecc61ae5 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,6 +1,5 @@ -diff -Nur linux-2.6.25/drivers/char/Kconfig linux-2.6.25-owrt/drivers/char/Kconfig ---- linux-2.6.25/drivers/char/Kconfig 2008-05-15 17:00:12.000000000 +0200 -+++ linux-2.6.25-owrt/drivers/char/Kconfig 2008-05-30 11:58:39.000000000 +0200 +--- a/drivers/char/Kconfig ++++ b/drivers/char/Kconfig @@ -955,6 +955,13 @@ If compiled as a module, it will be called cs5535_gpio. @@ -15,9 +14,8 @@ diff -Nur linux-2.6.25/drivers/char/Kconfig linux-2.6.25-owrt/drivers/char/Kconf config GPIO_VR41XX tristate "NEC VR4100 series General-purpose I/O Unit support" depends on CPU_VR41XX -diff -Nur linux-2.6.25/drivers/char/Makefile linux-2.6.25-owrt/drivers/char/Makefile ---- linux-2.6.25/drivers/char/Makefile 2008-05-15 17:00:12.000000000 +0200 -+++ linux-2.6.25-owrt/drivers/char/Makefile 2008-05-30 11:57:33.000000000 +0200 +--- a/drivers/char/Makefile ++++ b/drivers/char/Makefile @@ -94,6 +94,7 @@ obj-$(CONFIG_PC8736x_GPIO) += pc8736x_gpio.o obj-$(CONFIG_NSC_GPIO) += nsc_gpio.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 ea56fae18d..e0f1a9befb 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,8 +1,6 @@ -Index: linux-2.6.25.4/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 +--- a/fs/Kconfig ++++ b/fs/Kconfig +@@ -421,6 +421,7 @@ source "fs/xfs/Kconfig" source "fs/gfs2/Kconfig" @@ -10,11 +8,9 @@ Index: linux-2.6.25.4/fs/Kconfig config OCFS2_FS tristate "OCFS2 file system support" -Index: linux-2.6.25.4/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/ +--- a/fs/Makefile ++++ b/fs/Makefile +@@ -121,3 +121,4 @@ obj-$(CONFIG_DEBUG_FS) += debugfs/ obj-$(CONFIG_OCFS2_FS) += ocfs2/ obj-$(CONFIG_GFS2_FS) += gfs2/ diff --git a/target/linux/generic-2.6/patches-2.6.25/511-yaffs_2.6.25_fix.patch b/target/linux/generic-2.6/patches-2.6.25/511-yaffs_2.6.25_fix.patch index 83db1b8a2e..ac895342f6 100644 --- a/target/linux/generic-2.6/patches-2.6.25/511-yaffs_2.6.25_fix.patch +++ b/target/linux/generic-2.6/patches-2.6.25/511-yaffs_2.6.25_fix.patch @@ -1,8 +1,6 @@ -Index: linux-2.6.25.4/fs/yaffs2/yaffs_fs.c -=================================================================== ---- linux-2.6.25.4.orig/fs/yaffs2/yaffs_fs.c -+++ linux-2.6.25.4/fs/yaffs2/yaffs_fs.c -@@ -181,7 +181,13 @@ static int yaffs_statfs(struct super_blo +--- a/fs/yaffs2/yaffs_fs.c ++++ b/fs/yaffs2/yaffs_fs.c +@@ -181,7 +181,13 @@ #else static int yaffs_statfs(struct super_block *sb, struct statfs *buf); #endif @@ -13,11 +11,11 @@ Index: linux-2.6.25.4/fs/yaffs2/yaffs_fs.c static void yaffs_read_inode(struct inode *inode); +#endif + - + static void yaffs_put_inode(struct inode *inode); static void yaffs_delete_inode(struct inode *); -@@ -284,7 +290,9 @@ static struct file_operations yaffs_dir_ - +@@ -284,7 +290,9 @@ + static struct super_operations yaffs_super_ops = { .statfs = yaffs_statfs, +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)) @@ -26,28 +24,28 @@ Index: linux-2.6.25.4/fs/yaffs2/yaffs_fs.c .put_inode = yaffs_put_inode, .put_super = yaffs_put_super, .delete_inode = yaffs_delete_inode, -@@ -844,11 +852,17 @@ struct inode *yaffs_get_inode(struct sup +@@ -844,11 +852,17 @@ T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_get_inode for object %d\n", obj->objectId)); - + +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) + inode = yaffs_iget(sb, obj->objectId); + if (IS_ERR(inode)) + return NULL; +#else inode = iget(sb, obj->objectId); - + /* NB Side effect: iget calls back to yaffs_read_inode(). */ /* iget also increments the inode's i_count */ /* NB You can't be holding grossLock or deadlock will happen! */ +#endif - + return inode; } -@@ -1427,6 +1441,39 @@ static int yaffs_sync_fs(struct super_bl +@@ -1427,6 +1441,39 @@ } - - + + +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) +static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino) +{ @@ -84,11 +82,11 @@ Index: linux-2.6.25.4/fs/yaffs2/yaffs_fs.c static void yaffs_read_inode(struct inode *inode) { /* NB This is called as a side effect of other functions, but -@@ -1448,6 +1495,7 @@ static void yaffs_read_inode(struct inod - +@@ -1448,6 +1495,7 @@ + yaffs_GrossUnlock(dev); } +#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) */ - + static LIST_HEAD(yaffs_dev_list); - + 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 9358a18f78..6ac585eeff 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,8 +1,6 @@ -Index: linux-2.6.25.4/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 * +--- a/drivers/net/phy/phy.c ++++ b/drivers/net/phy/phy.c +@@ -348,6 +348,50 @@ } EXPORT_SYMBOL(phy_ethtool_gset); @@ -53,11 +51,9 @@ Index: linux-2.6.25.4/drivers/net/phy/phy.c /** * phy_mii_ioctl - generic PHY MII ioctl interface * @phydev: the phy_device struct -Index: linux-2.6.25.4/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 +--- a/include/linux/phy.h ++++ b/include/linux/phy.h +@@ -399,6 +399,7 @@ void phy_stop_machine(struct phy_device *phydev); int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd); int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd); diff --git a/target/linux/generic-2.6/patches-2.6.25/610-phy_detect.patch b/target/linux/generic-2.6/patches-2.6.25/610-phy_detect.patch index 6fb6852d8a..cda40d88be 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,6 @@ -Index: linux-2.6.25.4/drivers/net/phy/mdio_bus.c -=================================================================== ---- 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 +--- a/drivers/net/phy/mdio_bus.c ++++ b/drivers/net/phy/mdio_bus.c +@@ -132,6 +132,9 @@ struct phy_device *phydev = to_phy_device(dev); struct phy_driver *phydrv = to_phy_driver(drv); @@ -12,11 +10,9 @@ Index: linux-2.6.25.4/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.4/include/linux/phy.h -=================================================================== ---- 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 { +--- a/include/linux/phy.h ++++ b/include/linux/phy.h +@@ -325,6 +325,11 @@ 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 fda414a171..46e6bf34b6 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,6 @@ -Index: linux-2.6.25.4/drivers/net/phy/Kconfig -=================================================================== ---- 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 +--- a/drivers/net/phy/Kconfig ++++ b/drivers/net/phy/Kconfig +@@ -65,6 +65,11 @@ ---help--- Supports the Realtek 821x PHY. @@ -14,11 +12,9 @@ Index: linux-2.6.25.4/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.4/drivers/net/phy/Makefile -=================================================================== ---- 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 +--- a/drivers/net/phy/Makefile ++++ b/drivers/net/phy/Makefile +@@ -12,6 +12,7 @@ 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 e5947e13ec..22654db8fb 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,8 +1,6 @@ -Index: linux-2.6.25.4/drivers/net/phy/phy_device.c -=================================================================== ---- 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 +--- a/drivers/net/phy/phy_device.c ++++ b/drivers/net/phy/phy_device.c +@@ -53,6 +53,18 @@ phy_device_free(to_phy_device(dev)); } @@ -21,7 +19,7 @@ Index: linux-2.6.25.4/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; -@@ -78,6 +90,8 @@ struct phy_device* phy_device_create(str +@@ -78,6 +90,8 @@ dev->bus = bus; dev->state = PHY_DOWN; @@ -30,11 +28,9 @@ Index: linux-2.6.25.4/drivers/net/phy/phy_device.c mutex_init(&dev->lock); -Index: linux-2.6.25.4/include/linux/phy.h -=================================================================== ---- 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 { +--- a/include/linux/phy.h ++++ b/include/linux/phy.h +@@ -295,6 +295,17 @@ void (*adjust_link)(struct net_device *dev); void (*adjust_state)(struct net_device *dev); @@ -52,11 +48,9 @@ Index: linux-2.6.25.4/include/linux/phy.h }; #define to_phy_device(d) container_of(d, struct phy_device, dev) -Index: linux-2.6.25.4/include/linux/netdevice.h -=================================================================== ---- 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 +--- a/include/linux/netdevice.h ++++ b/include/linux/netdevice.h +@@ -595,6 +595,7 @@ 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 62c64baef3..85b8cb4f91 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,6 @@ -Index: linux-2.6.25.4/drivers/net/phy/Kconfig -=================================================================== ---- 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 +--- a/drivers/net/phy/Kconfig ++++ b/drivers/net/phy/Kconfig +@@ -70,6 +70,12 @@ ---help--- Currently supports the ADM6996F switch @@ -15,11 +13,9 @@ Index: linux-2.6.25.4/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.4/drivers/net/phy/Makefile -=================================================================== ---- 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 +--- a/drivers/net/phy/Makefile ++++ b/drivers/net/phy/Makefile +@@ -13,6 +13,7 @@ obj-$(CONFIG_BROADCOM_PHY) += broadcom.o obj-$(CONFIG_ICPLUS_PHY) += icplus.o obj-$(CONFIG_ADM6996_PHY) += adm6996.o @@ -27,10 +23,8 @@ Index: linux-2.6.25.4/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.4/drivers/net/phy/mdio_bus.c -=================================================================== ---- linux-2.6.25.4.orig/drivers/net/phy/mdio_bus.c -+++ linux-2.6.25.4/drivers/net/phy/mdio_bus.c +--- a/drivers/net/phy/mdio_bus.c ++++ b/drivers/net/phy/mdio_bus.c @@ -35,6 +35,12 @@ #include <asm/irq.h> #include <asm/uaccess.h> @@ -44,7 +38,7 @@ Index: linux-2.6.25.4/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 @@ int mdiobus_register(struct mii_bus *bus +@@ -85,6 +91,7 @@ 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 46690f17b3..8c2d74ef14 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,8 +1,6 @@ -Index: linux-2.6.25.4/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. +--- a/Documentation/kernel-parameters.txt ++++ b/Documentation/kernel-parameters.txt +@@ -930,6 +930,8 @@ l2cr= [PPC] @@ -11,11 +9,9 @@ Index: linux-2.6.25.4/Documentation/kernel-parameters.txt lapic [X86-32,APIC] Enable the local APIC even if BIOS disabled it. -Index: linux-2.6.25.4/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 +--- a/Documentation/powerpc/booting-without-of.txt ++++ b/Documentation/powerpc/booting-without-of.txt +@@ -59,12 +59,39 @@ p) Freescale Synchronous Serial Interface q) USB EHCI controllers @@ -56,7 +52,7 @@ Index: linux-2.6.25.4/Documentation/powerpc/booting-without-of.txt Appendix A - Sample SOC node for MPC8540 -@@ -1269,10 +1296,6 @@ platforms are moved over to use the flat +@@ -1269,10 +1296,6 @@ Recommended properties: @@ -67,7 +63,7 @@ Index: linux-2.6.25.4/Documentation/powerpc/booting-without-of.txt - phy-connection-type : a string naming the controller/PHY interface type, i.e., "mii" (default), "rmii", "gmii", "rgmii", "rgmii-id", "sgmii", "tbi", or "rtbi". This property is only really needed if the connection -@@ -1622,8 +1645,7 @@ platforms are moved over to use the flat +@@ -1622,8 +1645,7 @@ - device_type : should be "network", "hldc", "uart", "transparent" "bisync", "atm", or "serial". - compatible : could be "ucc_geth" or "fsl_atm" and so on. @@ -77,7 +73,7 @@ Index: linux-2.6.25.4/Documentation/powerpc/booting-without-of.txt - reg : Offset and length of the register set for the device - interrupts : <a b> where a is the interrupt number and b is a field that represents an encoding of the sense and level -@@ -1667,10 +1689,6 @@ platforms are moved over to use the flat +@@ -1667,10 +1689,6 @@ - phy-handle : The phandle for the PHY connected to this controller. Recommended properties: @@ -88,7 +84,7 @@ Index: linux-2.6.25.4/Documentation/powerpc/booting-without-of.txt - phy-connection-type : a string naming the controller/PHY interface type, i.e., "mii" (default), "rmii", "gmii", "rgmii", "rgmii-id" (Internal Delay), "rgmii-txid" (delay on TX only), "rgmii-rxid" (delay on RX only), -@@ -1680,8 +1698,7 @@ platforms are moved over to use the flat +@@ -1680,8 +1698,7 @@ ucc@2000 { device_type = "network"; compatible = "ucc_geth"; @@ -98,7 +94,7 @@ Index: linux-2.6.25.4/Documentation/powerpc/booting-without-of.txt reg = <2000 200>; interrupts = <a0 0>; interrupt-parent = <700>; -@@ -1995,7 +2012,6 @@ platforms are moved over to use the flat +@@ -1995,7 +2012,6 @@ interrupts = <20 8>; interrupt-parent = <&PIC>; phy-handle = <&PHY0>; @@ -106,7 +102,7 @@ Index: linux-2.6.25.4/Documentation/powerpc/booting-without-of.txt fsl,cpm-command = <12000300>; }; -@@ -2217,12 +2233,6 @@ platforms are moved over to use the flat +@@ -2217,12 +2233,6 @@ EMAC, that is the content of the current (bogus) "phy-port" property. @@ -119,7 +115,7 @@ Index: linux-2.6.25.4/Documentation/powerpc/booting-without-of.txt Optional properties: - phy-address : 1 cell, optional, MDIO address of the PHY. If absent, a search is performed. -@@ -2246,7 +2256,6 @@ platforms are moved over to use the flat +@@ -2246,7 +2256,6 @@ Example: EMAC0: ethernet@40000800 { @@ -127,7 +123,7 @@ Index: linux-2.6.25.4/Documentation/powerpc/booting-without-of.txt device_type = "network"; compatible = "ibm,emac-440gp", "ibm,emac"; interrupt-parent = <&UIC1>; -@@ -2817,9 +2826,528 @@ platforms are moved over to use the flat +@@ -2817,9 +2826,528 @@ }; @@ -658,7 +654,7 @@ Index: linux-2.6.25.4/Documentation/powerpc/booting-without-of.txt =================================================== The device tree represents the busses and devices of a hardware -@@ -2905,6 +3433,54 @@ encodings listed below: +@@ -2905,6 +3433,54 @@ 2 = high to low edge sensitive type enabled 3 = low to high edge sensitive type enabled @@ -713,10 +709,8 @@ Index: linux-2.6.25.4/Documentation/powerpc/booting-without-of.txt Appendix A - Sample SOC node for MPC8540 ======================================== -Index: linux-2.6.25.4/Documentation/powerpc/phyp-assisted-dump.txt -=================================================================== --- /dev/null -+++ linux-2.6.25.4/Documentation/powerpc/phyp-assisted-dump.txt ++++ b/Documentation/powerpc/phyp-assisted-dump.txt @@ -0,0 +1,127 @@ + + Hypervisor-Assisted Dump @@ -845,11 +839,9 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/Kconfig ++++ b/arch/powerpc/Kconfig +@@ -49,6 +49,19 @@ bool default y @@ -869,7 +861,7 @@ Index: linux-2.6.25.4/arch/powerpc/Kconfig config RWSEM_GENERIC_SPINLOCK bool -@@ -81,6 +94,11 @@ config GENERIC_FIND_NEXT_BIT +@@ -81,6 +94,11 @@ bool default y @@ -881,7 +873,7 @@ Index: linux-2.6.25.4/arch/powerpc/Kconfig config ARCH_NO_VIRT_TO_BUS def_bool PPC64 -@@ -91,6 +109,7 @@ config PPC +@@ -91,6 +109,7 @@ select HAVE_OPROFILE select HAVE_KPROBES select HAVE_KRETPROBES @@ -889,7 +881,7 @@ Index: linux-2.6.25.4/arch/powerpc/Kconfig config EARLY_PRINTK bool -@@ -210,15 +229,6 @@ source kernel/Kconfig.hz +@@ -210,15 +229,6 @@ source kernel/Kconfig.preempt source "fs/Kconfig.binfmt" @@ -905,7 +897,7 @@ Index: linux-2.6.25.4/arch/powerpc/Kconfig config HUGETLB_PAGE_SIZE_VARIABLE bool depends on HUGETLB_PAGE -@@ -307,6 +317,16 @@ config CRASH_DUMP +@@ -307,6 +317,16 @@ Don't change this unless you know what you are doing. @@ -922,7 +914,7 @@ Index: linux-2.6.25.4/arch/powerpc/Kconfig config PPCBUG_NVRAM bool "Enable reading PPCBUG NVRAM during boot" if PPLUS || LOPEC default y if PPC_PREP -@@ -381,6 +401,26 @@ config PPC_64K_PAGES +@@ -381,6 +401,26 @@ while on hardware with such support, it will be used to map normal application pages. @@ -949,7 +941,7 @@ Index: linux-2.6.25.4/arch/powerpc/Kconfig config PPC_SUBPAGE_PROT bool "Support setting protections for 4k subpages" depends on PPC_64K_PAGES -@@ -490,6 +530,14 @@ config FSL_PCI +@@ -490,6 +530,14 @@ bool select PPC_INDIRECT_PCI @@ -964,7 +956,7 @@ Index: linux-2.6.25.4/arch/powerpc/Kconfig # Yes MCA RS/6000s exist but Linux-PPC does not currently support any config MCA bool -@@ -663,22 +711,6 @@ config CONSISTENT_SIZE +@@ -663,22 +711,6 @@ hex "Size of consistent memory pool" if CONSISTENT_SIZE_BOOL default "0x00200000" if NOT_COHERENT_CACHE @@ -987,11 +979,9 @@ Index: linux-2.6.25.4/arch/powerpc/Kconfig config PIN_TLB bool "Pinned Kernel TLBs (860 ONLY)" depends on ADVANCED_OPTIONS && 8xx -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/Kconfig.debug ++++ b/arch/powerpc/Kconfig.debug +@@ -269,7 +269,7 @@ hex "CPM UART early debug transmit descriptor address" depends on PPC_EARLY_DEBUG_CPM default "0xfa202008" if PPC_EP88XC @@ -1000,11 +990,9 @@ Index: linux-2.6.25.4/arch/powerpc/Kconfig.debug default "0xff002008" if CPM1 help This specifies the address of the transmit descriptor -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/Makefile ++++ b/arch/powerpc/Makefile +@@ -71,13 +71,11 @@ LDFLAGS_vmlinux := -Bstatic @@ -1022,7 +1010,7 @@ Index: linux-2.6.25.4/arch/powerpc/Makefile CPP = $(CC) -E $(KBUILD_CFLAGS) CHECKFLAGS += -m$(CONFIG_WORD_SIZE) -D__powerpc__ -D__powerpc$(CONFIG_WORD_SIZE)__ -@@ -164,7 +162,7 @@ boot := arch/$(ARCH)/boot +@@ -164,7 +162,7 @@ $(BOOT_TARGETS): vmlinux $(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@) @@ -1031,11 +1019,9 @@ Index: linux-2.6.25.4/arch/powerpc/Makefile $(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@) define archhelp -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/Makefile ++++ b/arch/powerpc/boot/Makefile +@@ -40,6 +40,7 @@ $(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405 $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405 $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405 @@ -1043,7 +1029,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/Makefile zlib := inffast.c inflate.c inftrees.c -@@ -64,7 +65,8 @@ src-plat := of.c cuboot-52xx.c cuboot-82 +@@ -64,7 +65,8 @@ cuboot-bamboo.c cuboot-mpc7448hpc2.c cuboot-taishan.c \ fixed-head.S ep88xc.c ep405.c \ cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \ @@ -1053,7 +1039,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/Makefile src-boot := $(src-wlib) $(src-plat) empty.c src-boot := $(addprefix $(obj)/, $(src-boot)) -@@ -192,7 +194,7 @@ image-$(CONFIG_PPC_CHRP) += zImage.chrp +@@ -192,7 +194,7 @@ image-$(CONFIG_PPC_EFIKA) += zImage.chrp image-$(CONFIG_PPC_PMAC) += zImage.pmac image-$(CONFIG_PPC_HOLLY) += zImage.holly @@ -1062,7 +1048,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/Makefile image-$(CONFIG_PPC_ISERIES) += zImage.iseries image-$(CONFIG_DEFAULT_UIMAGE) += uImage -@@ -216,6 +218,7 @@ image-$(CONFIG_RAINIER) += cuImage.rai +@@ -216,6 +218,7 @@ image-$(CONFIG_TAISHAN) += cuImage.taishan image-$(CONFIG_KATMAI) += cuImage.katmai image-$(CONFIG_WARP) += cuImage.warp @@ -1070,7 +1056,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/Makefile # Board ports in arch/powerpc/platform/8xx/Kconfig image-$(CONFIG_PPC_MPC86XADS) += cuImage.mpc866ads -@@ -255,6 +258,7 @@ image-$(CONFIG_TQM8555) += cuImage.tqm +@@ -255,6 +258,7 @@ image-$(CONFIG_TQM8560) += cuImage.tqm8560 image-$(CONFIG_SBC8548) += cuImage.sbc8548 image-$(CONFIG_SBC8560) += cuImage.sbc8560 @@ -1078,7 +1064,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/Makefile # Board ports in arch/powerpc/platform/embedded6xx/Kconfig image-$(CONFIG_STORCENTER) += cuImage.storcenter -@@ -285,11 +289,11 @@ $(obj)/zImage.%: vmlinux $(wrapperbits) +@@ -285,11 +289,11 @@ $(call if_changed,wrap,$*) # dtbImage% - a dtbImage is a zImage with an embedded device tree blob @@ -1094,7 +1080,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/Makefile # This cannot be in the root of $(src) as the zImage rule always adds a $(obj) # prefix -@@ -302,14 +306,24 @@ $(obj)/zImage.iseries: vmlinux +@@ -302,14 +306,24 @@ $(obj)/uImage: vmlinux $(wrapperbits) $(call if_changed,wrap,uboot) @@ -1125,7 +1111,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/Makefile # If there isn't a platform selected then just strip the vmlinux. ifeq (,$(image-y)) -@@ -326,7 +340,7 @@ install: $(CONFIGURE) $(addprefix $(obj) +@@ -326,7 +340,7 @@ # anything not in $(targets) clean-files += $(image-) $(initrd-) zImage zImage.initrd cuImage.* treeImage.* \ @@ -1134,11 +1120,9 @@ Index: linux-2.6.25.4/arch/powerpc/boot/Makefile # clean up files cached by wrapper clean-kernel := vmlinux.strip vmlinux.bin -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/boot/bamboo.c ++++ b/arch/powerpc/boot/bamboo.c +@@ -33,7 +33,8 @@ ibm440ep_fixup_clocks(sysclk, 11059200, 25000000); ibm4xx_sdram_fixup_memsize(); ibm4xx_quiesce_eth((u32 *)0xef600e00, (u32 *)0xef600f00); @@ -1148,10 +1132,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/bamboo.c } void bamboo_init(void *mac0, void *mac1) -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/cpm-serial.c ++++ b/arch/powerpc/boot/cpm-serial.c @@ -11,6 +11,7 @@ #include "types.h" #include "io.h" @@ -1160,7 +1142,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/cpm-serial.c struct cpm_scc { u32 gsmrl; -@@ -42,6 +43,22 @@ struct cpm_param { +@@ -42,6 +43,22 @@ u16 tbase; u8 rfcr; u8 tfcr; @@ -1183,7 +1165,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/cpm-serial.c }; struct cpm_bd { -@@ -54,10 +71,10 @@ static void *cpcr; +@@ -54,10 +71,10 @@ static struct cpm_param *param; static struct cpm_smc *smc; static struct cpm_scc *scc; @@ -1197,7 +1179,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/cpm-serial.c static void (*do_cmd)(int op); static void (*enable_port)(void); -@@ -119,20 +136,25 @@ static int cpm_serial_open(void) +@@ -119,20 +136,25 @@ out_8(¶m->rfcr, 0x10); out_8(¶m->tfcr, 0x10); @@ -1228,7 +1210,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/cpm-serial.c do_cmd(CPM_CMD_INIT_RX_TX); -@@ -175,10 +197,12 @@ static unsigned char cpm_serial_getc(voi +@@ -175,10 +197,12 @@ int cpm_console_init(void *devp, struct serial_console_data *scdp) { @@ -1244,7 +1226,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/cpm-serial.c if (dt_is_compatible(devp, "fsl,cpm1-smc-uart")) { is_smc = 1; -@@ -202,63 +226,64 @@ int cpm_console_init(void *devp, struct +@@ -202,63 +226,64 @@ else do_cmd = cpm1_cmd; @@ -1343,11 +1325,9 @@ Index: linux-2.6.25.4/arch/powerpc/boot/cpm-serial.c scdp->open = cpm_serial_open; scdp->putc = cpm_serial_putc; -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/boot/cuboot-pq2.c ++++ b/arch/powerpc/boot/cuboot-pq2.c +@@ -128,7 +128,7 @@ u8 *soc_regs; int i, len; void *node, *parent_node; @@ -1356,7 +1336,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/cuboot-pq2.c node = finddevice("/pci"); if (!node || !dt_is_compatible(node, "fsl,pq2-pci")) -@@ -141,7 +141,7 @@ static void fixup_pci(void) +@@ -141,7 +141,7 @@ soc_regs = (u8 *)fsl_get_immr(); if (!soc_regs) @@ -1365,7 +1345,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/cuboot-pq2.c dt_get_reg_format(node, &naddr, &nsize); if (naddr != 3 || nsize != 2) -@@ -153,7 +153,7 @@ static void fixup_pci(void) +@@ -153,7 +153,7 @@ dt_get_reg_format(parent_node, &naddr, &nsize); if (naddr != 1 || nsize != 1) @@ -1374,7 +1354,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/cuboot-pq2.c len = getprop(node, "ranges", pci_ranges_buf, sizeof(pci_ranges_buf)); -@@ -170,14 +170,20 @@ static void fixup_pci(void) +@@ -170,14 +170,20 @@ } if (!mem || !mmio || !io) @@ -1397,7 +1377,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/cuboot-pq2.c out_be32(&pci_regs[1][0], mem_base->phys_addr | 1); out_be32(&pci_regs[2][0], ~(mem->size[1] + mmio->size[1] - 1)); -@@ -201,8 +207,9 @@ static void fixup_pci(void) +@@ -201,8 +207,9 @@ out_le32(&pci_regs[0][58], 0); out_le32(&pci_regs[0][60], 0); @@ -1409,7 +1389,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/cuboot-pq2.c /* If PCI is disabled, drive RST high to enable. */ if (!(in_le32(&pci_regs[0][32]) & 1)) { -@@ -228,7 +235,11 @@ static void fixup_pci(void) +@@ -228,7 +235,11 @@ return; err: @@ -1422,11 +1402,9 @@ Index: linux-2.6.25.4/arch/powerpc/boot/cuboot-pq2.c } static void pq2_platform_fixups(void) -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/boot/cuboot-rainier.c ++++ b/arch/powerpc/boot/cuboot-rainier.c +@@ -42,7 +42,8 @@ ibm440ep_fixup_clocks(sysclk, 11059200, 50000000); ibm4xx_fixup_ebc_ranges("/plb/opb/ebc"); ibm4xx_denali_fixup_memsize(); @@ -1436,11 +1414,9 @@ Index: linux-2.6.25.4/arch/powerpc/boot/cuboot-rainier.c } void platform_init(unsigned long r3, unsigned long r4, unsigned long r5, -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/boot/cuboot-sequoia.c ++++ b/arch/powerpc/boot/cuboot-sequoia.c +@@ -42,7 +42,8 @@ ibm440ep_fixup_clocks(sysclk, 11059200, 50000000); ibm4xx_fixup_ebc_ranges("/plb/opb/ebc"); ibm4xx_denali_fixup_memsize(); @@ -1450,11 +1426,9 @@ Index: linux-2.6.25.4/arch/powerpc/boot/cuboot-sequoia.c } void platform_init(unsigned long r3, unsigned long r4, unsigned long r5, -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/boot/cuboot-taishan.c ++++ b/arch/powerpc/boot/cuboot-taishan.c +@@ -40,7 +40,8 @@ ibm4xx_sdram_fixup_memsize(); @@ -1464,11 +1438,9 @@ Index: linux-2.6.25.4/arch/powerpc/boot/cuboot-taishan.c ibm4xx_fixup_ebc_ranges("/plb/opb/ebc"); } -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/boot/cuboot-warp.c ++++ b/arch/powerpc/boot/cuboot-warp.c +@@ -24,7 +24,7 @@ ibm440ep_fixup_clocks(sysclk, 11059200, 50000000); ibm4xx_sdram_fixup_memsize(); ibm4xx_fixup_ebc_ranges("/plb/opb/ebc"); @@ -1477,10 +1449,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/cuboot-warp.c } -Index: linux-2.6.25.4/arch/powerpc/boot/cuboot-yosemite.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/boot/cuboot-yosemite.c ++++ b/arch/powerpc/boot/cuboot-yosemite.c @@ -0,0 +1,44 @@ +/* + * Old U-boot compatibility for Yosemite @@ -1526,11 +1496,9 @@ Index: linux-2.6.25.4/arch/powerpc/boot/cuboot-yosemite.c + fdt_init(_dtb_start); + serial_console_init(); +} -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/devtree.c ++++ b/arch/powerpc/boot/devtree.c +@@ -350,3 +350,23 @@ return 0; } @@ -1554,10 +1522,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/devtree.c + return n; +} + -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/bamboo.dts ++++ b/arch/powerpc/boot/dts/bamboo.dts @@ -204,7 +204,6 @@ }; @@ -1574,10 +1540,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/boot/dts/canyonlands.dts -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/boot/dts/canyonlands.dts ++++ b/arch/powerpc/boot/dts/canyonlands.dts @@ -0,0 +1,402 @@ +/* + * Device Tree Source for AMCC Canyonlands (460EX) @@ -1981,10 +1945,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/canyonlands.dts + }; + }; +}; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/ebony.dts ++++ b/arch/powerpc/boot/dts/ebony.dts @@ -241,7 +241,6 @@ }; @@ -2001,10 +1963,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/ebony.dts device_type = "network"; compatible = "ibm,emac-440gp", "ibm,emac"; interrupt-parent = <&UIC1>; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/ep8248e.dts ++++ b/arch/powerpc/boot/dts/ep8248e.dts @@ -121,8 +121,7 @@ data@0 { @@ -2024,10 +1984,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/ep8248e.dts interrupts = <4 8>; interrupt-parent = <&PIC>; fsl,cpm-brg = <7>; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/ep88xc.dts ++++ b/arch/powerpc/boot/dts/ep88xc.dts @@ -2,7 +2,7 @@ * EP88xC Device Tree Source * @@ -2255,10 +2213,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/ep88xc.dts fsl,cpm-command = <0000>; }; }; -Index: linux-2.6.25.4/arch/powerpc/boot/dts/glacier.dts -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/boot/dts/glacier.dts ++++ b/arch/powerpc/boot/dts/glacier.dts @@ -0,0 +1,467 @@ +/* + * Device Tree Source for AMCC Glacier (460GT) @@ -2727,10 +2683,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/glacier.dts + }; + }; +}; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/haleakala.dts ++++ b/arch/powerpc/boot/dts/haleakala.dts @@ -12,7 +12,7 @@ #address-cells = <1>; #size-cells = <1>; @@ -2749,10 +2703,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/haleakala.dts rx-fifo-size = <1000>; tx-fifo-size = <800>; phy-mode = "rgmii"; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/katmai.dts ++++ b/arch/powerpc/boot/dts/katmai.dts @@ -212,7 +212,7 @@ mal-tx-channel = <0>; mal-rx-channel = <0>; @@ -2762,10 +2714,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/katmai.dts rx-fifo-size = <1000>; tx-fifo-size = <800>; phy-mode = "gmii"; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/kilauea.dts ++++ b/arch/powerpc/boot/dts/kilauea.dts @@ -219,7 +219,7 @@ mal-tx-channel = <0>; mal-rx-channel = <0>; @@ -2784,10 +2734,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/kilauea.dts rx-fifo-size = <1000>; tx-fifo-size = <800>; phy-mode = "rgmii"; -Index: linux-2.6.25.4/arch/powerpc/boot/dts/ksi8560.dts -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/boot/dts/ksi8560.dts ++++ b/arch/powerpc/boot/dts/ksi8560.dts @@ -0,0 +1,267 @@ +/* + * Device Tree Source for Emerson KSI8560 @@ -3056,10 +3004,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/ksi8560.dts + linux,stdout-path = "/soc/cpm/serial@91a00"; + }; +}; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/kuroboxHD.dts ++++ b/arch/powerpc/boot/dts/kuroboxHD.dts @@ -7,6 +7,7 @@ * Based on sandpoint.dts * @@ -3068,7 +3014,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/kuroboxHD.dts * * This file is licensed under * the terms of the GNU General Public License version 2. This program -@@ -17,6 +18,8 @@ XXXX add flash parts, rtc, ?? +@@ -17,6 +18,8 @@ */ @@ -3077,7 +3023,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/kuroboxHD.dts / { model = "KuroboxHD"; compatible = "linkstation"; -@@ -35,19 +38,19 @@ XXXX add flash parts, rtc, ?? +@@ -35,19 +38,19 @@ PowerPC,603e { /* Really 8241 */ device_type = "cpu"; @@ -3103,7 +3049,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/kuroboxHD.dts }; soc10x { /* AFAICT need to make soc for 8245's uarts to be defined */ -@@ -56,26 +59,26 @@ XXXX add flash parts, rtc, ?? +@@ -56,26 +59,26 @@ device_type = "soc"; compatible = "mpc10x"; store-gathering = <0>; /* 0 == off, !0 == on */ @@ -3138,7 +3084,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/kuroboxHD.dts }; }; -@@ -83,9 +86,9 @@ XXXX add flash parts, rtc, ?? +@@ -83,9 +86,9 @@ cell-index = <0>; device_type = "serial"; compatible = "ns16550"; @@ -3151,7 +3097,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/kuroboxHD.dts interrupts = <9 0>; interrupt-parent = <&mpic>; }; -@@ -94,10 +97,10 @@ XXXX add flash parts, rtc, ?? +@@ -94,10 +97,10 @@ cell-index = <1>; device_type = "serial"; compatible = "ns16550"; @@ -3166,7 +3112,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/kuroboxHD.dts interrupt-parent = <&mpic>; }; -@@ -107,7 +110,7 @@ XXXX add flash parts, rtc, ?? +@@ -107,7 +110,7 @@ device_type = "open-pic"; compatible = "chrp,open-pic"; interrupt-controller; @@ -3175,7 +3121,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/kuroboxHD.dts }; pci0: pci@fec00000 { -@@ -116,29 +119,29 @@ XXXX add flash parts, rtc, ?? +@@ -116,29 +119,29 @@ #interrupt-cells = <1>; device_type = "pci"; compatible = "mpc10x-pci"; @@ -3223,10 +3169,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/kuroboxHD.dts >; }; }; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/kuroboxHG.dts ++++ b/arch/powerpc/boot/dts/kuroboxHG.dts @@ -7,6 +7,7 @@ * Based on sandpoint.dts * @@ -3235,7 +3179,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/kuroboxHG.dts * * This file is licensed under * the terms of the GNU General Public License version 2. This program -@@ -17,6 +18,8 @@ XXXX add flash parts, rtc, ?? +@@ -17,6 +18,8 @@ */ @@ -3244,7 +3188,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/kuroboxHG.dts / { model = "KuroboxHG"; compatible = "linkstation"; -@@ -35,19 +38,19 @@ XXXX add flash parts, rtc, ?? +@@ -35,19 +38,19 @@ PowerPC,603e { /* Really 8241 */ device_type = "cpu"; @@ -3270,7 +3214,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/kuroboxHG.dts }; soc10x { /* AFAICT need to make soc for 8245's uarts to be defined */ -@@ -56,26 +59,26 @@ XXXX add flash parts, rtc, ?? +@@ -56,26 +59,26 @@ device_type = "soc"; compatible = "mpc10x"; store-gathering = <0>; /* 0 == off, !0 == on */ @@ -3305,7 +3249,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/kuroboxHG.dts }; }; -@@ -83,9 +86,9 @@ XXXX add flash parts, rtc, ?? +@@ -83,9 +86,9 @@ cell-index = <0>; device_type = "serial"; compatible = "ns16550"; @@ -3318,7 +3262,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/kuroboxHG.dts interrupts = <9 0>; interrupt-parent = <&mpic>; }; -@@ -94,10 +97,10 @@ XXXX add flash parts, rtc, ?? +@@ -94,10 +97,10 @@ cell-index = <1>; device_type = "serial"; compatible = "ns16550"; @@ -3333,7 +3277,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/kuroboxHG.dts interrupt-parent = <&mpic>; }; -@@ -107,7 +110,7 @@ XXXX add flash parts, rtc, ?? +@@ -107,7 +110,7 @@ device_type = "open-pic"; compatible = "chrp,open-pic"; interrupt-controller; @@ -3342,7 +3286,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/kuroboxHG.dts }; pci0: pci@fec00000 { -@@ -116,29 +119,29 @@ XXXX add flash parts, rtc, ?? +@@ -116,29 +119,29 @@ #interrupt-cells = <1>; device_type = "pci"; compatible = "mpc10x-pci"; @@ -3390,10 +3334,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/kuroboxHG.dts >; }; }; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/makalu.dts ++++ b/arch/powerpc/boot/dts/makalu.dts @@ -219,7 +219,7 @@ mal-tx-channel = <0>; mal-rx-channel = <0>; @@ -3412,10 +3354,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/makalu.dts rx-fifo-size = <1000>; tx-fifo-size = <800>; phy-mode = "rgmii"; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/mpc7448hpc2.dts ++++ b/arch/powerpc/boot/dts/mpc7448hpc2.dts @@ -1,7 +1,7 @@ /* * MPC7448HPC2 (Taiga) board Device Tree Source @@ -3631,10 +3571,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/mpc7448hpc2.dts interrupt-parent = <&mpic>; }; }; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/mpc8272ads.dts ++++ b/arch/powerpc/boot/dts/mpc8272ads.dts @@ -1,7 +1,7 @@ /* * MPC8272 ADS Device Tree Source @@ -3936,10 +3874,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/mpc8272ads.dts }; }; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/mpc832x_mds.dts ++++ b/arch/powerpc/boot/dts/mpc832x_mds.dts @@ -255,9 +255,7 @@ enet0: ucc@2200 { device_type = "network"; @@ -3970,10 +3906,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts ++++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts @@ -208,9 +208,7 @@ enet0: ucc@3000 { device_type = "network"; @@ -3994,10 +3928,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/mpc832x_rdb.dts reg = <0x2200 0x200>; interrupts = <34>; interrupt-parent = <&qeic>; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/mpc836x_mds.dts ++++ b/arch/powerpc/boot/dts/mpc836x_mds.dts @@ -257,9 +257,7 @@ enet0: ucc@2000 { device_type = "network"; @@ -4018,10 +3950,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/mpc836x_mds.dts reg = <0x3000 0x200>; interrupts = <33>; interrupt-parent = <&qeic>; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/mpc8540ads.dts ++++ b/arch/powerpc/boot/dts/mpc8540ads.dts @@ -1,7 +1,7 @@ /* * MPC8540 ADS Device Tree Source @@ -4351,10 +4281,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/mpc8540ads.dts compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci"; device_type = "pci"; }; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/mpc8541cds.dts ++++ b/arch/powerpc/boot/dts/mpc8541cds.dts @@ -1,7 +1,7 @@ /* * MPC8541 CDS Device Tree Source @@ -4700,10 +4628,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/mpc8541cds.dts compatible = "fsl,mpc8540-pci"; device_type = "pci"; }; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/mpc8544ds.dts ++++ b/arch/powerpc/boot/dts/mpc8544ds.dts @@ -1,7 +1,7 @@ /* * MPC8544 DS Device Tree Source @@ -5240,10 +5166,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/mpc8544ds.dts }; }; }; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/mpc8548cds.dts ++++ b/arch/powerpc/boot/dts/mpc8548cds.dts @@ -1,7 +1,7 @@ /* * MPC8548 CDS Device Tree Source @@ -5785,10 +5709,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/mpc8548cds.dts }; }; }; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/mpc8555cds.dts ++++ b/arch/powerpc/boot/dts/mpc8555cds.dts @@ -1,7 +1,7 @@ /* * MPC8555 CDS Device Tree Source @@ -6134,10 +6056,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/mpc8555cds.dts compatible = "fsl,mpc8540-pci"; device_type = "pci"; }; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/mpc8560ads.dts ++++ b/arch/powerpc/boot/dts/mpc8560ads.dts @@ -1,7 +1,7 @@ /* * MPC8560 ADS Device Tree Source @@ -6531,10 +6451,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/mpc8560ads.dts + 0x1000000 0x0 0x0 0xe2000000 0x0 0x1000000>; }; }; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/mpc8568mds.dts ++++ b/arch/powerpc/boot/dts/mpc8568mds.dts @@ -1,7 +1,7 @@ /* * MPC8568E MDS Device Tree Source @@ -7111,10 +7029,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/mpc8568mds.dts }; }; }; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/mpc8572ds.dts ++++ b/arch/powerpc/boot/dts/mpc8572ds.dts @@ -1,7 +1,7 @@ /* * MPC8572 DS Device Tree Source @@ -7775,10 +7691,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/mpc8572ds.dts }; }; }; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts ++++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts @@ -13,7 +13,7 @@ / { @@ -7788,10 +7702,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/mpc8641_hpcn.dts #address-cells = <1>; #size-cells = <1>; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/mpc866ads.dts ++++ b/arch/powerpc/boot/dts/mpc866ads.dts @@ -2,6 +2,7 @@ * MPC866 ADS Device Tree Source * @@ -7976,10 +7888,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/mpc866ads.dts interrupt-parent = <&CPM_PIC>; fsl,cpm-command = <0000>; linux,network-index = <1>; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/mpc885ads.dts ++++ b/arch/powerpc/boot/dts/mpc885ads.dts @@ -2,7 +2,7 @@ * MPC885 ADS Device Tree Source * @@ -8216,10 +8126,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/mpc885ads.dts linux,network-index = <2>; }; }; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/pq2fads.dts ++++ b/arch/powerpc/boot/dts/pq2fads.dts @@ -1,7 +1,7 @@ /* * Device Tree for the PQ2FADS-ZU board with an MPC8280 chip. @@ -8509,10 +8417,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/pq2fads.dts compatible = "fsl,mpc8280-pic", "fsl,cpm2-pic"; }; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/prpmc2800.dts ++++ b/arch/powerpc/boot/dts/prpmc2800.dts @@ -11,6 +11,8 @@ * if it can determine the exact PrPMC type. */ @@ -8978,10 +8884,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/prpmc2800.dts + linux,stdout-path = &MPSC0; }; }; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/rainier.dts ++++ b/arch/powerpc/boot/dts/rainier.dts @@ -254,7 +254,6 @@ }; @@ -9016,10 +8920,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/rainier.dts rx-fifo-size = <1000>; tx-fifo-size = <800>; phy-mode = "rgmii"; -Index: linux-2.6.25.4/arch/powerpc/boot/dts/sbc8641d.dts -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/boot/dts/sbc8641d.dts ++++ b/arch/powerpc/boot/dts/sbc8641d.dts @@ -0,0 +1,352 @@ +/* + * SBC8641D Device Tree Source @@ -9373,10 +9275,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/sbc8641d.dts + }; + }; +}; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/sequoia.dts ++++ b/arch/powerpc/boot/dts/sequoia.dts @@ -269,7 +269,6 @@ }; @@ -9411,10 +9311,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/sequoia.dts rx-fifo-size = <1000>; tx-fifo-size = <800>; phy-mode = "rgmii"; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/taishan.dts ++++ b/arch/powerpc/boot/dts/taishan.dts @@ -104,6 +104,16 @@ // FIXME: anything else? }; @@ -9508,10 +9406,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/taishan.dts }; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/walnut.dts ++++ b/arch/powerpc/boot/dts/walnut.dts @@ -125,7 +125,6 @@ }; @@ -9520,10 +9416,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/walnut.dts device_type = "network"; compatible = "ibm,emac-405gp", "ibm,emac"; interrupt-parent = <&UIC0>; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/dts/warp.dts ++++ b/arch/powerpc/boot/dts/warp.dts @@ -204,7 +204,6 @@ }; @@ -9532,10 +9426,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/boot/dts/yosemite.dts -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/boot/dts/yosemite.dts ++++ b/arch/powerpc/boot/dts/yosemite.dts @@ -0,0 +1,304 @@ +/* + * Device Tree Source for AMCC Yosemite @@ -9841,11 +9733,9 @@ Index: linux-2.6.25.4/arch/powerpc/boot/dts/yosemite.dts + linux,stdout-path = "/plb/opb/serial@ef600300"; + }; +}; -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/boot/ebony.c ++++ b/arch/powerpc/boot/ebony.c +@@ -75,7 +75,8 @@ ibm440gp_fixup_clocks(sysclk, 6 * 1843200); ibm4xx_sdram_fixup_memsize(); @@ -9855,10 +9745,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/ebony.c ibm4xx_fixup_ebc_ranges("/plb/opb/ebc"); ebony_flashsel_fixup(); } -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/libfdt-wrapper.c ++++ b/arch/powerpc/boot/libfdt-wrapper.c @@ -35,7 +35,7 @@ #define check_err(err) \ ({ \ @@ -9868,11 +9756,9 @@ Index: linux-2.6.25.4/arch/powerpc/boot/libfdt-wrapper.c fdt_strerror(err)); \ if (BAD_ERROR(err)) \ exit(); \ -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/boot/mpc52xx-psc.c ++++ b/arch/powerpc/boot/mpc52xx-psc.c +@@ -51,14 +51,9 @@ int mpc5200_psc_console_init(void *devp, struct serial_console_data *scdp) { @@ -9889,11 +9775,9 @@ Index: linux-2.6.25.4/arch/powerpc/boot/mpc52xx-psc.c scdp->open = psc_open; scdp->putc = psc_putc; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/mpsc.c ++++ b/arch/powerpc/boot/mpsc.c +@@ -141,7 +141,7 @@ if (mpscintr_base == NULL) goto err_out; @@ -9902,11 +9786,9 @@ Index: linux-2.6.25.4/arch/powerpc/boot/mpsc.c if (n != sizeof(v)) goto err_out; reg_set = (int)v; -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/boot/mv64x60.c ++++ b/arch/powerpc/boot/mv64x60.c +@@ -535,7 +535,7 @@ u32 v[2]; void *devp; @@ -9915,7 +9797,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/mv64x60.c if (devp == NULL) goto err_out; if (getprop(devp, "reg", v, sizeof(v)) != sizeof(v)) -@@ -553,7 +553,7 @@ u8 *mv64x60_get_bridge_base(void) +@@ -553,7 +553,7 @@ u32 v; void *devp; @@ -9924,11 +9806,9 @@ Index: linux-2.6.25.4/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.4/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) +--- a/arch/powerpc/boot/mv64x60_i2c.c ++++ b/arch/powerpc/boot/mv64x60_i2c.c +@@ -185,7 +185,7 @@ u32 v; void *devp; @@ -9937,11 +9817,9 @@ Index: linux-2.6.25.4/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.4/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) +--- a/arch/powerpc/boot/ns16550.c ++++ b/arch/powerpc/boot/ns16550.c +@@ -55,15 +55,9 @@ int ns16550_console_init(void *devp, struct serial_console_data *scdp) { int n; @@ -9959,11 +9837,9 @@ Index: linux-2.6.25.4/arch/powerpc/boot/ns16550.c n = getprop(devp, "reg-shift", ®_shift, sizeof(reg_shift)); if (n != sizeof(reg_shift)) -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/ops.h ++++ b/arch/powerpc/boot/ops.h +@@ -95,6 +95,7 @@ int dt_xlate_addr(void *node, u32 *buf, int buflen, unsigned long *xlated_addr); int dt_is_compatible(void *node, const char *compat); void dt_get_reg_format(void *node, u32 *naddr, u32 *nsize); @@ -9971,11 +9847,9 @@ Index: linux-2.6.25.4/arch/powerpc/boot/ops.h static inline void *finddevice(const char *name) { -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/prpmc2800.c ++++ b/arch/powerpc/boot/prpmc2800.c +@@ -344,20 +344,20 @@ acc_bits); /* Get the cpu -> pci i/o & mem mappings from the device tree */ @@ -10001,7 +9875,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/prpmc2800.c enables = in_le32((u32 *)(bridge_base + MV64x60_CPU_BAR_ENABLE)); enables |= 0x0007fe00; /* Disable all cpu->pci windows */ -@@ -429,9 +429,9 @@ static void prpmc2800_fixups(void) +@@ -429,9 +429,9 @@ setprop(devp, "model", model, l); /* Set /cpus/PowerPC,7447/clock-frequency */ @@ -10013,7 +9887,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/prpmc2800.c v[0] = bip->core_speed; setprop(devp, "clock-frequency", &v[0], sizeof(v[0])); -@@ -443,16 +443,17 @@ static void prpmc2800_fixups(void) +@@ -443,16 +443,17 @@ v[1] = bip->mem_size; setprop(devp, "reg", v, sizeof(v)); @@ -10035,10 +9909,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/boot/ps3-head.S ++++ b/arch/powerpc/boot/ps3-head.S @@ -27,8 +27,9 @@ /* * __system_reset_overlay - The PS3 first stage entry. @@ -10051,7 +9923,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/ps3-head.S * * The PS3 has a single processor with two threads. */ -@@ -47,8 +48,6 @@ __system_reset_overlay: +@@ -47,8 +48,6 @@ mfspr r3, 0x88 cntlzw. r3, r3 @@ -10060,7 +9932,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/ps3-head.S beq 1f /* Secondary goes to __secondary_hold in kernel. */ -@@ -57,8 +56,14 @@ __system_reset_overlay: +@@ -57,8 +56,14 @@ mtctr r4 bctr @@ -10076,7 +9948,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/ps3-head.S or 31, 31, 31 /* db16cyc */ or 31, 31, 31 /* db16cyc */ -@@ -67,16 +72,18 @@ __system_reset_overlay: +@@ -67,16 +72,18 @@ mtctr r4 bctr @@ -10099,10 +9971,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/ps3-head.S - . = __system_reset_kernel + 0x100 + . = __system_reset_kernel + 512 -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/boot/ps3.c ++++ b/arch/powerpc/boot/ps3.c @@ -27,10 +27,10 @@ #include "page.h" #include "ops.h" @@ -10118,7 +9988,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/ps3.c u64 in_4, u64 in_5, u64 *out_1, u64 *out_2); #ifdef DEBUG -@@ -46,6 +46,7 @@ BSS_STACK(4096); +@@ -46,6 +46,7 @@ * edit the command line passed to vmlinux (by setting /chosen/bootargs). * The buffer is put in it's own section so that tools may locate it easier. */ @@ -10126,7 +9996,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/ps3.c static char cmdline[COMMAND_LINE_SIZE] __attribute__((__section__("__builtin_cmdline"))); -@@ -75,7 +76,7 @@ static void ps3_exit(void) +@@ -75,7 +76,7 @@ static int ps3_repository_read_rm_size(u64 *rm_size) { @@ -10135,7 +10005,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/ps3.c u64 lpar_id; u64 ppe_id; u64 v2; -@@ -114,16 +115,17 @@ void ps3_copy_vectors(void) +@@ -114,16 +115,17 @@ { extern char __system_reset_kernel[]; @@ -10156,7 +10026,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/ps3.c console_ops.write = ps3_console_write; platform_ops.exit = ps3_exit; -@@ -151,6 +153,11 @@ void platform_init(void) +@@ -151,6 +153,11 @@ printf(" flat tree at 0x%lx\n\r", ft_addr); @@ -10168,11 +10038,9 @@ Index: linux-2.6.25.4/arch/powerpc/boot/ps3.c ((kernel_entry_t)0)(ft_addr, 0, NULL); ps3_exit(); -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/boot/serial.c ++++ b/arch/powerpc/boot/serial.c +@@ -119,7 +119,7 @@ if (dt_is_compatible(devp, "ns16550")) rc = ns16550_console_init(devp, &serial_cd); @@ -10181,10 +10049,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/boot/simpleboot.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/boot/simpleboot.c ++++ b/arch/powerpc/boot/simpleboot.c @@ -0,0 +1,84 @@ +/* + * The simple platform -- for booting when firmware doesn't supply a device @@ -10270,11 +10136,9 @@ Index: linux-2.6.25.4/arch/powerpc/boot/simpleboot.c + fdt_init(_dtb_start); + serial_console_init(); +} -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/boot/treeboot-walnut.c ++++ b/arch/powerpc/boot/treeboot-walnut.c +@@ -68,7 +68,7 @@ ibm4xx_quiesce_eth((u32 *)0xef600800, NULL); ibm4xx_fixup_ebc_ranges("/plb/ebc"); walnut_flashsel_fixup(); @@ -10283,10 +10147,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/treeboot-walnut.c } void platform_init(void) -Index: linux-2.6.25.4/arch/powerpc/boot/virtex405-head.S -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/boot/virtex405-head.S ++++ b/arch/powerpc/boot/virtex405-head.S @@ -0,0 +1,30 @@ +#include "ppc_asm.h" + @@ -10318,11 +10180,9 @@ Index: linux-2.6.25.4/arch/powerpc/boot/virtex405-head.S + addi r9,r9,0x20 + bdnz 1b +2: b _zimage_start_lib -Index: linux-2.6.25.4/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*) +--- a/arch/powerpc/boot/wrapper ++++ b/arch/powerpc/boot/wrapper +@@ -174,7 +174,7 @@ *-mpc83*) platformo=$object/cuboot-83xx.o ;; @@ -10331,7 +10191,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/wrapper platformo=$object/cuboot-85xx-cpm2.o ;; *-mpc85*|*-tqm8540|*-sbc85*) -@@ -199,6 +199,10 @@ adder875-redboot) +@@ -199,6 +199,10 @@ platformo="$object/fixed-head.o $object/redboot-8xx.o" binary=y ;; @@ -10342,7 +10202,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/wrapper esac vmz="$tmpdir/`basename \"$kernel\"`.$ext" -@@ -226,10 +230,13 @@ if [ -n "$version" ]; then +@@ -226,10 +230,13 @@ uboot_version="-n Linux-$version" fi @@ -10357,7 +10217,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/wrapper $uboot_version -d "$vmz" "$ofile" if [ -z "$cacheit" ]; then rm -f "$vmz" -@@ -298,15 +305,16 @@ treeboot*) +@@ -298,15 +305,16 @@ exit 0 ;; ps3) @@ -10383,7 +10243,7 @@ Index: linux-2.6.25.4/arch/powerpc/boot/wrapper system_reset_overlay=0x`${CROSS}nm "$ofile" \ | grep ' __system_reset_overlay$' \ -@@ -317,7 +325,7 @@ ps3) +@@ -317,7 +325,7 @@ | cut -d' ' -f1` system_reset_kernel=`printf "%d" $system_reset_kernel` overlay_dest="256" @@ -10392,10 +10252,8 @@ Index: linux-2.6.25.4/arch/powerpc/boot/wrapper ${CROSS}objcopy -O binary "$ofile" "$ofile.bin" -Index: linux-2.6.25.4/arch/powerpc/configs/40x/ep405_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/40x/ep405_defconfig ++++ b/arch/powerpc/configs/40x/ep405_defconfig @@ -0,0 +1,968 @@ +# +# Automatically generated make config: don't edit @@ -11365,10 +11223,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/40x/kilauea_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/40x/kilauea_defconfig ++++ b/arch/powerpc/configs/40x/kilauea_defconfig @@ -0,0 +1,839 @@ +# +# Automatically generated make config: don't edit @@ -12209,10 +12065,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/40x/makalu_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/40x/makalu_defconfig ++++ b/arch/powerpc/configs/40x/makalu_defconfig @@ -0,0 +1,839 @@ +# +# Automatically generated make config: don't edit @@ -13053,10 +12907,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/40x/walnut_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/40x/walnut_defconfig ++++ b/arch/powerpc/configs/40x/walnut_defconfig @@ -0,0 +1,887 @@ +# +# Automatically generated make config: don't edit @@ -13945,10 +13797,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/44x/bamboo_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/44x/bamboo_defconfig ++++ b/arch/powerpc/configs/44x/bamboo_defconfig @@ -0,0 +1,815 @@ +# +# Automatically generated make config: don't edit @@ -14765,10 +14615,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/44x/canyonlands_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/44x/canyonlands_defconfig ++++ b/arch/powerpc/configs/44x/canyonlands_defconfig @@ -0,0 +1,721 @@ +# +# Automatically generated make config: don't edit @@ -15491,10 +15339,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/44x/ebony_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/44x/ebony_defconfig ++++ b/arch/powerpc/configs/44x/ebony_defconfig @@ -0,0 +1,898 @@ +# +# Automatically generated make config: don't edit @@ -16394,10 +16240,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/44x/katmai_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/44x/katmai_defconfig ++++ b/arch/powerpc/configs/44x/katmai_defconfig @@ -0,0 +1,790 @@ +# +# Automatically generated make config: don't edit @@ -17189,10 +17033,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/44x/rainier_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/44x/rainier_defconfig ++++ b/arch/powerpc/configs/44x/rainier_defconfig @@ -0,0 +1,899 @@ +# +# Automatically generated make config: don't edit @@ -18093,10 +17935,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/44x/sequoia_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/44x/sequoia_defconfig ++++ b/arch/powerpc/configs/44x/sequoia_defconfig @@ -0,0 +1,916 @@ +# +# Automatically generated make config: don't edit @@ -19014,10 +18854,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/44x/taishan_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/44x/taishan_defconfig ++++ b/arch/powerpc/configs/44x/taishan_defconfig @@ -0,0 +1,815 @@ +# +# Automatically generated make config: don't edit @@ -19834,10 +19672,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/44x/warp_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/44x/warp_defconfig ++++ b/arch/powerpc/configs/44x/warp_defconfig @@ -0,0 +1,1110 @@ +# +# Automatically generated make config: don't edit @@ -20949,10 +20785,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig ++++ b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig @@ -0,0 +1,1395 @@ +# +# Automatically generated make config: don't edit @@ -22349,10 +22183,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig ++++ b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig @@ -0,0 +1,1451 @@ +# +# Automatically generated make config: don't edit @@ -23805,10 +23637,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/83xx/mpc832x_mds_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/83xx/mpc832x_mds_defconfig ++++ b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig @@ -0,0 +1,1081 @@ +# +# Automatically generated make config: don't edit @@ -24891,10 +24721,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig ++++ b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig @@ -0,0 +1,1233 @@ +# +# Automatically generated make config: don't edit @@ -26129,10 +25957,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/83xx/mpc834x_itx_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/83xx/mpc834x_itx_defconfig ++++ b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig @@ -0,0 +1,1295 @@ +# +# Automatically generated make config: don't edit @@ -27429,10 +27255,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig ++++ b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig @@ -0,0 +1,1222 @@ +# +# Automatically generated make config: don't edit @@ -28656,10 +28480,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/83xx/mpc834x_mds_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/83xx/mpc834x_mds_defconfig ++++ b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig @@ -0,0 +1,1021 @@ +# +# Automatically generated make config: don't edit @@ -29682,10 +29504,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/83xx/mpc836x_mds_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/83xx/mpc836x_mds_defconfig ++++ b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig @@ -0,0 +1,1079 @@ +# +# Automatically generated make config: don't edit @@ -30766,10 +30586,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/83xx/mpc837x_mds_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/83xx/mpc837x_mds_defconfig ++++ b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig @@ -0,0 +1,899 @@ +# +# Automatically generated make config: don't edit @@ -31670,10 +31488,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig ++++ b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig @@ -0,0 +1,930 @@ +# +# Automatically generated make config: don't edit @@ -32605,10 +32421,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/83xx/sbc834x_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/83xx/sbc834x_defconfig ++++ b/arch/powerpc/configs/83xx/sbc834x_defconfig @@ -0,0 +1,828 @@ +# +# Automatically generated make config: don't edit @@ -33438,10 +33252,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/85xx/ksi8560_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/85xx/ksi8560_defconfig ++++ b/arch/powerpc/configs/85xx/ksi8560_defconfig @@ -0,0 +1,899 @@ +# +# Automatically generated make config: don't edit @@ -34342,10 +34154,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/85xx/mpc8540_ads_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/85xx/mpc8540_ads_defconfig ++++ b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig @@ -0,0 +1,796 @@ +# +# Automatically generated make config: don't edit @@ -35143,10 +34953,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/85xx/mpc8544_ds_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/85xx/mpc8544_ds_defconfig ++++ b/arch/powerpc/configs/85xx/mpc8544_ds_defconfig @@ -0,0 +1,1564 @@ +# +# Automatically generated make config: don't edit @@ -36712,10 +36520,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/85xx/mpc8560_ads_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/85xx/mpc8560_ads_defconfig ++++ b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig @@ -0,0 +1,885 @@ +# +# Automatically generated make config: don't edit @@ -37602,10 +37408,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/85xx/mpc8568mds_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/85xx/mpc8568mds_defconfig ++++ b/arch/powerpc/configs/85xx/mpc8568mds_defconfig @@ -0,0 +1,1117 @@ +# +# Automatically generated make config: don't edit @@ -38724,10 +38528,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/85xx/mpc8572_ds_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/85xx/mpc8572_ds_defconfig ++++ b/arch/powerpc/configs/85xx/mpc8572_ds_defconfig @@ -0,0 +1,1549 @@ +# +# Automatically generated make config: don't edit @@ -40278,10 +40080,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig ++++ b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig @@ -0,0 +1,935 @@ +# +# Automatically generated make config: don't edit @@ -41218,10 +41018,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/85xx/sbc8548_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/85xx/sbc8548_defconfig ++++ b/arch/powerpc/configs/85xx/sbc8548_defconfig @@ -0,0 +1,812 @@ +# +# Automatically generated make config: don't edit @@ -42035,10 +41833,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/85xx/sbc8560_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/85xx/sbc8560_defconfig ++++ b/arch/powerpc/configs/85xx/sbc8560_defconfig @@ -0,0 +1,830 @@ +# +# Automatically generated make config: don't edit @@ -42870,10 +42666,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/85xx/stx_gp3_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/85xx/stx_gp3_defconfig ++++ b/arch/powerpc/configs/85xx/stx_gp3_defconfig @@ -0,0 +1,1253 @@ +# +# Automatically generated make config: don't edit @@ -44128,10 +43922,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/85xx/tqm8540_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/85xx/tqm8540_defconfig ++++ b/arch/powerpc/configs/85xx/tqm8540_defconfig @@ -0,0 +1,1097 @@ +# +# Automatically generated make config: don't edit @@ -45230,10 +45022,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/85xx/tqm8541_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/85xx/tqm8541_defconfig ++++ b/arch/powerpc/configs/85xx/tqm8541_defconfig @@ -0,0 +1,1109 @@ +# +# Automatically generated make config: don't edit @@ -46344,10 +46134,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/85xx/tqm8555_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/85xx/tqm8555_defconfig ++++ b/arch/powerpc/configs/85xx/tqm8555_defconfig @@ -0,0 +1,1109 @@ +# +# Automatically generated make config: don't edit @@ -47458,10 +47246,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/85xx/tqm8560_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/85xx/tqm8560_defconfig ++++ b/arch/powerpc/configs/85xx/tqm8560_defconfig @@ -0,0 +1,1109 @@ +# +# Automatically generated make config: don't edit @@ -48572,9 +48358,7 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/bamboo_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/bamboo_defconfig +--- a/arch/powerpc/configs/bamboo_defconfig +++ /dev/null @@ -1,815 +0,0 @@ -# @@ -49392,10 +49176,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/configs/chrp32_defconfig ++++ b/arch/powerpc/configs/chrp32_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit @@ -49405,7 +49187,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/chrp32_defconfig # # CONFIG_PPC64 is not set -@@ -74,8 +74,6 @@ CONFIG_IKCONFIG_PROC=y +@@ -74,8 +74,6 @@ CONFIG_LOG_BUF_SHIFT=15 # CONFIG_CGROUPS is not set # CONFIG_GROUP_SCHED is not set @@ -49414,7 +49196,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/chrp32_defconfig CONFIG_SYSFS_DEPRECATED=y CONFIG_SYSFS_DEPRECATED_V2=y # CONFIG_RELAY is not set -@@ -243,7 +241,7 @@ CONFIG_PCI_SYSCALL=y +@@ -243,7 +241,7 @@ # CONFIG_PCIEPORTBUS is not set CONFIG_ARCH_SUPPORTS_MSI=y # CONFIG_PCI_MSI is not set @@ -49423,7 +49205,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/chrp32_defconfig # CONFIG_PCI_DEBUG is not set # CONFIG_PCCARD is not set # CONFIG_HOTPLUG_PCI is not set -@@ -1328,6 +1326,7 @@ CONFIG_PLIST=y +@@ -1328,6 +1326,7 @@ CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y @@ -49431,9 +49213,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/chrp32_defconfig # # Kernel hacking -Index: linux-2.6.25.4/arch/powerpc/configs/ebony_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/ebony_defconfig +--- a/arch/powerpc/configs/ebony_defconfig +++ /dev/null @@ -1,898 +0,0 @@ -# @@ -50334,9 +50114,7 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/ep405_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/ep405_defconfig +--- a/arch/powerpc/configs/ep405_defconfig +++ /dev/null @@ -1,968 +0,0 @@ -# @@ -51307,10 +51085,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/configs/g5_defconfig ++++ b/arch/powerpc/configs/g5_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit @@ -51320,7 +51096,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/g5_defconfig # CONFIG_PPC64=y -@@ -77,8 +77,6 @@ CONFIG_IKCONFIG_PROC=y +@@ -77,8 +77,6 @@ CONFIG_LOG_BUF_SHIFT=17 # CONFIG_CGROUPS is not set # CONFIG_GROUP_SCHED is not set @@ -51329,7 +51105,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/g5_defconfig CONFIG_SYSFS_DEPRECATED=y CONFIG_SYSFS_DEPRECATED_V2=y # CONFIG_RELAY is not set -@@ -276,7 +274,7 @@ CONFIG_PCI_SYSCALL=y +@@ -276,7 +274,7 @@ # CONFIG_PCIEPORTBUS is not set CONFIG_ARCH_SUPPORTS_MSI=y CONFIG_PCI_MSI=y @@ -51338,7 +51114,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/g5_defconfig # CONFIG_PCI_DEBUG is not set # CONFIG_PCCARD is not set # CONFIG_HOTPLUG_PCI is not set -@@ -1596,6 +1594,7 @@ CONFIG_PLIST=y +@@ -1596,6 +1594,7 @@ CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y @@ -51346,10 +51122,8 @@ Index: linux-2.6.25.4/arch/powerpc/configs/g5_defconfig # # Kernel hacking -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/configs/iseries_defconfig ++++ b/arch/powerpc/configs/iseries_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit @@ -51359,7 +51133,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/iseries_defconfig # CONFIG_PPC64=y -@@ -77,8 +77,6 @@ CONFIG_IKCONFIG_PROC=y +@@ -77,8 +77,6 @@ CONFIG_LOG_BUF_SHIFT=17 # CONFIG_CGROUPS is not set # CONFIG_GROUP_SCHED is not set @@ -51368,7 +51142,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/iseries_defconfig CONFIG_SYSFS_DEPRECATED=y CONFIG_SYSFS_DEPRECATED_V2=y # CONFIG_RELAY is not set -@@ -261,7 +259,7 @@ CONFIG_PCI_SYSCALL=y +@@ -261,7 +259,7 @@ # CONFIG_PCIEPORTBUS is not set CONFIG_ARCH_SUPPORTS_MSI=y # CONFIG_PCI_MSI is not set @@ -51377,7 +51151,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/iseries_defconfig # CONFIG_PCI_DEBUG is not set # CONFIG_PCCARD is not set # CONFIG_HOTPLUG_PCI is not set -@@ -1065,6 +1063,7 @@ CONFIG_PLIST=y +@@ -1065,6 +1063,7 @@ CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y @@ -51385,9 +51159,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/iseries_defconfig # # Kernel hacking -Index: linux-2.6.25.4/arch/powerpc/configs/katmai_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/katmai_defconfig +--- a/arch/powerpc/configs/katmai_defconfig +++ /dev/null @@ -1,790 +0,0 @@ -# @@ -52180,9 +51952,7 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/kilauea_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/kilauea_defconfig +--- a/arch/powerpc/configs/kilauea_defconfig +++ /dev/null @@ -1,839 +0,0 @@ -# @@ -53024,9 +52794,7 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/makalu_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/makalu_defconfig +--- a/arch/powerpc/configs/makalu_defconfig +++ /dev/null @@ -1,839 +0,0 @@ -# @@ -53868,11 +53636,9 @@ Index: linux-2.6.25.4/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.4/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" +--- a/arch/powerpc/configs/maple_defconfig ++++ b/arch/powerpc/configs/maple_defconfig +@@ -333,7 +333,7 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y @@ -53881,7 +53647,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/maple_defconfig # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set -@@ -374,6 +374,7 @@ CONFIG_BLK_DEV_IDEDISK=y +@@ -374,6 +374,7 @@ CONFIG_BLK_DEV_IDECD=y # CONFIG_BLK_DEV_IDETAPE is not set # CONFIG_BLK_DEV_IDEFLOPPY is not set @@ -53889,7 +53655,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/maple_defconfig CONFIG_IDE_TASK_IOCTL=y CONFIG_IDE_PROC_FS=y -@@ -427,10 +428,129 @@ CONFIG_IDE_ARCH_OBSOLETE_INIT=y +@@ -427,10 +428,129 @@ # SCSI device support # # CONFIG_RAID_ATTRS is not set @@ -54022,7 +53788,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/maple_defconfig # CONFIG_MD is not set # CONFIG_FUSION is not set -@@ -536,6 +656,7 @@ CONFIG_USB_PEGASUS=y +@@ -536,6 +656,7 @@ # CONFIG_HIPPI is not set # CONFIG_PPP is not set # CONFIG_SLIP is not set @@ -54030,7 +53796,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/maple_defconfig # CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set -@@ -783,12 +904,14 @@ CONFIG_USB_UHCI_HCD=y +@@ -783,12 +904,14 @@ # # may also be needed; see USB_STORAGE Help for more information # @@ -54045,9 +53811,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/maple_defconfig CONFIG_USB_MON=y # -Index: linux-2.6.25.4/arch/powerpc/configs/mpc8313_rdb_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/mpc8313_rdb_defconfig +--- a/arch/powerpc/configs/mpc8313_rdb_defconfig +++ /dev/null @@ -1,1393 +0,0 @@ -# @@ -55443,9 +55207,7 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/mpc8315_rdb_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/mpc8315_rdb_defconfig +--- a/arch/powerpc/configs/mpc8315_rdb_defconfig +++ /dev/null @@ -1,1451 +0,0 @@ -# @@ -56899,9 +56661,7 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/mpc832x_mds_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/mpc832x_mds_defconfig +--- a/arch/powerpc/configs/mpc832x_mds_defconfig +++ /dev/null @@ -1,1081 +0,0 @@ -# @@ -57985,9 +57745,7 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/mpc832x_rdb_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/mpc832x_rdb_defconfig +--- a/arch/powerpc/configs/mpc832x_rdb_defconfig +++ /dev/null @@ -1,1233 +0,0 @@ -# @@ -59223,9 +58981,7 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/mpc834x_itx_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/mpc834x_itx_defconfig +--- a/arch/powerpc/configs/mpc834x_itx_defconfig +++ /dev/null @@ -1,1295 +0,0 @@ -# @@ -60523,9 +60279,7 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/mpc834x_itxgp_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/mpc834x_itxgp_defconfig +--- a/arch/powerpc/configs/mpc834x_itxgp_defconfig +++ /dev/null @@ -1,1222 +0,0 @@ -# @@ -61750,9 +61504,7 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/mpc834x_mds_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/mpc834x_mds_defconfig +--- a/arch/powerpc/configs/mpc834x_mds_defconfig +++ /dev/null @@ -1,1021 +0,0 @@ -# @@ -62776,9 +62528,7 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/mpc836x_mds_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/mpc836x_mds_defconfig +--- a/arch/powerpc/configs/mpc836x_mds_defconfig +++ /dev/null @@ -1,1079 +0,0 @@ -# @@ -63860,9 +63610,7 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/mpc837x_mds_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/mpc837x_mds_defconfig +--- a/arch/powerpc/configs/mpc837x_mds_defconfig +++ /dev/null @@ -1,899 +0,0 @@ -# @@ -64764,9 +64512,7 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/mpc837x_rdb_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/mpc837x_rdb_defconfig +--- a/arch/powerpc/configs/mpc837x_rdb_defconfig +++ /dev/null @@ -1,930 +0,0 @@ -# @@ -65699,10 +65445,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/configs/mpc83xx_defconfig ++++ b/arch/powerpc/configs/mpc83xx_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit @@ -65713,7 +65457,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/mpc83xx_defconfig # # CONFIG_PPC64 is not set -@@ -201,6 +201,7 @@ CONFIG_PREEMPT_NONE=y +@@ -201,6 +201,7 @@ # CONFIG_PREEMPT is not set CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_MISC is not set @@ -65721,7 +65465,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/mpc83xx_defconfig CONFIG_MATH_EMULATION=y # CONFIG_IOMMU_HELPER is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y -@@ -353,7 +354,90 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y +@@ -353,7 +354,90 @@ # CONFIG_FW_LOADER is not set # CONFIG_SYS_HYPERVISOR is not set # CONFIG_CONNECTOR is not set @@ -65813,7 +65557,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/mpc83xx_defconfig CONFIG_OF_DEVICE=y # CONFIG_PARPORT is not set CONFIG_BLK_DEV=y -@@ -362,6 +446,7 @@ CONFIG_BLK_DEV=y +@@ -362,6 +446,7 @@ CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_CRYPTOLOOP is not set # CONFIG_BLK_DEV_NBD is not set @@ -65821,7 +65565,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/mpc83xx_defconfig CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=32768 -@@ -469,6 +554,15 @@ CONFIG_NETDEV_10000=y +@@ -469,6 +554,15 @@ # # CONFIG_WLAN_PRE80211 is not set # CONFIG_WLAN_80211 is not set @@ -65837,7 +65581,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/mpc83xx_defconfig # CONFIG_WAN is not set # CONFIG_PPP is not set # CONFIG_SLIP is not set -@@ -563,6 +657,7 @@ CONFIG_I2C_MPC=y +@@ -563,6 +657,7 @@ # CONFIG_I2C_SIMTEC is not set # CONFIG_I2C_TAOS_EVM is not set # CONFIG_I2C_STUB is not set @@ -65845,7 +65589,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/mpc83xx_defconfig # # Miscellaneous I2C Chip support -@@ -648,6 +743,11 @@ CONFIG_WATCHDOG=y +@@ -648,6 +743,11 @@ CONFIG_83xx_WDT=y # @@ -65857,7 +65601,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/mpc83xx_defconfig # Sonics Silicon Backplane # CONFIG_SSB_POSSIBLE=y -@@ -664,6 +764,7 @@ CONFIG_SSB_POSSIBLE=y +@@ -664,6 +764,7 @@ # CONFIG_VIDEO_DEV is not set # CONFIG_DVB_CORE is not set CONFIG_DAB=y @@ -65865,7 +65609,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/mpc83xx_defconfig # # Graphics support -@@ -686,6 +787,14 @@ CONFIG_HID_SUPPORT=y +@@ -686,6 +787,14 @@ CONFIG_HID=y # CONFIG_HID_DEBUG is not set # CONFIG_HIDRAW is not set @@ -65880,7 +65624,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/mpc83xx_defconfig CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y # CONFIG_USB_ARCH_HAS_OHCI is not set -@@ -715,8 +824,55 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y +@@ -715,8 +824,55 @@ # CONFIG_USB_R8A66597_HCD is not set # @@ -65936,7 +65680,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/mpc83xx_defconfig # CONFIG_USB_GADGET is not set # CONFIG_MMC is not set # CONFIG_MEMSTICK is not set -@@ -792,6 +948,7 @@ CONFIG_TMPFS=y +@@ -792,6 +948,7 @@ # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set @@ -65944,7 +65688,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/mpc83xx_defconfig # CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set # CONFIG_MINIX_FS is not set -@@ -862,6 +1019,7 @@ CONFIG_PLIST=y +@@ -862,6 +1019,7 @@ CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y @@ -65952,9 +65696,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/mpc83xx_defconfig # # Kernel hacking -Index: linux-2.6.25.4/arch/powerpc/configs/mpc8540_ads_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/mpc8540_ads_defconfig +--- a/arch/powerpc/configs/mpc8540_ads_defconfig +++ /dev/null @@ -1,796 +0,0 @@ -# @@ -66753,9 +66495,7 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/mpc8544_ds_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/mpc8544_ds_defconfig +--- a/arch/powerpc/configs/mpc8544_ds_defconfig +++ /dev/null @@ -1,1549 +0,0 @@ -# @@ -68307,9 +68047,7 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/mpc8560_ads_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/mpc8560_ads_defconfig +--- a/arch/powerpc/configs/mpc8560_ads_defconfig +++ /dev/null @@ -1,885 +0,0 @@ -# @@ -69197,9 +68935,7 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/mpc8568mds_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/mpc8568mds_defconfig +--- a/arch/powerpc/configs/mpc8568mds_defconfig +++ /dev/null @@ -1,1117 +0,0 @@ -# @@ -70319,9 +70055,7 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/mpc8572_ds_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/mpc8572_ds_defconfig +--- a/arch/powerpc/configs/mpc8572_ds_defconfig +++ /dev/null @@ -1,1549 +0,0 @@ -# @@ -71873,9 +71607,7 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/mpc85xx_cds_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/mpc85xx_cds_defconfig +--- a/arch/powerpc/configs/mpc85xx_cds_defconfig +++ /dev/null @@ -1,935 +0,0 @@ -# @@ -72813,10 +72545,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/configs/pmac32_defconfig ++++ b/arch/powerpc/configs/pmac32_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit @@ -72826,7 +72556,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/pmac32_defconfig # # CONFIG_PPC64 is not set -@@ -77,8 +77,6 @@ CONFIG_IKCONFIG_PROC=y +@@ -77,8 +77,6 @@ CONFIG_LOG_BUF_SHIFT=14 # CONFIG_CGROUPS is not set # CONFIG_GROUP_SCHED is not set @@ -72835,7 +72565,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/pmac32_defconfig CONFIG_SYSFS_DEPRECATED=y CONFIG_SYSFS_DEPRECATED_V2=y # CONFIG_RELAY is not set -@@ -272,7 +270,7 @@ CONFIG_PCI_SYSCALL=y +@@ -272,7 +270,7 @@ # CONFIG_PCIEPORTBUS is not set CONFIG_ARCH_SUPPORTS_MSI=y # CONFIG_PCI_MSI is not set @@ -72844,7 +72574,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/pmac32_defconfig # CONFIG_PCI_DEBUG is not set CONFIG_PCCARD=m # CONFIG_PCMCIA_DEBUG is not set -@@ -1895,6 +1893,7 @@ CONFIG_PLIST=y +@@ -1895,6 +1893,7 @@ CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y @@ -72852,10 +72582,8 @@ Index: linux-2.6.25.4/arch/powerpc/configs/pmac32_defconfig # # Kernel hacking -Index: linux-2.6.25.4/arch/powerpc/configs/ppc40x_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/ppc40x_defconfig ++++ b/arch/powerpc/configs/ppc40x_defconfig @@ -0,0 +1,896 @@ +# +# Automatically generated make config: don't edit @@ -73753,10 +73481,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/configs/ppc44x_defconfig ++++ b/arch/powerpc/configs/ppc44x_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit @@ -73767,7 +73493,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/ppc44x_defconfig # # CONFIG_PPC64 is not set -@@ -79,6 +79,7 @@ CONFIG_FAIR_GROUP_SCHED=y +@@ -79,6 +79,7 @@ CONFIG_USER_SCHED=y # CONFIG_CGROUP_SCHED is not set CONFIG_SYSFS_DEPRECATED=y @@ -73775,7 +73501,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/ppc44x_defconfig # CONFIG_RELAY is not set # CONFIG_NAMESPACES is not set CONFIG_BLK_DEV_INITRD=y -@@ -113,6 +114,7 @@ CONFIG_SLUB=y +@@ -113,6 +114,7 @@ CONFIG_HAVE_OPROFILE=y # CONFIG_KPROBES is not set CONFIG_HAVE_KPROBES=y @@ -73783,7 +73509,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/ppc44x_defconfig CONFIG_PROC_PAGE_MONITOR=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y -@@ -143,7 +145,6 @@ CONFIG_DEFAULT_AS=y +@@ -143,7 +145,6 @@ # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="anticipatory" CONFIG_CLASSIC_RCU=y @@ -73791,7 +73517,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/ppc44x_defconfig CONFIG_PPC4xx_PCI_EXPRESS=y # -@@ -161,12 +162,15 @@ CONFIG_TAISHAN=y +@@ -161,12 +162,15 @@ CONFIG_KATMAI=y CONFIG_RAINIER=y CONFIG_WARP=y @@ -73807,7 +73533,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/ppc44x_defconfig CONFIG_IBM440EP_ERR42=y # CONFIG_IPIC is not set # CONFIG_MPIC is not set -@@ -199,7 +203,6 @@ CONFIG_HZ=250 +@@ -199,7 +203,6 @@ CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set @@ -73815,7 +73541,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/ppc44x_defconfig CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_MISC is not set CONFIG_MATH_EMULATION=y -@@ -232,6 +235,7 @@ CONFIG_ISA_DMA_API=y +@@ -232,6 +235,7 @@ # CONFIG_ZONE_DMA=y CONFIG_PPC_INDIRECT_PCI=y @@ -73823,7 +73549,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/ppc44x_defconfig CONFIG_PCI=y CONFIG_PCI_DOMAINS=y CONFIG_PCI_SYSCALL=y -@@ -678,6 +682,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y +@@ -678,6 +682,7 @@ # CONFIG_INFINIBAND is not set # CONFIG_EDAC is not set # CONFIG_RTC_CLASS is not set @@ -73831,7 +73557,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/ppc44x_defconfig # # Userspace I/O -@@ -805,6 +810,7 @@ CONFIG_PLIST=y +@@ -805,6 +810,7 @@ CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y @@ -73839,10 +73565,8 @@ Index: linux-2.6.25.4/arch/powerpc/configs/ppc44x_defconfig # # Kernel hacking -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/configs/ppc64_defconfig ++++ b/arch/powerpc/configs/ppc64_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit @@ -73852,7 +73576,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/ppc64_defconfig # CONFIG_PPC64=y -@@ -84,8 +84,6 @@ CONFIG_CGROUPS=y +@@ -84,8 +84,6 @@ # CONFIG_CGROUP_NS is not set CONFIG_CPUSETS=y # CONFIG_GROUP_SCHED is not set @@ -73861,7 +73585,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/ppc64_defconfig # CONFIG_CGROUP_CPUACCT is not set # CONFIG_RESOURCE_COUNTERS is not set CONFIG_SYSFS_DEPRECATED=y -@@ -289,6 +287,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y +@@ -289,6 +287,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y CONFIG_KEXEC=y # CONFIG_CRASH_DUMP is not set @@ -73869,7 +73593,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/ppc64_defconfig CONFIG_IRQ_ALL_CPUS=y # CONFIG_NUMA is not set CONFIG_ARCH_SELECT_MEMORY_MODEL=y -@@ -335,7 +334,7 @@ CONFIG_PCI_SYSCALL=y +@@ -335,7 +334,7 @@ # CONFIG_PCIEPORTBUS is not set CONFIG_ARCH_SUPPORTS_MSI=y CONFIG_PCI_MSI=y @@ -73878,7 +73602,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/ppc64_defconfig # CONFIG_PCI_DEBUG is not set CONFIG_PCCARD=y # CONFIG_PCMCIA_DEBUG is not set -@@ -1881,6 +1880,7 @@ CONFIG_PLIST=y +@@ -1881,6 +1880,7 @@ CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y @@ -73886,10 +73610,8 @@ Index: linux-2.6.25.4/arch/powerpc/configs/ppc64_defconfig # # Kernel hacking -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/configs/pseries_defconfig ++++ b/arch/powerpc/configs/pseries_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit @@ -73899,7 +73621,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/pseries_defconfig # CONFIG_PPC64=y -@@ -83,8 +83,6 @@ CONFIG_CGROUPS=y +@@ -83,8 +83,6 @@ CONFIG_CGROUP_NS=y CONFIG_CPUSETS=y # CONFIG_GROUP_SCHED is not set @@ -73908,7 +73630,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/pseries_defconfig CONFIG_CGROUP_CPUACCT=y # CONFIG_RESOURCE_COUNTERS is not set CONFIG_SYSFS_DEPRECATED=y -@@ -237,6 +235,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y +@@ -237,6 +235,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y CONFIG_KEXEC=y # CONFIG_CRASH_DUMP is not set @@ -73916,7 +73638,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/pseries_defconfig CONFIG_IRQ_ALL_CPUS=y CONFIG_NUMA=y CONFIG_NODES_SHIFT=4 -@@ -283,7 +282,7 @@ CONFIG_PCI_SYSCALL=y +@@ -283,7 +282,7 @@ # CONFIG_PCIEPORTBUS is not set CONFIG_ARCH_SUPPORTS_MSI=y CONFIG_PCI_MSI=y @@ -73925,7 +73647,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/pseries_defconfig # CONFIG_PCI_DEBUG is not set # CONFIG_PCCARD is not set CONFIG_HOTPLUG_PCI=m -@@ -1519,6 +1518,7 @@ CONFIG_PLIST=y +@@ -1519,6 +1518,7 @@ CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y @@ -73933,9 +73655,7 @@ Index: linux-2.6.25.4/arch/powerpc/configs/pseries_defconfig # # Kernel hacking -Index: linux-2.6.25.4/arch/powerpc/configs/rainier_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/rainier_defconfig +--- a/arch/powerpc/configs/rainier_defconfig +++ /dev/null @@ -1,899 +0,0 @@ -# @@ -74837,9 +74557,7 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/sbc834x_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/sbc834x_defconfig +--- a/arch/powerpc/configs/sbc834x_defconfig +++ /dev/null @@ -1,828 +0,0 @@ -# @@ -75670,9 +75388,7 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/sbc8548_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/sbc8548_defconfig +--- a/arch/powerpc/configs/sbc8548_defconfig +++ /dev/null @@ -1,812 +0,0 @@ -# @@ -76487,9 +76203,7 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/sbc8560_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/sbc8560_defconfig +--- a/arch/powerpc/configs/sbc8560_defconfig +++ /dev/null @@ -1,830 +0,0 @@ -# @@ -77322,10 +77036,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/sbc8641d_defconfig -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/configs/sbc8641d_defconfig ++++ b/arch/powerpc/configs/sbc8641d_defconfig @@ -0,0 +1,1342 @@ +# +# Automatically generated make config: don't edit @@ -78669,9 +78381,7 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/sequoia_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/sequoia_defconfig +--- a/arch/powerpc/configs/sequoia_defconfig +++ /dev/null @@ -1,916 +0,0 @@ -# @@ -79590,9 +79300,7 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/stx_gp3_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/stx_gp3_defconfig +--- a/arch/powerpc/configs/stx_gp3_defconfig +++ /dev/null @@ -1,1253 +0,0 @@ -# @@ -80848,9 +80556,7 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/taishan_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/taishan_defconfig +--- a/arch/powerpc/configs/taishan_defconfig +++ /dev/null @@ -1,815 +0,0 @@ -# @@ -81668,9 +81374,7 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/tqm8540_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/tqm8540_defconfig +--- a/arch/powerpc/configs/tqm8540_defconfig +++ /dev/null @@ -1,1097 +0,0 @@ -# @@ -82770,9 +82474,7 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/tqm8541_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/tqm8541_defconfig +--- a/arch/powerpc/configs/tqm8541_defconfig +++ /dev/null @@ -1,1109 +0,0 @@ -# @@ -83884,9 +83586,7 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/tqm8555_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/tqm8555_defconfig +--- a/arch/powerpc/configs/tqm8555_defconfig +++ /dev/null @@ -1,1109 +0,0 @@ -# @@ -84998,9 +84698,7 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/tqm8560_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/tqm8560_defconfig +--- a/arch/powerpc/configs/tqm8560_defconfig +++ /dev/null @@ -1,1109 +0,0 @@ -# @@ -86112,9 +85810,7 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/walnut_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/walnut_defconfig +--- a/arch/powerpc/configs/walnut_defconfig +++ /dev/null @@ -1,887 +0,0 @@ -# @@ -87004,9 +86700,7 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/configs/warp_defconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/configs/warp_defconfig +--- a/arch/powerpc/configs/warp_defconfig +++ /dev/null @@ -1,1110 +0,0 @@ -# @@ -88119,11 +87813,9 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/kernel/Makefile ++++ b/arch/powerpc/kernel/Makefile +@@ -67,6 +67,7 @@ obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_KPROBES) += kprobes.o obj-$(CONFIG_PPC_UDBG_16550) += legacy_serial.o udbg_16550.o @@ -88131,10 +87823,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/kernel/asm-offsets.c ++++ b/arch/powerpc/kernel/asm-offsets.c @@ -26,8 +26,6 @@ #ifdef CONFIG_PPC64 #include <linux/time.h> @@ -88154,7 +87844,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/asm-offsets.c #define DEFINE(sym, val) \ asm volatile("\n->" #sym " %0 " #val : : "i" (val)) -@@ -60,7 +61,6 @@ int main(void) +@@ -60,7 +61,6 @@ DEFINE(AUDITCONTEXT, offsetof(struct task_struct, audit_context)); #else DEFINE(THREAD_INFO, offsetof(struct task_struct, stack)); @@ -88162,7 +87852,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/asm-offsets.c #endif /* CONFIG_PPC64 */ DEFINE(KSP, offsetof(struct thread_struct, ksp)); -@@ -80,7 +80,6 @@ int main(void) +@@ -80,7 +80,6 @@ DEFINE(PGDIR, offsetof(struct thread_struct, pgdir)); #if defined(CONFIG_4xx) || defined(CONFIG_BOOKE) DEFINE(THREAD_DBCR0, offsetof(struct thread_struct, dbcr0)); @@ -88170,7 +87860,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/asm-offsets.c #endif #ifdef CONFIG_SPE DEFINE(THREAD_EVR0, offsetof(struct thread_struct, evr[0])); -@@ -325,6 +324,9 @@ int main(void) +@@ -325,6 +324,9 @@ DEFINE(PAGE_OFFSET_VSID, KERNEL_VSID(PAGE_OFFSET)); DEFINE(VMALLOC_START_ESID, GET_ESID(VMALLOC_START)); DEFINE(VMALLOC_START_VSID, KERNEL_VSID(VMALLOC_START)); @@ -88180,10 +87870,8 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/asm-offsets.c #endif DEFINE(PGD_TABLE_SIZE, PGD_TABLE_SIZE); -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/kernel/btext.c ++++ b/arch/powerpc/kernel/btext.c @@ -7,6 +7,7 @@ #include <linux/string.h> #include <linux/init.h> @@ -88201,10 +87889,8 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/btext.c #include <asm/processor.h> #include <asm/udbg.h> -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/kernel/cpu_setup_44x.S ++++ b/arch/powerpc/kernel/cpu_setup_44x.S @@ -3,7 +3,7 @@ * Valentine Barshak <vbarshak@ru.mvista.com> * MontaVista Software, Inc (c) 2007 @@ -88214,7 +87900,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/cpu_setup_44x.S * Benjamin Herrenschmidt <benh@kernel.crashing.org> * * This program is free software; you can redistribute it and/or -@@ -32,6 +32,9 @@ _GLOBAL(__setup_cpu_440grx) +@@ -32,6 +32,9 @@ bl __fixup_440A_mcheck mtlr r4 blr @@ -88224,11 +87910,9 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/cpu_setup_44x.S _GLOBAL(__setup_cpu_440gx) _GLOBAL(__setup_cpu_440spe) b __fixup_440A_mcheck -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/kernel/cputable.c ++++ b/arch/powerpc/kernel/cputable.c +@@ -36,6 +36,8 @@ extern void __setup_cpu_440gx(unsigned long offset, struct cpu_spec* spec); extern void __setup_cpu_440grx(unsigned long offset, struct cpu_spec* spec); extern void __setup_cpu_440spe(unsigned long offset, struct cpu_spec* spec); @@ -88237,7 +87921,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/cputable.c extern void __setup_cpu_603(unsigned long offset, struct cpu_spec* spec); extern void __setup_cpu_604(unsigned long offset, struct cpu_spec* spec); extern void __setup_cpu_750(unsigned long offset, struct cpu_spec* spec); -@@ -1397,6 +1399,30 @@ static struct cpu_spec __initdata cpu_sp +@@ -1397,6 +1399,30 @@ .machine_check = machine_check_440A, .platform = "ppc440", }, @@ -88268,7 +87952,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/cputable.c #endif /* CONFIG_44x */ #ifdef CONFIG_FSL_BOOKE #ifdef CONFIG_E200 -@@ -1512,7 +1538,7 @@ struct cpu_spec * __init identify_cpu(un +@@ -1512,7 +1538,7 @@ *t = *s; *PTRRELOC(&cur_cpu_spec) = &the_cpu_spec; #if defined(CONFIG_PPC64) || defined(CONFIG_BOOKE) @@ -88277,10 +87961,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/kernel/crash.c ++++ b/arch/powerpc/kernel/crash.c @@ -24,12 +24,13 @@ #include <linux/init.h> #include <linux/irq.h> @@ -88296,10 +87978,8 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/crash.c #include <asm/firmware.h> #include <asm/smp.h> #include <asm/system.h> -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/kernel/crash_dump.c ++++ b/arch/powerpc/kernel/crash_dump.c @@ -13,8 +13,9 @@ #include <linux/crash_dump.h> @@ -88311,11 +87991,9 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/crash_dump.c #include <asm/firmware.h> #include <asm/uaccess.h> -Index: linux-2.6.25.4/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: +--- a/arch/powerpc/kernel/entry_32.S ++++ b/arch/powerpc/kernel/entry_32.S +@@ -110,9 +110,9 @@ stw r11,PT_REGS(r12) #if defined(CONFIG_40x) || defined(CONFIG_BOOKE) /* Check to see if the dbcr0 register is set up to debug. Use the @@ -88327,7 +88005,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/entry_32.S beq+ 3f /* From user and task is ptraced - load up global dbcr0 */ li r12,-1 /* clear all pending debug events */ -@@ -120,6 +120,12 @@ transfer_to_handler: +@@ -120,6 +120,12 @@ lis r11,global_dbcr0@ha tophys(r11,r11) addi r11,r11,global_dbcr0@l @@ -88340,7 +88018,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/entry_32.S lwz r12,0(r11) mtspr SPRN_DBCR0,r12 lwz r12,4(r11) -@@ -238,10 +244,10 @@ ret_from_syscall: +@@ -238,10 +244,10 @@ stw r11,_CCR(r1) syscall_exit_cont: #if defined(CONFIG_4xx) || defined(CONFIG_BOOKE) @@ -88354,7 +88032,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/entry_32.S bnel- load_dbcr0 #endif #ifdef CONFIG_44x -@@ -666,10 +672,10 @@ user_exc_return: /* r10 contains MSR_KE +@@ -666,10 +672,10 @@ restore_user: #if defined(CONFIG_4xx) || defined(CONFIG_BOOKE) @@ -88368,7 +88046,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/entry_32.S bnel- load_dbcr0 #endif -@@ -879,6 +885,12 @@ load_dbcr0: +@@ -879,6 +885,12 @@ mfspr r10,SPRN_DBCR0 lis r11,global_dbcr0@ha addi r11,r11,global_dbcr0@l @@ -88381,7 +88059,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/entry_32.S stw r10,0(r11) mtspr SPRN_DBCR0,r0 lwz r10,4(r11) -@@ -891,7 +903,7 @@ load_dbcr0: +@@ -891,7 +903,7 @@ .section .bss .align 4 global_dbcr0: @@ -88390,10 +88068,8 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/entry_32.S .previous #endif /* !(CONFIG_4xx || CONFIG_BOOKE) */ -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/kernel/entry_64.S ++++ b/arch/powerpc/kernel/entry_64.S @@ -29,6 +29,8 @@ #include <asm/cputable.h> #include <asm/firmware.h> @@ -88412,7 +88088,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/entry_64.S .section ".text" .align 7 -@@ -88,6 +90,14 @@ system_call_common: +@@ -88,6 +90,14 @@ addi r9,r1,STACK_FRAME_OVERHEAD ld r11,exception_marker@toc(r2) std r11,-16(r9) /* "regshere" marker */ @@ -88427,7 +88103,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/entry_64.S li r10,1 stb r10,PACASOFTIRQEN(r13) stb r10,PACAHARDIRQEN(r13) -@@ -102,7 +112,7 @@ BEGIN_FW_FTR_SECTION +@@ -102,7 +112,7 @@ b hardware_interrupt_entry 2: END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES) @@ -88436,7 +88112,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/entry_64.S mfmsr r11 ori r11,r11,MSR_EE mtmsrd r11,1 -@@ -504,6 +514,10 @@ BEGIN_FW_FTR_SECTION +@@ -504,6 +514,10 @@ li r3,0 stb r3,PACASOFTIRQEN(r13) /* ensure we are soft-disabled */ @@ -88447,7 +88123,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/entry_64.S ori r10,r10,MSR_EE mtmsrd r10 /* hard-enable again */ addi r3,r1,STACK_FRAME_OVERHEAD -@@ -512,7 +526,7 @@ BEGIN_FW_FTR_SECTION +@@ -512,7 +526,7 @@ 4: END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES) #endif @@ -88456,7 +88132,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/entry_64.S /* extract EE bit and use it to restore paca->hard_enabled */ ld r3,_MSR(r1) -@@ -580,6 +594,16 @@ do_work: +@@ -580,6 +594,16 @@ bne restore /* here we are preempting the current task */ 1: @@ -88473,10 +88149,8 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/entry_64.S li r0,1 stb r0,PACASOFTIRQEN(r13) stb r0,PACAHARDIRQEN(r13) -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/kernel/head_32.S ++++ b/arch/powerpc/kernel/head_32.S @@ -30,6 +30,7 @@ #include <asm/thread_info.h> #include <asm/ppc_asm.h> @@ -88485,7 +88159,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/head_32.S /* 601 only have IBAT; cr0.eq is set on 601 when using this macro */ #define LOAD_BAT(n, reg, RA, RB) \ -@@ -268,8 +269,8 @@ __secondary_hold_acknowledge: +@@ -268,8 +269,8 @@ li r10,MSR_KERNEL & ~(MSR_IR|MSR_DR); /* can take exceptions */ \ MTMSRD(r10); /* (except for mach check in rtas) */ \ stw r0,GPR0(r11); \ @@ -88496,7 +88170,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/head_32.S stw r10,8(r11); \ SAVE_4GPRS(3, r11); \ SAVE_2GPRS(7, r11) -@@ -763,23 +764,6 @@ load_up_altivec: +@@ -763,23 +764,6 @@ b fast_exception_return /* @@ -88520,11 +88194,9 @@ Index: linux-2.6.25.4/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.4/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 */ +--- a/arch/powerpc/kernel/head_44x.S ++++ b/arch/powerpc/kernel/head_44x.S +@@ -211,7 +211,7 @@ SET_IVOR(12, WatchdogTimer); SET_IVOR(13, DataTLBError); SET_IVOR(14, InstructionTLBError); @@ -88533,7 +88205,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/head_44x.S /* Establish the interrupt vector base */ lis r4,interrupt_base@h /* IVPR only uses the high 16-bits */ -@@ -578,7 +578,7 @@ interrupt_base: +@@ -578,7 +578,7 @@ b InstructionStorage /* Debug Interrupt */ @@ -88542,10 +88214,8 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/head_44x.S /* * Local functions -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/kernel/head_64.S ++++ b/arch/powerpc/kernel/head_64.S @@ -36,8 +36,7 @@ #include <asm/firmware.h> #include <asm/page_64.h> @@ -88556,7 +88226,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/head_64.S /* * We layout physical memory as follows: -@@ -450,8 +449,8 @@ bad_stack: +@@ -450,8 +449,8 @@ */ fast_exc_return_irq: /* restores irq state too */ ld r3,SOFTE(r1) @@ -88566,7 +88236,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/head_64.S rldicl r4,r12,49,63 /* get MSR_EE to LSB */ stb r4,PACAHARDIRQEN(r13) /* restore paca->hard_enabled */ b 1f -@@ -621,7 +620,7 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISER +@@ -621,7 +620,7 @@ mtlr r10 andi. r10,r12,MSR_RI /* check for unrecoverable exception */ @@ -88575,7 +88245,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/head_64.S .machine push .machine "power4" -@@ -643,6 +642,22 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISER +@@ -643,6 +642,22 @@ rfid b . /* prevent speculative execution */ @@ -88598,7 +88268,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/head_64.S unrecov_slb: EXCEPTION_PROLOG_COMMON(0x4100, PACA_EXSLB) DISABLE_INTS -@@ -808,7 +823,7 @@ _STATIC(load_up_altivec) +@@ -808,7 +823,7 @@ * Hash table stuff */ .align 7 @@ -88607,7 +88277,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/head_64.S std r3,_DAR(r1) std r4,_DSISR(r1) -@@ -820,6 +835,27 @@ BEGIN_FTR_SECTION +@@ -820,6 +835,27 @@ END_FTR_SECTION_IFCLR(CPU_FTR_SLB) /* @@ -88635,7 +88305,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/head_64.S * We need to set the _PAGE_USER bit if MSR_PR is set or if we are * accessing a userspace segment (even from the kernel). We assume * kernel addresses always have the high bit set. -@@ -832,13 +868,6 @@ END_FTR_SECTION_IFCLR(CPU_FTR_SLB) +@@ -832,13 +868,6 @@ rlwimi r4,r5,22+2,31-2,31-2 /* Set _PAGE_EXEC if trap is 0x400 */ /* @@ -88649,7 +88319,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/head_64.S * r3 contains the faulting address * r4 contains the required access permissions * r5 contains the trap number -@@ -848,7 +877,6 @@ END_FTR_SECTION_IFCLR(CPU_FTR_SLB) +@@ -848,7 +877,6 @@ bl .hash_page /* build HPTE if possible */ cmpdi r3,0 /* see if hash_page succeeded */ @@ -88657,7 +88327,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/head_64.S BEGIN_FW_FTR_SECTION /* * If we had interrupts soft-enabled at the point where the -@@ -860,7 +888,7 @@ BEGIN_FW_FTR_SECTION +@@ -860,7 +888,7 @@ */ beq 13f END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES) @@ -88666,7 +88336,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/head_64.S BEGIN_FW_FTR_SECTION /* * Here we have interrupts hard-disabled, so it is sufficient -@@ -874,11 +902,12 @@ END_FW_FTR_SECTION_IFCLR(FW_FEATURE_ISER +@@ -874,11 +902,12 @@ /* * hash_page couldn't handle it, set soft interrupt enable back @@ -88681,7 +88351,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/head_64.S b 11f /* Here we have a page fault that hash_page can't handle. */ -@@ -1477,6 +1506,10 @@ _INIT_STATIC(start_here_multiplatform) +@@ -1477,6 +1506,10 @@ addi r2,r2,0x4000 add r2,r2,r26 @@ -88692,7 +88362,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/head_64.S /* Do very early kernel initializations, including initial hash table, * stab and slb setup before we turn on relocation. */ -@@ -1505,10 +1538,6 @@ _INIT_GLOBAL(start_here_common) +@@ -1505,10 +1538,6 @@ li r0,0 stdu r0,-STACK_FRAME_OVERHEAD(r1) @@ -88703,10 +88373,8 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/head_64.S /* Load the TOC */ ld r2,PACATOC(r13) std r1,PACAKSAVE(r13) -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/kernel/head_booke.h ++++ b/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. @@ -88735,7 +88403,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/head_booke.h #define DEBUG_SPRG SPRN_SPRG6W #ifdef CONFIG_SMP -@@ -212,9 +221,8 @@ label: +@@ -212,9 +221,8 @@ * save (and later restore) the MSR via SPRN_CSRR1, which will still have * the MSR_DE bit set. */ @@ -88747,7 +88415,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/head_booke.h DEBUG_EXCEPTION_PROLOG; \ \ /* \ -@@ -234,8 +242,8 @@ label: +@@ -234,8 +242,8 @@ cmplw r12,r10; \ blt+ 2f; /* addr below exception vectors */ \ \ @@ -88758,7 +88426,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/head_booke.h cmplw r12,r10; \ bgt+ 2f; /* addr above exception vectors */ \ \ -@@ -265,9 +273,9 @@ label: +@@ -265,9 +273,9 @@ 2: mfspr r4,SPRN_DBSR; \ addi r3,r1,STACK_FRAME_OVERHEAD; \ EXC_XFER_TEMPLATE(DebugException, 0x2002, (MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE)), NOCOPY, debug_transfer_to_handler, ret_from_debug_exc) @@ -88771,7 +88439,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/head_booke.h CRITICAL_EXCEPTION_PROLOG; \ \ /* \ -@@ -287,8 +295,8 @@ label: +@@ -287,8 +295,8 @@ cmplw r12,r10; \ blt+ 2f; /* addr below exception vectors */ \ \ @@ -88782,7 +88450,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/head_booke.h cmplw r12,r10; \ bgt+ 2f; /* addr above exception vectors */ \ \ -@@ -318,7 +326,6 @@ label: +@@ -318,7 +326,6 @@ 2: mfspr r4,SPRN_DBSR; \ addi r3,r1,STACK_FRAME_OVERHEAD; \ EXC_XFER_TEMPLATE(DebugException, 0x2002, (MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE)), NOCOPY, crit_transfer_to_handler, ret_from_crit_exc) @@ -88790,11 +88458,9 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/head_booke.h #define INSTRUCTION_STORAGE_EXCEPTION \ START_EXCEPTION(InstructionStorage) \ -Index: linux-2.6.25.4/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); +--- a/arch/powerpc/kernel/head_fsl_booke.S ++++ b/arch/powerpc/kernel/head_fsl_booke.S +@@ -68,7 +68,9 @@ mr r29,r5 mr r28,r6 mr r27,r7 @@ -88804,7 +88470,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/head_fsl_booke.S /* We try to not make any assumptions about how the boot loader * setup or used the TLBs. We invalidate all mappings from the -@@ -167,7 +169,28 @@ skpinv: addi r6,r6,1 /* Increment */ +@@ -167,7 +169,28 @@ mtspr SPRN_MAS0,r7 tlbre @@ -88834,7 +88500,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/head_fsl_booke.S lis r7,0x1000 /* Set MAS0(TLBSEL) = 1 */ rlwimi r7,r5,16,4,15 /* Setup MAS0 = TLBSEL | ESEL(r5) */ mtspr SPRN_MAS0,r7 -@@ -177,12 +200,10 @@ skpinv: addi r6,r6,1 /* Increment */ +@@ -177,12 +200,10 @@ ori r6,r6,(MAS1_TSIZE(BOOKE_PAGESZ_4K))@l mtspr SPRN_MAS1,r6 mfspr r6,SPRN_MAS2 @@ -88849,7 +88515,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/head_fsl_booke.S tlbwe xori r6,r4,1 -@@ -232,8 +253,7 @@ skpinv: addi r6,r6,1 /* Increment */ +@@ -232,8 +253,7 @@ ori r6,r6,PAGE_OFFSET@l rlwimi r6,r7,0,20,31 mtspr SPRN_MAS2,r6 @@ -88859,7 +88525,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/head_fsl_booke.S tlbwe /* 7. Jump to KERNELBASE mapping */ -@@ -283,7 +303,10 @@ skpinv: addi r6,r6,1 /* Increment */ +@@ -283,7 +303,10 @@ SET_IVOR(12, WatchdogTimer); SET_IVOR(13, DataTLBError); SET_IVOR(14, InstructionTLBError); @@ -88871,7 +88537,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/head_fsl_booke.S SET_IVOR(32, SPEUnavailable); SET_IVOR(33, SPEFloatingPointData); SET_IVOR(34, SPEFloatingPointRound); -@@ -718,7 +741,10 @@ interrupt_base: +@@ -718,7 +741,10 @@ /* Debug Interrupt */ @@ -88883,11 +88549,9 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/head_fsl_booke.S /* * Local functions -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/kernel/ibmebus.c ++++ b/arch/powerpc/kernel/ibmebus.c +@@ -183,7 +183,7 @@ ret = ibmebus_create_device(child); if (ret) { printk(KERN_ERR "%s: failed to create device (%i)", @@ -88896,7 +88560,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/ibmebus.c of_node_put(child); break; } -@@ -269,7 +269,7 @@ static ssize_t ibmebus_store_probe(struc +@@ -269,7 +269,7 @@ if (bus_find_device(&ibmebus_bus_type, NULL, path, ibmebus_match_path)) { printk(KERN_WARNING "%s: %s has already been probed\n", @@ -88905,7 +88569,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/ibmebus.c rc = -EEXIST; goto out; } -@@ -279,7 +279,7 @@ static ssize_t ibmebus_store_probe(struc +@@ -279,7 +279,7 @@ of_node_put(dn); } else { printk(KERN_WARNING "%s: no such device node: %s\n", @@ -88914,7 +88578,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/ibmebus.c rc = -ENODEV; } -@@ -308,7 +308,7 @@ static ssize_t ibmebus_store_remove(stru +@@ -308,7 +308,7 @@ return count; } else { printk(KERN_WARNING "%s: %s not on the bus\n", @@ -88923,7 +88587,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/ibmebus.c kfree(path); return -ENODEV; -@@ -337,14 +337,14 @@ static int __init ibmebus_bus_init(void) +@@ -337,14 +337,14 @@ err = of_bus_type_init(&ibmebus_bus_type, "ibmebus"); if (err) { printk(KERN_ERR "%s: failed to register IBM eBus.\n", @@ -88940,11 +88604,9 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/ibmebus.c bus_unregister(&ibmebus_bus_type); return err; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/kernel/iommu.c ++++ b/arch/powerpc/kernel/iommu.c +@@ -520,7 +520,7 @@ unsigned int order; if (!tbl || !tbl->it_map) { @@ -88953,7 +88615,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/iommu.c node_name); return; } -@@ -530,7 +530,7 @@ void iommu_free_table(struct iommu_table +@@ -530,7 +530,7 @@ for (i = 0; i < (tbl->it_size/64); i++) { if (tbl->it_map[i] != 0) { printk(KERN_WARNING "%s: Unexpected TCEs for %s\n", @@ -88962,11 +88624,9 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/iommu.c break; } } -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/kernel/irq.c ++++ b/arch/powerpc/kernel/irq.c +@@ -114,7 +114,7 @@ : : "r" (enable), "i" (offsetof(struct paca_struct, soft_enabled))); } @@ -88975,7 +88635,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/irq.c { /* * get_paca()->soft_enabled = en; -@@ -174,6 +174,7 @@ void local_irq_restore(unsigned long en) +@@ -174,6 +174,7 @@ __hard_irq_enable(); } @@ -88983,7 +88643,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/irq.c #endif /* CONFIG_PPC64 */ int show_interrupts(struct seq_file *p, void *v) -@@ -310,8 +311,21 @@ void do_IRQ(struct pt_regs *regs) +@@ -310,8 +311,21 @@ handler = &__do_IRQ; irqtp->task = curtp->task; irqtp->flags = 0; @@ -89005,7 +88665,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/irq.c if (irqtp->flags) set_bits(irqtp->flags, &curtp->flags); } else -@@ -357,7 +371,7 @@ void irq_ctx_init(void) +@@ -357,7 +371,7 @@ memset((void *)softirq_ctx[i], 0, THREAD_SIZE); tp = softirq_ctx[i]; tp->cpu = i; @@ -89014,11 +88674,9 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/irq.c memset((void *)hardirq_ctx[i], 0, THREAD_SIZE); tp = hardirq_ctx[i]; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/kernel/isa-bridge.c ++++ b/arch/powerpc/kernel/isa-bridge.c +@@ -80,13 +80,13 @@ * (size depending on dev->n_addr_cells) * cell 5: the size of the range */ @@ -89034,7 +88692,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/isa-bridge.c goto inval_range; isa_addr = range->isa_addr.a_lo; -@@ -99,7 +99,7 @@ static void __devinit pci_process_ISA_OF +@@ -99,7 +99,7 @@ */ if ((pci_addr != 0) || (isa_addr != 0)) { printk(KERN_ERR "unexpected isa to pci mapping: %s\n", @@ -89043,11 +88701,9 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/isa-bridge.c return; } -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/kernel/lparcfg.c ++++ b/arch/powerpc/kernel/lparcfg.c +@@ -226,7 +226,7 @@ unsigned char *local_buffer = kmalloc(SPLPAR_MAXLENGTH, GFP_KERNEL); if (!local_buffer) { printk(KERN_ERR "%s %s kmalloc failure at line %d \n", @@ -89056,7 +88712,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/lparcfg.c return; } -@@ -243,14 +243,14 @@ static void parse_system_parameter_strin +@@ -243,14 +243,14 @@ if (call_status != 0) { printk(KERN_INFO "%s %s Error calling get-system-parameter (0x%x)\n", @@ -89073,7 +88729,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/lparcfg.c kfree(local_buffer); return; } -@@ -484,10 +484,10 @@ static ssize_t lparcfg_write(struct file +@@ -484,10 +484,10 @@ current_weight = (resource >> 5 * 8) & 0xFF; pr_debug("%s: current_entitled = %lu, current_weight = %u\n", @@ -89086,7 +88742,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/lparcfg.c retval = plpar_hcall_norets(H_SET_PPP, *new_entitled_ptr, *new_weight_ptr); -@@ -502,7 +502,7 @@ static ssize_t lparcfg_write(struct file +@@ -502,7 +502,7 @@ retval = -EINVAL; } else { printk(KERN_WARNING "%s: received unknown hv return code %ld", @@ -89095,10 +88751,8 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/lparcfg.c retval = -EIO; } -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/kernel/machine_kexec.c ++++ b/arch/powerpc/kernel/machine_kexec.c @@ -12,8 +12,9 @@ #include <linux/kexec.h> #include <linux/reboot.h> @@ -89110,10 +88764,8 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/machine_kexec.c void machine_crash_shutdown(struct pt_regs *regs) { -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/kernel/paca.c ++++ b/arch/powerpc/kernel/paca.c @@ -15,7 +15,6 @@ #include <asm/ptrace.h> #include <asm/page.h> @@ -89141,7 +88793,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/paca.c */ struct lppaca lppaca[] = { [0 ... (NR_CPUS-1)] = { -@@ -66,32 +65,17 @@ struct slb_shadow slb_shadow[] __cacheli +@@ -66,32 +65,17 @@ * processors. The processor VPD array needs one entry per physical * processor (not thread). */ @@ -89178,10 +88830,8 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/paca.c struct paca_struct paca[] = { PACA_INIT(0), #if NR_CPUS > 1 -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/kernel/ppc_ksyms.c ++++ b/arch/powerpc/kernel/ppc_ksyms.c @@ -45,10 +45,6 @@ #include <asm/signal.h> #include <asm/dcr.h> @@ -89193,7 +88843,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/ppc_ksyms.c #ifdef CONFIG_PPC32 extern void transfer_to_handler(void); extern void do_IRQ(struct pt_regs *regs); -@@ -58,7 +54,6 @@ extern void program_check_exception(stru +@@ -58,7 +54,6 @@ extern void single_step_exception(struct pt_regs *regs); extern int sys_sigreturn(struct pt_regs *regs); @@ -89201,7 +88851,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/ppc_ksyms.c EXPORT_SYMBOL(clear_pages); EXPORT_SYMBOL(copy_page); EXPORT_SYMBOL(ISA_DMA_THRESHOLD); -@@ -79,6 +74,7 @@ EXPORT_SYMBOL(strncpy); +@@ -79,6 +74,7 @@ EXPORT_SYMBOL(strcat); EXPORT_SYMBOL(strlen); EXPORT_SYMBOL(strcmp); @@ -89209,16 +88859,14 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/ppc_ksyms.c EXPORT_SYMBOL(csum_partial); EXPORT_SYMBOL(csum_partial_copy_generic); -@@ -192,3 +188,4 @@ EXPORT_SYMBOL(intercept_table); +@@ -192,3 +188,4 @@ EXPORT_SYMBOL(__mtdcr); EXPORT_SYMBOL(__mfdcr); #endif +EXPORT_SYMBOL(empty_zero_page); -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/kernel/process.c ++++ b/arch/powerpc/kernel/process.c +@@ -868,11 +868,6 @@ flush_spe_to_thread(current); error = do_execve(filename, (char __user * __user *) a1, (char __user * __user *) a2, regs); @@ -89230,7 +88878,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/process.c putname(filename); out: return error; -@@ -919,20 +914,6 @@ int validate_sp(unsigned long sp, struct +@@ -919,20 +914,6 @@ return valid_irq_stack(sp, p, nbytes); } @@ -89251,7 +88899,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/process.c EXPORT_SYMBOL(validate_sp); unsigned long get_wchan(struct task_struct *p) -@@ -944,15 +925,15 @@ unsigned long get_wchan(struct task_stru +@@ -944,15 +925,15 @@ return 0; sp = p->thread.ksp; @@ -89270,7 +88918,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/process.c if (!in_sched_functions(ip)) return ip; } -@@ -981,12 +962,12 @@ void show_stack(struct task_struct *tsk, +@@ -981,12 +962,12 @@ lr = 0; printk("Call Trace:\n"); do { @@ -89285,7 +88933,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/process.c if (!firstframe || ip != lr) { printk("["REG"] ["REG"] ", sp, ip); print_symbol("%s", ip); -@@ -1000,8 +981,8 @@ void show_stack(struct task_struct *tsk, +@@ -1000,8 +981,8 @@ * See if this is an exception frame. * We look for the "regshere" marker in the current frame. */ @@ -89296,10 +88944,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/kernel/prom.c ++++ b/arch/powerpc/kernel/prom.c @@ -31,10 +31,10 @@ #include <linux/kexec.h> #include <linux/debugfs.h> @@ -89320,7 +88966,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/prom.c #include <asm/kexec.h> #ifdef DEBUG -@@ -436,7 +437,7 @@ early_param("mem", early_parse_mem); +@@ -436,7 +437,7 @@ * The device tree may be allocated beyond our memory limit, or inside the * crash kernel region for kdump. If so, move it out of the way. */ @@ -89329,7 +88975,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/prom.c { unsigned long start, size; void *p; -@@ -1040,6 +1041,87 @@ static void __init early_reserve_mem(voi +@@ -1040,6 +1041,87 @@ #endif } @@ -89417,7 +89063,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/prom.c void __init early_init_devtree(void *params) { DBG(" -> early_init_devtree(%p)\n", params); -@@ -1052,6 +1134,11 @@ void __init early_init_devtree(void *par +@@ -1052,6 +1134,11 @@ of_scan_flat_dt(early_init_dt_scan_rtas, NULL); #endif @@ -89429,7 +89075,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/prom.c /* Retrieve various informations from the /chosen node of the * device-tree, including the platform type, initrd location and * size, TCE reserve, and more ... -@@ -1072,6 +1159,7 @@ void __init early_init_devtree(void *par +@@ -1072,6 +1159,7 @@ reserve_kdump_trampoline(); reserve_crashkernel(); early_reserve_mem(); @@ -89437,7 +89083,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/prom.c lmb_enforce_memory_limit(memory_limit); lmb_analyze(); -@@ -1244,12 +1332,14 @@ EXPORT_SYMBOL(of_node_put); +@@ -1244,12 +1332,14 @@ */ void of_attach_node(struct device_node *np) { @@ -89454,7 +89100,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/prom.c } /* -@@ -1260,8 +1350,9 @@ void of_attach_node(struct device_node * +@@ -1260,8 +1350,9 @@ void of_detach_node(struct device_node *np) { struct device_node *parent; @@ -89465,7 +89111,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/prom.c parent = np->parent; if (!parent) -@@ -1292,7 +1383,7 @@ void of_detach_node(struct device_node * +@@ -1292,7 +1383,7 @@ of_node_set_flag(np, OF_DETACHED); out_unlock: @@ -89474,7 +89120,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/prom.c } #ifdef CONFIG_PPC_PSERIES -@@ -1373,20 +1464,21 @@ __initcall(prom_reconfig_setup); +@@ -1373,20 +1464,21 @@ int prom_add_property(struct device_node* np, struct property* prop) { struct property **next; @@ -89499,7 +89145,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/prom.c #ifdef CONFIG_PROC_DEVICETREE /* try to add to proc as well if it was initialized */ -@@ -1406,9 +1498,10 @@ int prom_add_property(struct device_node +@@ -1406,9 +1498,10 @@ int prom_remove_property(struct device_node *np, struct property *prop) { struct property **next; @@ -89511,7 +89157,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/prom.c next = &np->properties; while (*next) { if (*next == prop) { -@@ -1421,7 +1514,7 @@ int prom_remove_property(struct device_n +@@ -1421,7 +1514,7 @@ } next = &(*next)->next; } @@ -89520,7 +89166,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/prom.c if (!found) return -ENODEV; -@@ -1447,9 +1540,10 @@ int prom_update_property(struct device_n +@@ -1447,9 +1540,10 @@ struct property *oldprop) { struct property **next; @@ -89532,7 +89178,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/prom.c next = &np->properties; while (*next) { if (*next == oldprop) { -@@ -1463,7 +1557,7 @@ int prom_update_property(struct device_n +@@ -1463,7 +1557,7 @@ } next = &(*next)->next; } @@ -89541,11 +89187,9 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/prom.c if (!found) return -ENODEV; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/kernel/prom_init.c ++++ b/arch/powerpc/kernel/prom_init.c +@@ -2240,6 +2240,14 @@ if (rv != PROM_ERROR && (strcmp(prop, "chrp") == 0)) prom_setprop(node, "/", "device_type", "efika", sizeof("efika")); @@ -89560,10 +89204,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/kernel/rtas.c ++++ b/arch/powerpc/kernel/rtas.c @@ -22,6 +22,7 @@ #include <linux/smp.h> #include <linux/completion.h> @@ -89580,7 +89222,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/rtas.c #include <asm/udbg.h> #include <asm/syscalls.h> #include <asm/smp.h> -@@ -507,7 +507,7 @@ int rtas_error_rc(int rtas_rc) +@@ -507,7 +507,7 @@ break; default: printk(KERN_ERR "%s: unexpected RTAS error %d\n", @@ -89589,11 +89231,9 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/rtas.c rc = -ERANGE; break; } -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/kernel/rtas_flash.c ++++ b/arch/powerpc/kernel/rtas_flash.c +@@ -807,7 +807,7 @@ rtas_block_ctor); if (!flash_block_cache) { printk(KERN_ERR "%s: failed to create block cache\n", @@ -89602,11 +89242,9 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/rtas_flash.c rc = -ENOMEM; goto cleanup; } -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/kernel/rtas_pci.c ++++ b/arch/powerpc/kernel/rtas_pci.c +@@ -56,21 +56,6 @@ return 0; } @@ -89628,7 +89266,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/rtas_pci.c int rtas_read_config(struct pci_dn *pdn, int where, int size, u32 *val) { int returnval = -1; -@@ -117,7 +102,7 @@ static int rtas_pci_read_config(struct p +@@ -117,7 +102,7 @@ for (dn = busdn->child; dn; dn = dn->sibling) { struct pci_dn *pdn = PCI_DN(dn); if (pdn && pdn->devfn == devfn @@ -89637,7 +89275,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/rtas_pci.c return rtas_read_config(pdn, where, size, val); } -@@ -164,7 +149,7 @@ static int rtas_pci_write_config(struct +@@ -164,7 +149,7 @@ for (dn = busdn->child; dn; dn = dn->sibling) { struct pci_dn *pdn = PCI_DN(dn); if (pdn && pdn->devfn == devfn @@ -89646,7 +89284,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/rtas_pci.c return rtas_write_config(pdn, where, size, val); } return PCIBIOS_DEVICE_NOT_FOUND; -@@ -326,7 +311,7 @@ int pcibios_remove_root_bus(struct pci_c +@@ -326,7 +311,7 @@ res = b->resource[0]; if (!res->flags) { @@ -89655,7 +89293,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/rtas_pci.c b->name); return 1; } -@@ -334,13 +319,13 @@ int pcibios_remove_root_bus(struct pci_c +@@ -334,13 +319,13 @@ rc = pcibios_unmap_io_space(b); if (rc) { printk(KERN_ERR "%s: failed to unmap IO on bus %s\n", @@ -89671,7 +89309,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/rtas_pci.c return 1; } -@@ -348,13 +333,13 @@ int pcibios_remove_root_bus(struct pci_c +@@ -348,13 +333,13 @@ res = b->resource[i]; if (!res->flags && i == 0) { printk(KERN_ERR "%s: no MEM resource for PHB %s\n", @@ -89687,10 +89325,8 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/rtas_pci.c return 1; } } -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/kernel/setup-common.c ++++ b/arch/powerpc/kernel/setup-common.c @@ -34,6 +34,7 @@ #include <linux/serial_8250.h> #include <linux/debugfs.h> @@ -89707,7 +89343,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/setup-common.c #include <asm/xmon.h> #include <asm/cputhreads.h> -@@ -167,6 +167,8 @@ static int show_cpuinfo(struct seq_file +@@ -167,6 +167,8 @@ unsigned short min; if (cpu_id == NR_CPUS) { @@ -89716,7 +89352,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/setup-common.c #if defined(CONFIG_SMP) && defined(CONFIG_PPC32) unsigned long bogosum = 0; int i; -@@ -178,6 +180,13 @@ static int show_cpuinfo(struct seq_file +@@ -178,6 +180,13 @@ seq_printf(m, "timebase\t: %lu\n", ppc_tb_freq); if (ppc_md.name) seq_printf(m, "platform\t: %s\n", ppc_md.name); @@ -89730,11 +89366,9 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/setup-common.c if (ppc_md.show_cpuinfo != NULL) ppc_md.show_cpuinfo(m); -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/kernel/setup_32.c ++++ b/arch/powerpc/kernel/setup_32.c +@@ -172,6 +172,18 @@ } __setup("l2cr=", ppc_setup_l2cr); @@ -89753,7 +89387,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/setup_32.c #ifdef CONFIG_GENERIC_NVRAM /* Generic nvram hooks used by drivers/char/gen_nvram.c */ -@@ -277,7 +289,7 @@ void __init setup_arch(char **cmdline_p) +@@ -277,7 +289,7 @@ if (ppc_md.panic) setup_panic(); @@ -89762,10 +89396,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/kernel/setup_64.c ++++ b/arch/powerpc/kernel/setup_64.c @@ -33,6 +33,8 @@ #include <linux/serial_8250.h> #include <linux/bootmem.h> @@ -89783,7 +89415,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/setup_64.c #include <asm/firmware.h> #include <asm/xmon.h> #include <asm/udbg.h> -@@ -178,6 +179,9 @@ void __init early_setup(unsigned long dt +@@ -178,6 +179,9 @@ /* Enable early debugging if any specified (see udbg.h) */ udbg_early_init(); @@ -89793,7 +89425,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/setup_64.c DBG(" -> early_setup(), dt_ptr: 0x%lx\n", dt_ptr); /* -@@ -510,7 +514,7 @@ void __init setup_arch(char **cmdline_p) +@@ -510,7 +514,7 @@ if (ppc_md.panic) setup_panic(); @@ -89802,10 +89434,8 @@ Index: linux-2.6.25.4/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.4/arch/powerpc/kernel/stacktrace.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/kernel/stacktrace.c ++++ b/arch/powerpc/kernel/stacktrace.c @@ -0,0 +1,47 @@ +/* + * Stack trace utility @@ -89854,11 +89484,9 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/stacktrace.c + sp = newsp; + } +} -Index: linux-2.6.25.4/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, +--- a/arch/powerpc/kernel/sys_ppc32.c ++++ b/arch/powerpc/kernel/sys_ppc32.c +@@ -368,11 +368,6 @@ error = compat_do_execve(filename, compat_ptr(a1), compat_ptr(a2), regs); @@ -89870,10 +89498,8 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/sys_ppc32.c putname(filename); out: -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/kernel/vdso.c ++++ b/arch/powerpc/kernel/vdso.c @@ -21,13 +21,14 @@ #include <linux/elf.h> #include <linux/security.h> @@ -89890,11 +89516,9 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/vdso.c #include <asm/machdep.h> #include <asm/cputable.h> #include <asm/sections.h> -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/kernel/vio.c ++++ b/arch/powerpc/kernel/vio.c +@@ -139,7 +139,7 @@ */ int vio_register_driver(struct vio_driver *viodrv) { @@ -89903,7 +89527,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/vio.c viodrv->driver.name); /* fill in 'struct driver' fields */ -@@ -184,7 +184,7 @@ struct vio_dev *vio_register_device_node +@@ -184,7 +184,7 @@ /* we need the 'device_type' property, in order to match with drivers */ if (of_node->type == NULL) { printk(KERN_WARNING "%s: node %s missing 'device_type'\n", @@ -89912,7 +89536,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/vio.c of_node->name ? of_node->name : "<unknown>"); return NULL; } -@@ -192,7 +192,7 @@ struct vio_dev *vio_register_device_node +@@ -192,7 +192,7 @@ unit_address = of_get_property(of_node, "reg", NULL); if (unit_address == NULL) { printk(KERN_WARNING "%s: node %s missing 'reg'\n", @@ -89921,7 +89545,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/vio.c of_node->name ? of_node->name : "<unknown>"); return NULL; } -@@ -227,7 +227,7 @@ struct vio_dev *vio_register_device_node +@@ -227,7 +227,7 @@ /* register with generic device framework */ if (device_register(&viodev->dev)) { printk(KERN_ERR "%s: failed to register device %s\n", @@ -89930,7 +89554,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/vio.c /* XXX free TCE table */ kfree(viodev); return NULL; -@@ -258,7 +258,7 @@ static int __init vio_bus_init(void) +@@ -258,7 +258,7 @@ err = device_register(&vio_bus_device.dev); if (err) { printk(KERN_WARNING "%s: device_register returned %i\n", @@ -89939,10 +89563,8 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/vio.c return err; } -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/kernel/vmlinux.lds.S ++++ b/arch/powerpc/kernel/vmlinux.lds.S @@ -1,11 +1,9 @@ #ifdef CONFIG_PPC64 -#include <asm/page.h> @@ -89956,7 +89578,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/vmlinux.lds.S #include <asm-generic/vmlinux.lds.h> #include <asm/cache.h> -@@ -33,7 +31,7 @@ SECTIONS +@@ -33,7 +31,7 @@ */ /* Text and gots */ @@ -89965,7 +89587,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/vmlinux.lds.S ALIGN_FUNCTION(); *(.text.head) _text = .; -@@ -58,7 +56,7 @@ SECTIONS +@@ -58,7 +56,7 @@ RODATA /* Exception & bug tables */ @@ -89974,7 +89596,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/vmlinux.lds.S __start___ex_table = .; *(__ex_table) __stop___ex_table = .; -@@ -74,7 +72,7 @@ SECTIONS +@@ -74,7 +72,7 @@ . = ALIGN(PAGE_SIZE); __init_begin = .; @@ -89983,7 +89605,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/vmlinux.lds.S _sinittext = .; INIT_TEXT _einittext = .; -@@ -83,11 +81,11 @@ SECTIONS +@@ -83,11 +81,11 @@ /* .exit.text is discarded at runtime, not link time, * to deal with references from __bug_table */ @@ -89997,7 +89619,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/vmlinux.lds.S INIT_DATA __vtop_table_begin = .; *(.vtop_fixup); -@@ -103,19 +101,19 @@ SECTIONS +@@ -103,19 +101,19 @@ } . = ALIGN(16); @@ -90020,7 +89642,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/vmlinux.lds.S __con_initcall_start = .; *(.con_initcall.init) __con_initcall_end = .; -@@ -124,14 +122,14 @@ SECTIONS +@@ -124,14 +122,14 @@ SECURITY_INIT . = ALIGN(8); @@ -90037,7 +89659,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/vmlinux.lds.S __start___fw_ftr_fixup = .; *(__fw_ftr_fixup) __stop___fw_ftr_fixup = .; -@@ -139,14 +137,14 @@ SECTIONS +@@ -139,14 +137,14 @@ #endif #ifdef CONFIG_BLK_DEV_INITRD . = ALIGN(PAGE_SIZE); @@ -90054,7 +89676,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/vmlinux.lds.S __per_cpu_start = .; *(.data.percpu) *(.data.percpu.shared_aligned) -@@ -154,7 +152,7 @@ SECTIONS +@@ -154,7 +152,7 @@ } . = ALIGN(8); @@ -90063,7 +89685,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/vmlinux.lds.S __machine_desc_start = . ; *(.machine.desc) __machine_desc_end = . ; -@@ -172,25 +170,24 @@ SECTIONS +@@ -172,25 +170,24 @@ _sdata = .; #ifdef CONFIG_PPC32 @@ -90093,7 +89715,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/vmlinux.lds.S __toc_start = .; *(.got) *(.toc) -@@ -207,26 +204,26 @@ SECTIONS +@@ -207,26 +204,26 @@ #else . = ALIGN(16384); #endif @@ -90125,7 +89747,7 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/vmlinux.lds.S __nosave_begin = .; *(.data.nosave) . = ALIGN(PAGE_SIZE); -@@ -237,7 +234,7 @@ SECTIONS +@@ -237,7 +234,7 @@ * And finally the bss */ @@ -90134,11 +89756,9 @@ Index: linux-2.6.25.4/arch/powerpc/kernel/vmlinux.lds.S __bss_start = .; *(.sbss) *(.scommon) *(.dynbss) -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/lib/rheap.c ++++ b/arch/powerpc/lib/rheap.c +@@ -54,7 +54,7 @@ new_blocks = max_blocks - info->max_blocks; @@ -90147,7 +89767,7 @@ Index: linux-2.6.25.4/arch/powerpc/lib/rheap.c if (block == NULL) return -ENOMEM; -@@ -258,7 +258,7 @@ rh_info_t *rh_create(unsigned int alignm +@@ -258,7 +258,7 @@ if ((alignment & (alignment - 1)) != 0) return ERR_PTR(-EINVAL); @@ -90156,11 +89776,9 @@ Index: linux-2.6.25.4/arch/powerpc/lib/rheap.c if (info == NULL) return ERR_PTR(-ENOMEM); -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/lib/string.S ++++ b/arch/powerpc/lib/string.S +@@ -75,6 +75,20 @@ beq 1b blr @@ -90181,11 +89799,9 @@ Index: linux-2.6.25.4/arch/powerpc/lib/string.S _GLOBAL(strlen) addi r4,r3,-1 1: lbzu r0,1(r4) -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/math-emu/fabs.c ++++ b/arch/powerpc/math-emu/fabs.c +@@ -9,7 +9,7 @@ frD[1] = frB[1]; #ifdef DEBUG @@ -90194,11 +89810,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/fabs.c dump_double(frD); printk("\n"); #endif -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/math-emu/fadd.c ++++ b/arch/powerpc/math-emu/fadd.c +@@ -14,7 +14,7 @@ int ret = 0; #ifdef DEBUG @@ -90207,11 +89821,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/fadd.c #endif __FP_UNPACK_D(A, frA); -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/math-emu/fadds.c ++++ b/arch/powerpc/math-emu/fadds.c +@@ -15,7 +15,7 @@ int ret = 0; #ifdef DEBUG @@ -90220,11 +89832,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/fadds.c #endif __FP_UNPACK_D(A, frA); -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/math-emu/fcmpo.c ++++ b/arch/powerpc/math-emu/fcmpo.c +@@ -15,7 +15,7 @@ int ret = 0; #ifdef DEBUG @@ -90233,11 +89843,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/fcmpo.c #endif __FP_UNPACK_D(A, frA); -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/math-emu/fcmpu.c ++++ b/arch/powerpc/math-emu/fcmpu.c +@@ -14,7 +14,7 @@ long cmp; #ifdef DEBUG @@ -90246,11 +89854,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/fcmpu.c #endif __FP_UNPACK_D(A, frA); -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/math-emu/fctiw.c ++++ b/arch/powerpc/math-emu/fctiw.c +@@ -16,7 +16,7 @@ frD[1] = r; #ifdef DEBUG @@ -90259,11 +89865,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/fctiw.c dump_double(frD); printk("\n"); #endif -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/math-emu/fctiwz.c ++++ b/arch/powerpc/math-emu/fctiwz.c +@@ -23,7 +23,7 @@ __FPU_FPSCR = fpscr; #ifdef DEBUG @@ -90272,11 +89876,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/fctiwz.c dump_double(frD); printk("\n"); #endif -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/math-emu/fdiv.c ++++ b/arch/powerpc/math-emu/fdiv.c +@@ -14,7 +14,7 @@ int ret = 0; #ifdef DEBUG @@ -90285,7 +89887,7 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/fdiv.c #endif __FP_UNPACK_D(A, frA); -@@ -28,13 +28,13 @@ fdiv(void *frD, void *frA, void *frB) +@@ -28,13 +28,13 @@ if (A_c == FP_CLS_ZERO && B_c == FP_CLS_ZERO) { ret |= EFLAG_VXZDZ; #ifdef DEBUG @@ -90301,11 +89903,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/fdiv.c #endif } -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/math-emu/fdivs.c ++++ b/arch/powerpc/math-emu/fdivs.c +@@ -15,7 +15,7 @@ int ret = 0; #ifdef DEBUG @@ -90314,7 +89914,7 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/fdivs.c #endif __FP_UNPACK_D(A, frA); -@@ -29,13 +29,13 @@ fdivs(void *frD, void *frA, void *frB) +@@ -29,13 +29,13 @@ if (A_c == FP_CLS_ZERO && B_c == FP_CLS_ZERO) { ret |= EFLAG_VXZDZ; #ifdef DEBUG @@ -90330,11 +89930,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/fdivs.c #endif } -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/math-emu/fmadd.c ++++ b/arch/powerpc/math-emu/fmadd.c +@@ -16,7 +16,7 @@ int ret = 0; #ifdef DEBUG @@ -90343,11 +89941,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/fmadd.c #endif __FP_UNPACK_D(A, frA); -Index: linux-2.6.25.4/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, +--- a/arch/powerpc/math-emu/fmadds.c ++++ b/arch/powerpc/math-emu/fmadds.c +@@ -17,7 +17,7 @@ int ret = 0; #ifdef DEBUG @@ -90356,11 +89952,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/fmadds.c #endif __FP_UNPACK_D(A, frA); -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/math-emu/fmr.c ++++ b/arch/powerpc/math-emu/fmr.c +@@ -9,7 +9,7 @@ frD[1] = frB[1]; #ifdef DEBUG @@ -90369,11 +89963,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/fmr.c dump_double(frD); printk("\n"); #endif -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/math-emu/fmsub.c ++++ b/arch/powerpc/math-emu/fmsub.c +@@ -16,7 +16,7 @@ int ret = 0; #ifdef DEBUG @@ -90382,11 +89974,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/fmsub.c #endif __FP_UNPACK_D(A, frA); -Index: linux-2.6.25.4/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, +--- a/arch/powerpc/math-emu/fmsubs.c ++++ b/arch/powerpc/math-emu/fmsubs.c +@@ -17,7 +17,7 @@ int ret = 0; #ifdef DEBUG @@ -90395,11 +89985,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/fmsubs.c #endif __FP_UNPACK_D(A, frA); -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/math-emu/fmul.c ++++ b/arch/powerpc/math-emu/fmul.c +@@ -14,7 +14,7 @@ int ret = 0; #ifdef DEBUG @@ -90408,11 +89996,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/fmul.c #endif __FP_UNPACK_D(A, frA); -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/math-emu/fmuls.c ++++ b/arch/powerpc/math-emu/fmuls.c +@@ -15,7 +15,7 @@ int ret = 0; #ifdef DEBUG @@ -90421,11 +90007,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/fmuls.c #endif __FP_UNPACK_D(A, frA); -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/math-emu/fnabs.c ++++ b/arch/powerpc/math-emu/fnabs.c +@@ -9,7 +9,7 @@ frD[1] = frB[1]; #ifdef DEBUG @@ -90434,11 +90018,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/fnabs.c dump_double(frD); printk("\n"); #endif -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/math-emu/fneg.c ++++ b/arch/powerpc/math-emu/fneg.c +@@ -9,7 +9,7 @@ frD[1] = frB[1]; #ifdef DEBUG @@ -90447,11 +90029,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/fneg.c dump_double(frD); printk("\n"); #endif -Index: linux-2.6.25.4/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, +--- a/arch/powerpc/math-emu/fnmadd.c ++++ b/arch/powerpc/math-emu/fnmadd.c +@@ -16,7 +16,7 @@ int ret = 0; #ifdef DEBUG @@ -90460,11 +90040,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/fnmadd.c #endif __FP_UNPACK_D(A, frA); -Index: linux-2.6.25.4/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, +--- a/arch/powerpc/math-emu/fnmadds.c ++++ b/arch/powerpc/math-emu/fnmadds.c +@@ -17,7 +17,7 @@ int ret = 0; #ifdef DEBUG @@ -90473,11 +90051,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/fnmadds.c #endif __FP_UNPACK_D(A, frA); -Index: linux-2.6.25.4/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, +--- a/arch/powerpc/math-emu/fnmsub.c ++++ b/arch/powerpc/math-emu/fnmsub.c +@@ -16,7 +16,7 @@ int ret = 0; #ifdef DEBUG @@ -90486,11 +90062,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/fnmsub.c #endif __FP_UNPACK_D(A, frA); -Index: linux-2.6.25.4/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, +--- a/arch/powerpc/math-emu/fnmsubs.c ++++ b/arch/powerpc/math-emu/fnmsubs.c +@@ -17,7 +17,7 @@ int ret = 0; #ifdef DEBUG @@ -90499,11 +90073,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/fnmsubs.c #endif __FP_UNPACK_D(A, frA); -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/math-emu/fres.c ++++ b/arch/powerpc/math-emu/fres.c +@@ -6,7 +6,7 @@ fres(void *frD, void *frB) { #ifdef DEBUG @@ -90512,11 +90084,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/fres.c #endif return -ENOSYS; } -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/math-emu/frsp.c ++++ b/arch/powerpc/math-emu/frsp.c +@@ -12,7 +12,7 @@ FP_DECL_D(B); #ifdef DEBUG @@ -90525,11 +90095,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/frsp.c #endif __FP_UNPACK_D(B, frB); -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/math-emu/frsqrte.c ++++ b/arch/powerpc/math-emu/frsqrte.c +@@ -6,7 +6,7 @@ frsqrte(void *frD, void *frB) { #ifdef DEBUG @@ -90538,11 +90106,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/frsqrte.c #endif return 0; } -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/math-emu/fsel.c ++++ b/arch/powerpc/math-emu/fsel.c +@@ -11,7 +11,7 @@ FP_DECL_D(A); #ifdef DEBUG @@ -90551,11 +90117,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/fsel.c #endif __FP_UNPACK_D(A, frA); -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/math-emu/fsqrt.c ++++ b/arch/powerpc/math-emu/fsqrt.c +@@ -13,7 +13,7 @@ int ret = 0; #ifdef DEBUG @@ -90564,11 +90128,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/fsqrt.c #endif __FP_UNPACK_D(B, frB); -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/math-emu/fsqrts.c ++++ b/arch/powerpc/math-emu/fsqrts.c +@@ -14,7 +14,7 @@ int ret = 0; #ifdef DEBUG @@ -90577,11 +90139,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/fsqrts.c #endif __FP_UNPACK_D(B, frB); -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/math-emu/fsub.c ++++ b/arch/powerpc/math-emu/fsub.c +@@ -14,7 +14,7 @@ int ret = 0; #ifdef DEBUG @@ -90590,11 +90150,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/fsub.c #endif __FP_UNPACK_D(A, frA); -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/math-emu/fsubs.c ++++ b/arch/powerpc/math-emu/fsubs.c +@@ -15,7 +15,7 @@ int ret = 0; #ifdef DEBUG @@ -90603,11 +90161,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/fsubs.c #endif __FP_UNPACK_D(A, frA); -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/math-emu/lfd.c ++++ b/arch/powerpc/math-emu/lfd.c +@@ -11,7 +11,7 @@ if (copy_from_user(frD, ea, sizeof(double))) return -EFAULT; #ifdef DEBUG @@ -90616,11 +90172,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/lfd.c dump_double(frD); printk("\n"); #endif -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/math-emu/lfs.c ++++ b/arch/powerpc/math-emu/lfs.c +@@ -14,7 +14,7 @@ float f; #ifdef DEBUG @@ -90629,11 +90183,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/lfs.c #endif if (copy_from_user(&f, ea, sizeof(float))) -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/math-emu/mcrfs.c ++++ b/arch/powerpc/math-emu/mcrfs.c +@@ -10,7 +10,7 @@ u32 value, clear; #ifdef DEBUG @@ -90642,7 +90194,7 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/mcrfs.c #endif clear = 15 << ((7 - crfS) << 2); -@@ -24,7 +24,7 @@ mcrfs(u32 *ccr, u32 crfD, u32 crfS) +@@ -24,7 +24,7 @@ *ccr |= (value << ((7 - crfD) << 2)); #ifdef DEBUG @@ -90651,11 +90203,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/mcrfs.c #endif return 0; -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/math-emu/mffs.c ++++ b/arch/powerpc/math-emu/mffs.c +@@ -10,7 +10,7 @@ frD[1] = __FPU_FPSCR; #ifdef DEBUG @@ -90664,11 +90214,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/mffs.c #endif return 0; -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/math-emu/mtfsb0.c ++++ b/arch/powerpc/math-emu/mtfsb0.c +@@ -11,7 +11,7 @@ __FPU_FPSCR &= ~(1 << (31 - crbD)); #ifdef DEBUG @@ -90677,11 +90225,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/mtfsb0.c #endif return 0; -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/math-emu/mtfsb1.c ++++ b/arch/powerpc/math-emu/mtfsb1.c +@@ -11,7 +11,7 @@ __FPU_FPSCR |= (1 << (31 - crbD)); #ifdef DEBUG @@ -90690,11 +90236,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/mtfsb1.c #endif return 0; -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/math-emu/mtfsf.c ++++ b/arch/powerpc/math-emu/mtfsf.c +@@ -38,7 +38,7 @@ __FPU_FPSCR |= (frB[1] & mask); #ifdef DEBUG @@ -90703,11 +90247,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/mtfsf.c #endif return 0; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/math-emu/mtfsfi.c ++++ b/arch/powerpc/math-emu/mtfsfi.c +@@ -16,7 +16,7 @@ __FPU_FPSCR |= (IMM & 0xf) << ((7 - crfD) << 2); #ifdef DEBUG @@ -90716,11 +90258,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/mtfsfi.c #endif return 0; -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/math-emu/stfd.c ++++ b/arch/powerpc/math-emu/stfd.c +@@ -7,7 +7,7 @@ { #if 0 #ifdef DEBUG @@ -90729,11 +90269,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/stfd.c dump_double(frS); printk("\n"); #endif -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/math-emu/stfiwx.c ++++ b/arch/powerpc/math-emu/stfiwx.c +@@ -6,7 +6,7 @@ stfiwx(u32 *frS, void *ea) { #ifdef DEBUG @@ -90742,11 +90280,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/stfiwx.c #endif if (copy_to_user(ea, &frS[1], sizeof(frS[1]))) -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/math-emu/stfs.c ++++ b/arch/powerpc/math-emu/stfs.c +@@ -15,7 +15,7 @@ int err; #ifdef DEBUG @@ -90755,11 +90291,9 @@ Index: linux-2.6.25.4/arch/powerpc/math-emu/stfs.c #endif __FP_UNPACK_D(A, frS); -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/mm/40x_mmu.c ++++ b/arch/powerpc/mm/40x_mmu.c +@@ -97,7 +97,7 @@ phys_addr_t p; v = KERNELBASE; @@ -90768,11 +90302,9 @@ Index: linux-2.6.25.4/arch/powerpc/mm/40x_mmu.c s = total_lowmem; if (__map_without_ltlbs) -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/mm/44x_mmu.c ++++ b/arch/powerpc/mm/44x_mmu.c +@@ -67,7 +67,7 @@ /* Pin in enough TLBs to cover any lowmem not covered by the * initial 256M mapping established in head_44x.S */ @@ -90781,11 +90313,9 @@ Index: linux-2.6.25.4/arch/powerpc/mm/44x_mmu.c addr += PPC_PIN_SIZE) ppc44x_pin_tlb(addr + PAGE_OFFSET, addr); -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/mm/Makefile ++++ b/arch/powerpc/mm/Makefile +@@ -6,7 +6,7 @@ EXTRA_CFLAGS += -mno-minimal-toc endif @@ -90794,10 +90324,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/mm/fsl_booke_mmu.c ++++ b/arch/powerpc/mm/fsl_booke_mmu.c @@ -49,18 +49,15 @@ #include <asm/mmu.h> #include <asm/uaccess.h> @@ -90819,7 +90347,7 @@ Index: linux-2.6.25.4/arch/powerpc/mm/fsl_booke_mmu.c #define NUM_TLBCAMS (16) -@@ -165,15 +162,15 @@ void invalidate_tlbcam_entry(int index) +@@ -165,15 +162,15 @@ void __init cam_mapin_ram(unsigned long cam0, unsigned long cam1, unsigned long cam2) { @@ -90838,7 +90366,7 @@ Index: linux-2.6.25.4/arch/powerpc/mm/fsl_booke_mmu.c } } -@@ -196,35 +193,32 @@ unsigned long __init mmu_mapin_ram(void) +@@ -196,35 +193,32 @@ void __init adjust_total_lowmem(void) { @@ -90890,7 +90418,7 @@ Index: linux-2.6.25.4/arch/powerpc/mm/fsl_booke_mmu.c ram -= __cam2; } -@@ -232,6 +226,6 @@ adjust_total_lowmem(void) +@@ -232,6 +226,6 @@ " CAM2=%ldMb residual: %ldMb\n", __cam0 >> 20, __cam1 >> 20, __cam2 >> 20, (total_lowmem - __cam0 - __cam1 - __cam2) >> 20); @@ -90899,10 +90427,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/mm/hash_utils_64.c ++++ b/arch/powerpc/mm/hash_utils_64.c @@ -31,6 +31,7 @@ #include <linux/cache.h> #include <linux/init.h> @@ -90920,7 +90446,7 @@ Index: linux-2.6.25.4/arch/powerpc/mm/hash_utils_64.c #include <asm/abs_addr.h> #include <asm/tlbflush.h> #include <asm/io.h> -@@ -191,6 +192,29 @@ int htab_bolt_mapping(unsigned long vsta +@@ -191,6 +192,29 @@ return ret < 0 ? ret : 0; } @@ -90950,7 +90476,7 @@ Index: linux-2.6.25.4/arch/powerpc/mm/hash_utils_64.c static int __init htab_dt_scan_seg_sizes(unsigned long node, const char *uname, int depth, void *data) -@@ -434,6 +458,12 @@ void create_section_mapping(unsigned lon +@@ -434,6 +458,12 @@ _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_COHERENT | PP_RWXX, mmu_linear_psize, mmu_kernel_ssize)); } @@ -90963,10 +90489,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/mm/init_32.c ++++ b/arch/powerpc/mm/init_32.c @@ -30,6 +30,7 @@ #include <linux/highmem.h> #include <linux/initrd.h> @@ -90983,7 +90507,7 @@ Index: linux-2.6.25.4/arch/powerpc/mm/init_32.c #include <asm/sections.h> #include "mmu_decl.h" -@@ -59,8 +59,8 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_ga +@@ -59,8 +59,8 @@ unsigned long total_memory; unsigned long total_lowmem; @@ -90994,7 +90518,7 @@ Index: linux-2.6.25.4/arch/powerpc/mm/init_32.c int boot_mapsize; #ifdef CONFIG_PPC_PMAC -@@ -95,10 +95,10 @@ int __map_without_ltlbs; +@@ -95,10 +95,10 @@ unsigned long __max_low_memory = MAX_LOW_MEM; /* @@ -91007,7 +90531,7 @@ Index: linux-2.6.25.4/arch/powerpc/mm/init_32.c /* * Check for command-line options that affect what MMU_init will do. -@@ -131,10 +131,10 @@ void __init MMU_init(void) +@@ -131,10 +131,10 @@ /* 601 can only access 16MB at the moment */ if (PVR_VER(mfspr(SPRN_PVR)) == 1) @@ -91020,7 +90544,7 @@ Index: linux-2.6.25.4/arch/powerpc/mm/init_32.c /* parse args from command line */ MMU_setup(); -@@ -145,8 +145,8 @@ void __init MMU_init(void) +@@ -145,8 +145,8 @@ printk(KERN_WARNING "Only using first contiguous memory region"); } @@ -91031,7 +90555,7 @@ Index: linux-2.6.25.4/arch/powerpc/mm/init_32.c #ifdef CONFIG_FSL_BOOKE /* Freescale Book-E parts expect lowmem to be mapped by fixed TLB -@@ -157,9 +157,10 @@ void __init MMU_init(void) +@@ -157,9 +157,10 @@ if (total_lowmem > __max_low_memory) { total_lowmem = __max_low_memory; @@ -91043,7 +90567,7 @@ Index: linux-2.6.25.4/arch/powerpc/mm/init_32.c lmb_analyze(); #endif /* CONFIG_HIGHMEM */ } -@@ -184,8 +185,6 @@ void __init MMU_init(void) +@@ -184,8 +185,6 @@ /* Map in I/O resources */ if (ppc_md.progress) ppc_md.progress("MMU:setio", 0x302); @@ -91052,7 +90576,7 @@ Index: linux-2.6.25.4/arch/powerpc/mm/init_32.c /* Initialize the context management stuff */ mmu_context_init(); -@@ -208,7 +207,7 @@ void __init *early_get_page(void) +@@ -208,7 +207,7 @@ p = alloc_bootmem_pages(PAGE_SIZE); } else { p = __va(lmb_alloc_base(PAGE_SIZE, PAGE_SIZE, @@ -91061,7 +90585,7 @@ Index: linux-2.6.25.4/arch/powerpc/mm/init_32.c } return p; } -@@ -276,7 +275,7 @@ static int __init setup_kcore(void) +@@ -276,7 +275,7 @@ kcore_mem = kmalloc(sizeof(struct kcore_list), GFP_ATOMIC); if (!kcore_mem) @@ -91070,10 +90594,8 @@ Index: linux-2.6.25.4/arch/powerpc/mm/init_32.c /* must stay under 32 bits */ if ( 0xfffffffful - (unsigned long)__va(base) < size) { -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/mm/init_64.c ++++ b/arch/powerpc/mm/init_64.c @@ -38,11 +38,11 @@ #include <linux/nodemask.h> #include <linux/module.h> @@ -91097,7 +90619,7 @@ Index: linux-2.6.25.4/arch/powerpc/mm/init_64.c void free_initmem(void) { -@@ -122,7 +121,7 @@ static int __init setup_kcore(void) +@@ -122,7 +121,7 @@ /* GFP_ATOMIC to avoid might_sleep warnings during boot */ kcore_mem = kmalloc(sizeof(struct kcore_list), GFP_ATOMIC); if (!kcore_mem) @@ -91106,9 +90628,7 @@ Index: linux-2.6.25.4/arch/powerpc/mm/init_64.c kclist_add(kcore_mem, __va(base), size); } -Index: linux-2.6.25.4/arch/powerpc/mm/lmb.c -=================================================================== ---- linux-2.6.25.4.orig/arch/powerpc/mm/lmb.c +--- a/arch/powerpc/mm/lmb.c +++ /dev/null @@ -1,357 +0,0 @@ -/* @@ -91468,10 +90988,8 @@ Index: linux-2.6.25.4/arch/powerpc/mm/lmb.c - } - return 0; -} -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/mm/mem.c ++++ b/arch/powerpc/mm/mem.c @@ -31,6 +31,7 @@ #include <linux/initrd.h> #include <linux/pagemap.h> @@ -91488,7 +91006,7 @@ Index: linux-2.6.25.4/arch/powerpc/mm/mem.c #include <asm/sections.h> #include <asm/vdso.h> -@@ -111,7 +111,7 @@ int memory_add_physaddr_to_nid(u64 start +@@ -111,7 +111,7 @@ } #endif @@ -91497,7 +91015,7 @@ Index: linux-2.6.25.4/arch/powerpc/mm/mem.c { struct pglist_data *pgdata; struct zone *zone; -@@ -175,7 +175,6 @@ void show_mem(void) +@@ -175,7 +175,6 @@ printk("Mem-info:\n"); show_free_areas(); @@ -91505,7 +91023,7 @@ Index: linux-2.6.25.4/arch/powerpc/mm/mem.c for_each_online_pgdat(pgdat) { unsigned long flags; pgdat_resize_lock(pgdat, &flags); -@@ -217,9 +216,11 @@ void __init do_init_bootmem(void) +@@ -217,9 +216,11 @@ unsigned long total_pages; int boot_mapsize; @@ -91518,7 +91036,7 @@ Index: linux-2.6.25.4/arch/powerpc/mm/mem.c #endif /* -@@ -245,18 +246,18 @@ void __init do_init_bootmem(void) +@@ -245,18 +246,18 @@ * present. */ #ifdef CONFIG_HIGHMEM @@ -91541,7 +91059,7 @@ Index: linux-2.6.25.4/arch/powerpc/mm/mem.c lmb.reserved.region[i].base; reserve_bootmem(lmb.reserved.region[i].base, adjusted_size, BOOTMEM_DEFAULT); -@@ -326,7 +327,7 @@ void __init paging_init(void) +@@ -326,7 +327,7 @@ (top_of_ram - total_ram) >> 20); memset(max_zone_pfns, 0, sizeof(max_zone_pfns)); #ifdef CONFIG_HIGHMEM @@ -91550,7 +91068,7 @@ Index: linux-2.6.25.4/arch/powerpc/mm/mem.c max_zone_pfns[ZONE_HIGHMEM] = top_of_ram >> PAGE_SHIFT; #else max_zone_pfns[ZONE_DMA] = top_of_ram >> PAGE_SHIFT; -@@ -381,7 +382,7 @@ void __init mem_init(void) +@@ -381,7 +382,7 @@ { unsigned long pfn, highmem_mapnr; @@ -91559,11 +91077,9 @@ Index: linux-2.6.25.4/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.4/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; +--- a/arch/powerpc/mm/mmu_decl.h ++++ b/arch/powerpc/mm/mmu_decl.h +@@ -48,9 +48,11 @@ extern unsigned long ioremap_bot; extern unsigned long __max_low_memory; @@ -91576,10 +91092,8 @@ Index: linux-2.6.25.4/arch/powerpc/mm/mmu_decl.h /* ...and now those things that may be slightly different between processor * architectures. -- Dan -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/mm/numa.c ++++ b/arch/powerpc/mm/numa.c @@ -17,8 +17,9 @@ #include <linux/nodemask.h> #include <linux/cpu.h> @@ -91591,11 +91105,9 @@ Index: linux-2.6.25.4/arch/powerpc/mm/numa.c #include <asm/system.h> #include <asm/smp.h> -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/mm/pgtable_32.c ++++ b/arch/powerpc/mm/pgtable_32.c +@@ -281,12 +281,13 @@ */ void __init mapin_ram(void) { @@ -91611,10 +91123,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/mm/ppc_mmu_32.c ++++ b/arch/powerpc/mm/ppc_mmu_32.c @@ -26,11 +26,11 @@ #include <linux/mm.h> #include <linux/init.h> @@ -91628,7 +91138,7 @@ Index: linux-2.6.25.4/arch/powerpc/mm/ppc_mmu_32.c #include "mmu_decl.h" -@@ -82,7 +82,6 @@ unsigned long __init mmu_mapin_ram(void) +@@ -82,7 +82,6 @@ #else unsigned long tot, bl, done; unsigned long max_size = (256<<20); @@ -91636,7 +91146,7 @@ Index: linux-2.6.25.4/arch/powerpc/mm/ppc_mmu_32.c if (__map_without_bats) { printk(KERN_DEBUG "RAM mapped without BATs\n"); -@@ -93,19 +92,13 @@ unsigned long __init mmu_mapin_ram(void) +@@ -93,19 +92,13 @@ /* Make sure we don't map a block larger than the smallest alignment of the physical address. */ @@ -91657,7 +91167,7 @@ Index: linux-2.6.25.4/arch/powerpc/mm/ppc_mmu_32.c done = (unsigned long)bat_addrs[2].limit - KERNELBASE + 1; if ((done < tot) && !bat_addrs[3].limit) { /* use BAT3 to cover a bit more */ -@@ -113,7 +106,7 @@ unsigned long __init mmu_mapin_ram(void) +@@ -113,7 +106,7 @@ for (bl = 128<<10; bl < max_size; bl <<= 1) if (bl * 2 > tot) break; @@ -91666,7 +91176,7 @@ Index: linux-2.6.25.4/arch/powerpc/mm/ppc_mmu_32.c done = (unsigned long)bat_addrs[3].limit - KERNELBASE + 1; } -@@ -240,7 +233,7 @@ void __init MMU_init_hw(void) +@@ -240,7 +233,7 @@ */ if ( ppc_md.progress ) ppc_md.progress("hash:find piece", 0x322); Hash = __va(lmb_alloc_base(Hash_size, Hash_size, @@ -91675,10 +91185,8 @@ Index: linux-2.6.25.4/arch/powerpc/mm/ppc_mmu_32.c cacheable_memzero(Hash, Hash_size); _SDR1 = __pa(Hash) | SDR1_LOW_BITS; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/mm/stab.c ++++ b/arch/powerpc/mm/stab.c @@ -12,12 +12,14 @@ * 2 of the License, or (at your option) any later version. */ @@ -91695,11 +91203,9 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/oprofile/cell/spu_task_sync.c ++++ b/arch/powerpc/oprofile/cell/spu_task_sync.c +@@ -68,7 +68,7 @@ if (spu_num >= num_spu_nodes) { printk(KERN_ERR "SPU_PROF: " "%s, line %d: Invalid index %d into spu info cache\n", @@ -91708,7 +91214,7 @@ Index: linux-2.6.25.4/arch/powerpc/oprofile/cell/spu_task_sync.c ret_info = NULL; goto out; } -@@ -115,7 +115,7 @@ prepare_cached_spu_info(struct spu *spu, +@@ -115,7 +115,7 @@ if (!info) { printk(KERN_ERR "SPU_PROF: " "%s, line %d: create vma_map failed\n", @@ -91717,7 +91223,7 @@ Index: linux-2.6.25.4/arch/powerpc/oprofile/cell/spu_task_sync.c retval = -ENOMEM; goto err_alloc; } -@@ -123,7 +123,7 @@ prepare_cached_spu_info(struct spu *spu, +@@ -123,7 +123,7 @@ if (!new_map) { printk(KERN_ERR "SPU_PROF: " "%s, line %d: create vma_map failed\n", @@ -91726,7 +91232,7 @@ Index: linux-2.6.25.4/arch/powerpc/oprofile/cell/spu_task_sync.c retval = -ENOMEM; goto err_alloc; } -@@ -171,7 +171,7 @@ static int release_cached_info(int spu_i +@@ -171,7 +171,7 @@ printk(KERN_ERR "SPU_PROF: " "%s, line %d: " "Invalid index %d into spu info cache\n", @@ -91735,7 +91241,7 @@ Index: linux-2.6.25.4/arch/powerpc/oprofile/cell/spu_task_sync.c goto out; } end = spu_index + 1; -@@ -273,7 +273,7 @@ fail_no_image_cookie: +@@ -273,7 +273,7 @@ printk(KERN_ERR "SPU_PROF: " "%s, line %d: Cannot find dcookie for SPU binary\n", @@ -91744,7 +91250,7 @@ Index: linux-2.6.25.4/arch/powerpc/oprofile/cell/spu_task_sync.c goto out; } -@@ -467,7 +467,7 @@ int spu_sync_stop(void) +@@ -467,7 +467,7 @@ if (ret) { printk(KERN_ERR "SPU_PROF: " "%s, line %d: spu_switch_event_unregister returned %d\n", @@ -91753,11 +91259,9 @@ Index: linux-2.6.25.4/arch/powerpc/oprofile/cell/spu_task_sync.c goto out; } -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/oprofile/cell/vma_map.c ++++ b/arch/powerpc/oprofile/cell/vma_map.c +@@ -72,7 +72,7 @@ kzalloc(sizeof(struct vma_to_fileoffset_map), GFP_KERNEL); if (!new) { printk(KERN_ERR "SPU_PROF: %s, line %d: malloc failed\n", @@ -91766,7 +91270,7 @@ Index: linux-2.6.25.4/arch/powerpc/oprofile/cell/vma_map.c vma_map_free(map); return NULL; } -@@ -134,19 +134,19 @@ struct vma_to_fileoffset_map *create_vma +@@ -134,19 +134,19 @@ if (memcmp(ehdr.e_ident, expected, EI_PAD) != 0) { printk(KERN_ERR "SPU_PROF: " "%s, line %d: Unexpected e_ident parsing SPU ELF\n", @@ -91789,7 +91293,7 @@ Index: linux-2.6.25.4/arch/powerpc/oprofile/cell/vma_map.c goto fail; } phdr_start = spu_elf_start + ehdr.e_phoff; -@@ -232,7 +232,7 @@ struct vma_to_fileoffset_map *create_vma +@@ -232,7 +232,7 @@ if (overlay_tbl_offset < 0) { printk(KERN_ERR "SPU_PROF: " "%s, line %d: Error finding SPU overlay table\n", @@ -91798,11 +91302,9 @@ Index: linux-2.6.25.4/arch/powerpc/oprofile/cell/vma_map.c goto fail; } ovly_table = spu_elf_start + overlay_tbl_offset; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/oprofile/op_model_cell.c ++++ b/arch/powerpc/oprofile/op_model_cell.c +@@ -216,7 +216,7 @@ * failure to stop OProfile. */ printk(KERN_WARNING "%s: rtas returned: %d\n", @@ -91811,7 +91313,7 @@ Index: linux-2.6.25.4/arch/powerpc/oprofile/op_model_cell.c } static int pm_rtas_activate_signals(u32 node, u32 count) -@@ -255,7 +255,7 @@ static int pm_rtas_activate_signals(u32 +@@ -255,7 +255,7 @@ if (unlikely(ret)) { printk(KERN_WARNING "%s: rtas returned: %d\n", @@ -91820,7 +91322,7 @@ Index: linux-2.6.25.4/arch/powerpc/oprofile/op_model_cell.c return -EIO; } } -@@ -560,7 +560,7 @@ static int cell_reg_setup(struct op_coun +@@ -560,7 +560,7 @@ if (unlikely(spu_rtas_token == RTAS_UNKNOWN_SERVICE)) { printk(KERN_ERR "%s: rtas token ibm,cbe-spu-perftools unknown\n", @@ -91829,7 +91331,7 @@ Index: linux-2.6.25.4/arch/powerpc/oprofile/op_model_cell.c return -EIO; } } -@@ -576,7 +576,7 @@ static int cell_reg_setup(struct op_coun +@@ -576,7 +576,7 @@ if (unlikely(pm_rtas_token == RTAS_UNKNOWN_SERVICE)) { printk(KERN_ERR "%s: rtas token ibm,cbe-perftools unknown\n", @@ -91838,7 +91340,7 @@ Index: linux-2.6.25.4/arch/powerpc/oprofile/op_model_cell.c return -EIO; } -@@ -853,7 +853,7 @@ static int pm_rtas_activate_spu_profilin +@@ -853,7 +853,7 @@ if (unlikely(ret)) { printk(KERN_WARNING "%s: rtas returned: %d\n", @@ -91847,7 +91349,7 @@ Index: linux-2.6.25.4/arch/powerpc/oprofile/op_model_cell.c return -EIO; } -@@ -949,7 +949,7 @@ static int cell_global_start_spu(struct +@@ -949,7 +949,7 @@ if (unlikely(ret != 0)) { printk(KERN_ERR "%s: rtas call ibm,cbe-spu-perftools failed, return = %d\n", @@ -91856,7 +91358,7 @@ Index: linux-2.6.25.4/arch/powerpc/oprofile/op_model_cell.c rtas_error = -EIO; goto out; } -@@ -1061,7 +1061,7 @@ static void cell_global_stop_spu(void) +@@ -1061,7 +1061,7 @@ if (unlikely(rtn_value != 0)) { printk(KERN_ERR "%s: rtas call ibm,cbe-spu-perftools failed, return = %d\n", @@ -91865,10 +91367,8 @@ Index: linux-2.6.25.4/arch/powerpc/oprofile/op_model_cell.c } /* Deactivate the signals */ -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/40x/ep405.c ++++ b/arch/powerpc/platforms/40x/ep405.c @@ -29,6 +29,7 @@ #include <asm/time.h> #include <asm/uic.h> @@ -91877,17 +91377,15 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/40x/ep405.c static struct device_node *bcsr_node; static void __iomem *bcsr_regs; -@@ -119,5 +120,6 @@ define_machine(ep405) { +@@ -119,5 +120,6 @@ .progress = udbg_progress, .init_IRQ = uic_init_tree, .get_irq = uic_get_irq, + .restart = ppc4xx_reset_system, .calibrate_decr = generic_calibrate_decr, }; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/40x/kilauea.c ++++ b/arch/powerpc/platforms/40x/kilauea.c @@ -1,7 +1,7 @@ /* * Kilauea board specific routines @@ -91905,17 +91403,15 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/40x/kilauea.c static __initdata struct of_device_id kilauea_of_bus[] = { { .compatible = "ibm,plb4", }, -@@ -54,5 +55,6 @@ define_machine(kilauea) { +@@ -54,5 +55,6 @@ .progress = udbg_progress, .init_IRQ = uic_init_tree, .get_irq = uic_get_irq, + .restart = ppc4xx_reset_system, .calibrate_decr = generic_calibrate_decr, }; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/40x/makalu.c ++++ b/arch/powerpc/platforms/40x/makalu.c @@ -20,6 +20,7 @@ #include <asm/time.h> #include <asm/uic.h> @@ -91924,17 +91420,15 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/40x/makalu.c static __initdata struct of_device_id makalu_of_bus[] = { { .compatible = "ibm,plb4", }, -@@ -54,5 +55,6 @@ define_machine(makalu) { +@@ -54,5 +55,6 @@ .progress = udbg_progress, .init_IRQ = uic_init_tree, .get_irq = uic_get_irq, + .restart = ppc4xx_reset_system, .calibrate_decr = generic_calibrate_decr, }; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/40x/virtex.c ++++ b/arch/powerpc/platforms/40x/virtex.c @@ -14,6 +14,7 @@ #include <asm/prom.h> #include <asm/time.h> @@ -91943,17 +91437,15 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/40x/virtex.c static struct of_device_id xilinx_of_bus_ids[] __initdata = { { .compatible = "xlnx,plb-v46-1.00.a", }, -@@ -48,5 +49,6 @@ define_machine(virtex) { +@@ -48,5 +49,6 @@ .probe = virtex_probe, .init_IRQ = xilinx_intc_init_tree, .get_irq = xilinx_intc_get_irq, + .restart = ppc4xx_reset_system, .calibrate_decr = generic_calibrate_decr, }; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/40x/walnut.c ++++ b/arch/powerpc/platforms/40x/walnut.c @@ -26,6 +26,7 @@ #include <asm/time.h> #include <asm/uic.h> @@ -91962,7 +91454,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/40x/walnut.c static __initdata struct of_device_id walnut_of_bus[] = { { .compatible = "ibm,plb3", }, -@@ -61,5 +62,6 @@ define_machine(walnut) { +@@ -61,5 +62,6 @@ .progress = udbg_progress, .init_IRQ = uic_init_tree, .get_irq = uic_get_irq, @@ -91970,10 +91462,8 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/40x/walnut.c + .restart = ppc4xx_reset_system, + .calibrate_decr = generic_calibrate_decr, }; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/44x/44x.h ++++ b/arch/powerpc/platforms/44x/44x.h @@ -3,6 +3,5 @@ extern u8 as1_readb(volatile u8 __iomem *addr); @@ -91981,11 +91471,9 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/44x/44x.h -extern void ppc44x_reset_system(char *cmd); #endif /* __POWERPC_PLATFORMS_44X_44X_H */ -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/44x/Kconfig ++++ b/arch/powerpc/platforms/44x/Kconfig +@@ -67,6 +67,25 @@ See http://www.pikatechnologies.com/ and follow the "PIKA for Computer Telephony Developers" link for more information. @@ -92011,7 +91499,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/44x/Kconfig #config LUAN # bool "Luan" # depends on 44x -@@ -122,6 +141,14 @@ config 440SPe +@@ -122,6 +141,14 @@ bool select IBM_NEW_EMAC_EMAC4 @@ -92026,10 +91514,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/platforms/44x/Makefile ++++ b/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 +91529,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/platforms/44x/bamboo.c ++++ b/arch/powerpc/platforms/44x/bamboo.c @@ -22,8 +22,7 @@ #include <asm/time.h> #include <asm/uic.h> @@ -92057,7 +91541,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/44x/bamboo.c static __initdata struct of_device_id bamboo_of_bus[] = { { .compatible = "ibm,plb4", }, -@@ -53,11 +52,11 @@ static int __init bamboo_probe(void) +@@ -53,11 +52,11 @@ } define_machine(bamboo) { @@ -92075,10 +91559,8 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/44x/bamboo.c + .restart = ppc4xx_reset_system, .calibrate_decr = generic_calibrate_decr, }; -Index: linux-2.6.25.4/arch/powerpc/platforms/44x/canyonlands.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/platforms/44x/canyonlands.c ++++ b/arch/powerpc/platforms/44x/canyonlands.c @@ -0,0 +1,63 @@ +/* + * Canyonlands board specific routines @@ -92143,10 +91625,8 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/44x/canyonlands.c + .restart = ppc4xx_reset_system, + .calibrate_decr = generic_calibrate_decr, +}; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/44x/ebony.c ++++ b/arch/powerpc/platforms/44x/ebony.c @@ -26,8 +26,7 @@ #include <asm/time.h> #include <asm/uic.h> @@ -92157,7 +91637,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/44x/ebony.c static __initdata struct of_device_id ebony_of_bus[] = { { .compatible = "ibm,plb4", }, -@@ -66,6 +65,6 @@ define_machine(ebony) { +@@ -66,6 +65,6 @@ .progress = udbg_progress, .init_IRQ = uic_init_tree, .get_irq = uic_get_irq, @@ -92165,10 +91645,8 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/44x/ebony.c + .restart = ppc4xx_reset_system, .calibrate_decr = generic_calibrate_decr, }; -Index: linux-2.6.25.4/arch/powerpc/platforms/44x/idle.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/platforms/44x/idle.c ++++ b/arch/powerpc/platforms/44x/idle.c @@ -0,0 +1,67 @@ +/* + * Copyright 2008 IBM Corp. @@ -92237,10 +91715,8 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/44x/idle.c +} + +early_param("idle", idle_param); -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/44x/katmai.c ++++ b/arch/powerpc/platforms/44x/katmai.c @@ -22,8 +22,7 @@ #include <asm/time.h> #include <asm/uic.h> @@ -92251,7 +91727,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/44x/katmai.c static __initdata struct of_device_id katmai_of_bus[] = { { .compatible = "ibm,plb4", }, -@@ -58,6 +57,6 @@ define_machine(katmai) { +@@ -58,6 +57,6 @@ .progress = udbg_progress, .init_IRQ = uic_init_tree, .get_irq = uic_get_irq, @@ -92259,11 +91735,9 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/44x/katmai.c + .restart = ppc4xx_reset_system, .calibrate_decr = generic_calibrate_decr, }; -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/platforms/44x/misc_44x.S ++++ b/arch/powerpc/platforms/44x/misc_44x.S +@@ -44,14 +44,3 @@ sync isync blr @@ -92278,10 +91752,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/platforms/44x/rainier.c ++++ b/arch/powerpc/platforms/44x/rainier.c @@ -22,7 +22,7 @@ #include <asm/time.h> #include <asm/uic.h> @@ -92291,7 +91763,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/44x/rainier.c static __initdata struct of_device_id rainier_of_bus[] = { { .compatible = "ibm,plb4", }, -@@ -57,6 +57,6 @@ define_machine(rainier) { +@@ -57,6 +57,6 @@ .progress = udbg_progress, .init_IRQ = uic_init_tree, .get_irq = uic_get_irq, @@ -92299,10 +91771,8 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/44x/rainier.c + .restart = ppc4xx_reset_system, .calibrate_decr = generic_calibrate_decr, }; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/44x/sequoia.c ++++ b/arch/powerpc/platforms/44x/sequoia.c @@ -23,7 +23,7 @@ #include <asm/uic.h> #include <asm/pci-bridge.h> @@ -92312,7 +91782,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/44x/sequoia.c static __initdata struct of_device_id sequoia_of_bus[] = { { .compatible = "ibm,plb4", }, -@@ -58,6 +58,6 @@ define_machine(sequoia) { +@@ -58,6 +58,6 @@ .progress = udbg_progress, .init_IRQ = uic_init_tree, .get_irq = uic_get_irq, @@ -92320,10 +91790,8 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/44x/sequoia.c + .restart = ppc4xx_reset_system, .calibrate_decr = generic_calibrate_decr, }; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/44x/taishan.c ++++ b/arch/powerpc/platforms/44x/taishan.c @@ -29,8 +29,7 @@ #include <asm/time.h> #include <asm/uic.h> @@ -92334,7 +91802,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/44x/taishan.c static __initdata struct of_device_id taishan_of_bus[] = { { .compatible = "ibm,plb4", }, -@@ -68,6 +67,6 @@ define_machine(taishan) { +@@ -68,6 +67,6 @@ .progress = udbg_progress, .init_IRQ = uic_init_tree, .get_irq = uic_get_irq, @@ -92342,10 +91810,8 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/44x/taishan.c + .restart = ppc4xx_reset_system, .calibrate_decr = generic_calibrate_decr, }; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/44x/warp-nand.c ++++ b/arch/powerpc/platforms/44x/warp-nand.c @@ -11,6 +11,7 @@ #include <linux/mtd/partitions.h> #include <linux/mtd/nand.h> @@ -92354,7 +91820,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/44x/warp-nand.c #ifdef CONFIG_MTD_NAND_NDFC -@@ -100,6 +101,6 @@ static int warp_setup_nand_flash(void) +@@ -100,6 +101,6 @@ return 0; } @@ -92362,10 +91828,8 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/44x/warp-nand.c +machine_device_initcall(warp, warp_setup_nand_flash); #endif -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/44x/warp.c ++++ b/arch/powerpc/platforms/44x/warp.c @@ -18,9 +18,7 @@ #include <asm/udbg.h> #include <asm/time.h> @@ -92377,7 +91841,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/44x/warp.c static __initdata struct of_device_id warp_of_bus[] = { { .compatible = "ibm,plb4", }, -@@ -49,7 +47,7 @@ define_machine(warp) { +@@ -49,7 +47,7 @@ .progress = udbg_progress, .init_IRQ = uic_init_tree, .get_irq = uic_get_irq, @@ -92386,11 +91850,9 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/44x/warp.c .calibrate_decr = generic_calibrate_decr, }; -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/platforms/52xx/lite5200.c ++++ b/arch/powerpc/platforms/52xx/lite5200.c +@@ -63,7 +63,7 @@ of_node_put(np); if (!cdm) { printk(KERN_ERR "%s() failed; expect abnormal behaviour\n", @@ -92399,7 +91861,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/52xx/lite5200.c return; } -@@ -98,7 +98,7 @@ lite5200_fix_port_config(void) +@@ -98,7 +98,7 @@ of_node_put(np); if (!gpio) { printk(KERN_ERR "%s() failed. expect abnormal behavior\n", @@ -92408,11 +91870,9 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/52xx/lite5200.c return; } -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/82xx/Kconfig ++++ b/arch/powerpc/platforms/82xx/Kconfig +@@ -11,7 +11,6 @@ select 8260 select FSL_SOC select PQ2_ADS_PCI_PIC if PCI @@ -92420,7 +91880,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/82xx/Kconfig help This option enables support for the MPC8272 ADS board -@@ -22,7 +21,6 @@ config PQ2FADS +@@ -22,7 +21,6 @@ select 8260 select FSL_SOC select PQ2_ADS_PCI_PIC if PCI @@ -92428,7 +91888,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/82xx/Kconfig help This option enables support for the PQ2FADS board -@@ -31,7 +29,6 @@ config EP8248E +@@ -31,7 +29,6 @@ select 8272 select 8260 select FSL_SOC @@ -92436,11 +91896,9 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/82xx/Kconfig select MDIO_BITBANG help This enables support for the Embedded Planet EP8248E board. -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/83xx/mpc837x_rdb.c ++++ b/arch/powerpc/platforms/83xx/mpc837x_rdb.c +@@ -46,6 +46,7 @@ static struct of_device_id mpc837x_ids[] = { { .type = "soc", }, { .compatible = "soc", }, @@ -92448,10 +91906,8 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/83xx/mpc837x_rdb.c {}, }; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/83xx/mpc83xx.h ++++ b/arch/powerpc/platforms/83xx/mpc83xx.h @@ -16,6 +16,7 @@ #define MPC83XX_SCCR_USB_DRCM_10 0x00200000 #define MPC8315_SCCR_USB_MASK 0x00c00000 @@ -92468,11 +91924,9 @@ Index: linux-2.6.25.4/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.4/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) +--- a/arch/powerpc/platforms/83xx/usb.c ++++ b/arch/powerpc/platforms/83xx/usb.c +@@ -129,7 +129,7 @@ if (immr_node && of_device_is_compatible(immr_node, "fsl,mpc8315-immr")) clrsetbits_be32(immap + MPC83XX_SCCR_OFFS, MPC8315_SCCR_USB_MASK, @@ -92481,7 +91935,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/83xx/usb.c else clrsetbits_be32(immap + MPC83XX_SCCR_OFFS, MPC83XX_SCCR_USB_MASK, -@@ -164,9 +164,15 @@ int mpc831x_usb_cfg(void) +@@ -164,9 +164,15 @@ /* Using on-chip PHY */ if (prop && (!strcmp(prop, "utmi_wide") || !strcmp(prop, "utmi"))) { @@ -92499,11 +91953,9 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/platforms/85xx/Kconfig ++++ b/arch/powerpc/platforms/85xx/Kconfig +@@ -19,7 +19,6 @@ config MPC8560_ADS bool "Freescale MPC8560 ADS" select DEFAULT_UIMAGE @@ -92511,7 +91963,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/85xx/Kconfig select CPM2 help This option enables support for the MPC 8560 ADS board -@@ -46,6 +45,12 @@ config MPC85xx_DS +@@ -46,6 +45,12 @@ help This option enables support for the MPC85xx DS (MPC8544 DS) board @@ -92524,7 +91976,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/85xx/Kconfig config STX_GP3 bool "Silicon Turnkey Express GP3" help -@@ -53,14 +58,12 @@ config STX_GP3 +@@ -53,14 +58,12 @@ board. select CPM2 select DEFAULT_UIMAGE @@ -92539,7 +91991,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/85xx/Kconfig select TQM85xx config TQM8541 -@@ -68,7 +71,6 @@ config TQM8541 +@@ -68,7 +71,6 @@ help This option enables support for the TQ Components TQM8541 board. select DEFAULT_UIMAGE @@ -92547,7 +91999,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/85xx/Kconfig select TQM85xx select CPM2 -@@ -77,7 +79,6 @@ config TQM8555 +@@ -77,7 +79,6 @@ help This option enables support for the TQ Components TQM8555 board. select DEFAULT_UIMAGE @@ -92555,7 +92007,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/85xx/Kconfig select TQM85xx select CPM2 -@@ -86,7 +87,6 @@ config TQM8560 +@@ -86,7 +87,6 @@ help This option enables support for the TQ Components TQM8560 board. select DEFAULT_UIMAGE @@ -92563,7 +92015,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/85xx/Kconfig select TQM85xx select CPM2 -@@ -99,7 +99,6 @@ config SBC8548 +@@ -99,7 +99,6 @@ config SBC8560 bool "Wind River SBC8560" select DEFAULT_UIMAGE @@ -92571,19 +92023,15 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/85xx/Kconfig help This option enables support for the Wind River SBC8560 board -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/85xx/Makefile ++++ b/arch/powerpc/platforms/85xx/Makefile +@@ -10,3 +10,4 @@ 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.4/arch/powerpc/platforms/85xx/ksi8560.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/platforms/85xx/ksi8560.c ++++ b/arch/powerpc/platforms/85xx/ksi8560.c @@ -0,0 +1,257 @@ +/* + * Board setup routines for the Emerson KSI8560 @@ -92842,11 +92290,9 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/85xx/ksi8560.c + .restart = machine_restart, + .calibrate_decr = generic_calibrate_decr, +}; -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c ++++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c +@@ -165,7 +165,7 @@ int i; for (i = 0; i < ARRAY_SIZE(mpc8560_ads_pins); i++) { @@ -92855,10 +92301,8 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/85xx/mpc85xx_ads.c cpm2_set_pin(pin->port, pin->pin, pin->flags); } -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c ++++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c @@ -19,6 +19,7 @@ #include <linux/delay.h> #include <linux/seq_file.h> @@ -92876,7 +92320,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/85xx/mpc85xx_ds.c #else #define DBG(fmt, args...) #endif -@@ -183,6 +184,18 @@ static int __init mpc8544_ds_probe(void) +@@ -183,6 +184,18 @@ } } @@ -92895,11 +92339,9 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/85xx/mpc85xx_ds.c /* * Called very early, device-tree isn't unflattened */ -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/86xx/Kconfig ++++ b/arch/powerpc/platforms/86xx/Kconfig +@@ -11,6 +11,12 @@ help This option enables support for the MPC8641 HPCN board. @@ -92912,7 +92354,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/86xx/Kconfig config MPC8610_HPCD bool "Freescale MPC8610 HPCD" select DEFAULT_UIMAGE -@@ -24,7 +30,7 @@ config MPC8641 +@@ -24,7 +30,7 @@ select FSL_PCI if PCI select PPC_UDBG_16550 select MPIC @@ -92921,21 +92363,17 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/86xx/Kconfig config MPC8610 bool -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/86xx/Makefile ++++ b/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.4/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 +--- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c ++++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c +@@ -52,7 +52,7 @@ } machine_device_initcall(mpc86xx_hpcd, mpc8610_declare_of_platform_devices); @@ -92944,7 +92382,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/86xx/mpc8610_hpcd.c mpc86xx_hpcd_init_irq(void) { struct mpic *mpic1; -@@ -200,7 +200,7 @@ static int __init mpc86xx_hpcd_probe(voi +@@ -200,7 +200,7 @@ return 0; } @@ -92953,11 +92391,9 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/86xx/mpc8610_hpcd.c mpc86xx_time_init(void) { unsigned int temp; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c ++++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c +@@ -55,7 +55,7 @@ } #endif /* CONFIG_PCI */ @@ -92966,7 +92402,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c mpc86xx_hpcn_init_irq(void) { struct mpic *mpic1; -@@ -162,7 +162,7 @@ mpc86xx_hpcn_setup_arch(void) +@@ -162,7 +162,7 @@ } @@ -92975,7 +92411,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c mpc86xx_hpcn_show_cpuinfo(struct seq_file *m) { struct device_node *root; -@@ -190,13 +190,19 @@ static int __init mpc86xx_hpcn_probe(voi +@@ -190,13 +190,19 @@ { unsigned long root = of_get_flat_dt_root(); @@ -92997,10 +92433,8 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c mpc86xx_time_init(void) { unsigned int temp; -Index: linux-2.6.25.4/arch/powerpc/platforms/86xx/sbc8641d.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/platforms/86xx/sbc8641d.c ++++ b/arch/powerpc/platforms/86xx/sbc8641d.c @@ -0,0 +1,164 @@ +/* + * SBC8641D board specific routines @@ -93166,11 +92600,9 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/86xx/sbc8641d.c + .pcibios_fixup_bus = fsl_pcibios_fixup_bus, +#endif +}; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/8xx/Kconfig ++++ b/arch/powerpc/platforms/8xx/Kconfig +@@ -18,7 +18,6 @@ config MPC86XADS bool "MPC86XADS" select CPM1 @@ -93178,7 +92610,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/8xx/Kconfig help MPC86x Application Development System by Freescale Semiconductor. The MPC86xADS is meant to serve as a platform for s/w and h/w -@@ -27,7 +26,6 @@ config MPC86XADS +@@ -27,7 +26,6 @@ config MPC885ADS bool "MPC885ADS" select CPM1 @@ -93186,7 +92618,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/8xx/Kconfig help Freescale Semiconductor MPC885 Application Development System (ADS). Also known as DUET. -@@ -37,7 +35,6 @@ config MPC885ADS +@@ -37,7 +35,6 @@ config PPC_EP88XC bool "Embedded Planet EP88xC (a.k.a. CWH-PPC-885XN-VE)" select CPM1 @@ -93194,7 +92626,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/8xx/Kconfig help This enables support for the Embedded Planet EP88xC board. -@@ -47,7 +44,6 @@ config PPC_EP88XC +@@ -47,7 +44,6 @@ config PPC_ADDER875 bool "Analogue & Micro Adder 875" select CPM1 @@ -93202,11 +92634,9 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/8xx/Kconfig select REDBOOT help This enables support for the Analogue & Micro Adder 875 -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/platforms/8xx/m8xx_setup.c ++++ b/arch/powerpc/platforms/8xx/m8xx_setup.c +@@ -111,17 +111,12 @@ /* Processor frequency is MHz. */ @@ -93225,11 +92655,9 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/platforms/Kconfig ++++ b/arch/powerpc/platforms/Kconfig +@@ -290,13 +290,7 @@ config PPC_CPM_NEW_BINDING bool depends on CPM1 || CPM2 @@ -93244,11 +92672,9 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/Kconfig config AXON_RAM tristate "Axon DDR2 memory device driver" -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/Kconfig.cputype ++++ b/arch/powerpc/platforms/Kconfig.cputype +@@ -41,11 +41,13 @@ bool "AMCC 40x" select PPC_DCR_NATIVE select PPC_UDBG_16550 @@ -93262,10 +92688,8 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/Kconfig.cputype config E200 bool "Freescale e200" -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/cell/iommu.c ++++ b/arch/powerpc/platforms/cell/iommu.c @@ -28,13 +28,13 @@ #include <linux/notifier.h> #include <linux/of.h> @@ -93281,7 +92705,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/iommu.c #include <asm/firmware.h> #include <asm/cell-regs.h> -@@ -316,7 +316,7 @@ static void cell_iommu_setup_stab(struct +@@ -316,7 +316,7 @@ segments = max(dbase + dsize, fbase + fsize) >> IO_SEGMENT_SHIFT; pr_debug("%s: iommu[%d]: segments: %lu\n", @@ -93290,7 +92714,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/iommu.c /* set up the segment table */ stab_size = segments * sizeof(unsigned long); -@@ -343,7 +343,7 @@ static unsigned long *cell_iommu_alloc_p +@@ -343,7 +343,7 @@ (1 << 12) / sizeof(unsigned long)); ptab_size = segments * pages_per_segment * sizeof(unsigned long); @@ -93299,7 +92723,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/iommu.c iommu->nid, ptab_size, get_order(ptab_size)); page = alloc_pages_node(iommu->nid, GFP_KERNEL, get_order(ptab_size)); BUG_ON(!page); -@@ -355,7 +355,7 @@ static unsigned long *cell_iommu_alloc_p +@@ -355,7 +355,7 @@ n_pte_pages = (pages_per_segment * sizeof(unsigned long)) >> 12; pr_debug("%s: iommu[%d]: stab at %p, ptab at %p, n_pte_pages: %lu\n", @@ -93308,7 +92732,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/iommu.c n_pte_pages); /* initialise the STEs */ -@@ -394,7 +394,7 @@ static void cell_iommu_enable_hardware(s +@@ -394,7 +394,7 @@ if (cell_iommu_find_ioc(iommu->nid, &xlate_base)) panic("%s: missing IOC register mappings for node %d\n", @@ -93317,11 +92741,9 @@ Index: linux-2.6.25.4/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.4/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) +--- a/arch/powerpc/platforms/cell/pervasive.c ++++ b/arch/powerpc/platforms/cell/pervasive.c +@@ -65,7 +65,7 @@ break; default: printk(KERN_WARNING "%s: unknown configuration\n", @@ -93330,11 +92752,9 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/pervasive.c break; } mtspr(SPRN_TSC_CELL, thread_switch_control); -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/cell/ras.c ++++ b/arch/powerpc/platforms/cell/ras.c +@@ -132,7 +132,7 @@ (unsigned int)(addr >> 32), (unsigned int)(addr & 0xffffffff))) { printk(KERN_ERR "%s: error enabling PTCAL on node %d!\n", @@ -93343,7 +92763,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/ras.c goto out_free_pages; } -@@ -162,7 +162,7 @@ static int __init cbe_ptcal_enable(void) +@@ -162,7 +162,7 @@ if (!size) return -ENODEV; @@ -93352,7 +92772,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/ras.c order = get_order(*size); of_node_put(np); -@@ -180,7 +180,7 @@ static int __init cbe_ptcal_enable(void) +@@ -180,7 +180,7 @@ const u32 *nid = of_get_property(np, "node-id", NULL); if (!nid) { printk(KERN_ERR "%s: node %s is missing node-id?\n", @@ -93361,7 +92781,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/ras.c continue; } cbe_ptcal_enable_on_node(*nid, order); -@@ -195,13 +195,13 @@ static int cbe_ptcal_disable(void) +@@ -195,13 +195,13 @@ struct ptcal_area *area, *tmp; int ret = 0; @@ -93377,11 +92797,9 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/ras.c area->nid); ret = -EIO; continue; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/cell/spu_base.c ++++ b/arch/powerpc/platforms/cell/spu_base.c +@@ -165,7 +165,7 @@ struct spu_slb slb; int psize; @@ -93390,7 +92808,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/spu_base.c slb.esid = (ea & ESID_MASK) | SLB_ESID_V; -@@ -215,7 +215,7 @@ static int __spu_trap_data_seg(struct sp +@@ -215,7 +215,7 @@ extern int hash_page(unsigned long ea, unsigned long access, unsigned long trap); //XXX static int __spu_trap_data_map(struct spu *spu, unsigned long ea, u64 dsisr) { @@ -93399,7 +92817,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/spu_base.c /* Handle kernel space hash faults immediately. User hash faults need to be deferred to process context. */ -@@ -351,7 +351,7 @@ spu_irq_class_1(int irq, void *data) +@@ -351,7 +351,7 @@ __spu_trap_data_seg(spu, dar); spin_unlock(&spu->register_lock); @@ -93408,7 +92826,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/spu_base.c dar, dsisr); if (stat & CLASS1_STORAGE_FAULT_INTR) -@@ -726,7 +726,7 @@ static int __init init_spu_base(void) +@@ -726,7 +726,7 @@ if (ret < 0) { printk(KERN_WARNING "%s: Error initializing spus\n", @@ -93417,11 +92835,9 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/spu_base.c goto out_unregister_sysdev_class; } -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/cell/spu_callbacks.c ++++ b/arch/powerpc/platforms/cell/spu_callbacks.c +@@ -54,7 +54,7 @@ long (*syscall)(u64 a1, u64 a2, u64 a3, u64 a4, u64 a5, u64 a6); if (s->nr_ret >= ARRAY_SIZE(spu_syscall_table)) { @@ -93430,11 +92846,9 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/spu_callbacks.c return -ENOSYS; } -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/cell/spu_manage.c ++++ b/arch/powerpc/platforms/cell/spu_manage.c +@@ -92,7 +92,7 @@ tmp = of_get_property(np->parent->parent, "node-id", NULL); if (!tmp) { @@ -93443,7 +92857,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/spu_manage.c nid = spu->node; } else nid = tmp[0]; -@@ -296,7 +296,7 @@ static int __init of_enumerate_spus(int +@@ -296,7 +296,7 @@ ret = fn(node); if (ret) { printk(KERN_WARNING "%s: Error initializing %s\n", @@ -93452,7 +92866,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/spu_manage.c break; } n++; -@@ -327,7 +327,7 @@ static int __init of_create_spu(struct s +@@ -327,7 +327,7 @@ if (!legacy_map) { legacy_map = 1; printk(KERN_WARNING "%s: Legacy device tree found, " @@ -93461,7 +92875,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/spu_manage.c } ret = spu_map_device_old(spu); if (ret) { -@@ -342,7 +342,7 @@ static int __init of_create_spu(struct s +@@ -342,7 +342,7 @@ if (!legacy_irq) { legacy_irq = 1; printk(KERN_WARNING "%s: Legacy device tree found, " @@ -93470,11 +92884,9 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/spu_manage.c } ret = spu_map_interrupts_old(spu, spe); if (ret) { -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/cell/spufs/coredump.c ++++ b/arch/powerpc/platforms/cell/spufs/coredump.c +@@ -133,8 +133,6 @@ if (ctx->flags & SPU_CREATE_NOSCHED) continue; @@ -93483,7 +92895,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/spufs/coredump.c break; } -@@ -157,6 +155,9 @@ int spufs_coredump_extra_notes_size(void +@@ -157,6 +155,9 @@ break; size += rc; @@ -93493,7 +92905,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/spufs/coredump.c } return size; -@@ -239,6 +240,9 @@ int spufs_coredump_extra_notes_write(str +@@ -239,6 +240,9 @@ } spu_release_saved(ctx); @@ -93503,11 +92915,9 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/spufs/coredump.c } return 0; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/cell/spufs/file.c ++++ b/arch/powerpc/platforms/cell/spufs/file.c +@@ -1337,7 +1337,7 @@ return ctx->ops->signal1_type_get(ctx); } DEFINE_SPUFS_ATTRIBUTE(spufs_signal1_type, spufs_signal1_type_get, @@ -93516,7 +92926,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/spufs/file.c static int spufs_signal2_type_set(void *data, u64 val) -@@ -1359,7 +1359,7 @@ static u64 spufs_signal2_type_get(struct +@@ -1359,7 +1359,7 @@ return ctx->ops->signal2_type_get(ctx); } DEFINE_SPUFS_ATTRIBUTE(spufs_signal2_type, spufs_signal2_type_get, @@ -93525,7 +92935,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/spufs/file.c #if SPUFS_MMAP_4K static unsigned long spufs_mss_mmap_nopfn(struct vm_area_struct *vma, -@@ -1556,7 +1556,7 @@ void spufs_mfc_callback(struct spu *spu) +@@ -1556,7 +1556,7 @@ wake_up_all(&ctx->mfc_wq); @@ -93534,7 +92944,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/spufs/file.c if (ctx->mfc_fasync) { u32 free_elements, tagstatus; unsigned int mask; -@@ -1790,7 +1790,7 @@ static unsigned int spufs_mfc_poll(struc +@@ -1790,7 +1790,7 @@ if (tagstatus & ctx->tagwait) mask |= POLLIN | POLLRDNORM; @@ -93543,11 +92953,9 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/spufs/file.c free_elements, tagstatus, ctx->tagwait); return mask; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/cell/spufs/run.c ++++ b/arch/powerpc/platforms/cell/spufs/run.c +@@ -98,7 +98,7 @@ != MFC_CNTL_PURGE_DMA_COMPLETE) { if (time_after(jiffies, timeout)) { printk(KERN_ERR "%s: timeout flushing MFC DMA queue\n", @@ -93556,7 +92964,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/spufs/run.c ret = -EIO; goto out; } -@@ -124,7 +124,7 @@ static int spu_setup_isolated(struct spu +@@ -124,7 +124,7 @@ status_loading) { if (time_after(jiffies, timeout)) { printk(KERN_ERR "%s: timeout waiting for loader\n", @@ -93565,7 +92973,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/spufs/run.c ret = -EIO; goto out_drop_priv; } -@@ -134,7 +134,7 @@ static int spu_setup_isolated(struct spu +@@ -134,7 +134,7 @@ if (!(status & SPU_STATUS_RUNNING)) { /* If isolated LOAD has failed: run SPU, we will get a stop-and * signal later. */ @@ -93574,7 +92982,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/spufs/run.c ctx->ops->runcntl_write(ctx, SPU_RUNCNTL_RUNNABLE); ret = -EACCES; goto out_drop_priv; -@@ -142,7 +142,7 @@ static int spu_setup_isolated(struct spu +@@ -142,7 +142,7 @@ if (!(status & SPU_STATUS_ISOLATED_STATE)) { /* This isn't allowed by the CBEA, but check anyway */ @@ -93583,7 +92991,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/spufs/run.c ctx->ops->runcntl_write(ctx, SPU_RUNCNTL_STOP); ret = -EINVAL; goto out_drop_priv; -@@ -282,7 +282,7 @@ static int spu_handle_restartsys(struct +@@ -282,7 +282,7 @@ break; default: printk(KERN_WARNING "%s: unexpected return code %ld\n", @@ -93592,7 +93000,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/spufs/run.c ret = 0; } return ret; -@@ -323,6 +323,10 @@ static int spu_process_callback(struct s +@@ -323,6 +323,10 @@ return -EINTR; } @@ -93603,11 +93011,9 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/platforms/cell/spufs/switch.c ++++ b/arch/powerpc/platforms/cell/spufs/switch.c +@@ -1815,6 +1815,7 @@ save_mfc_csr_ato(prev, spu); /* Step 24. */ save_mfc_tclass_id(prev, spu); /* Step 25. */ set_mfc_tclass_id(prev, spu); /* Step 26. */ @@ -93615,7 +93021,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/spufs/switch.c purge_mfc_queue(prev, spu); /* Step 27. */ wait_purge_complete(prev, spu); /* Step 28. */ setup_mfc_sr1(prev, spu); /* Step 30. */ -@@ -1831,7 +1832,6 @@ static void save_csa(struct spu_state *p +@@ -1831,7 +1832,6 @@ save_ppuint_mb(prev, spu); /* Step 41. */ save_ch_part1(prev, spu); /* Step 42. */ save_spu_mb(prev, spu); /* Step 43. */ @@ -93623,11 +93029,9 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/cell/spufs/switch.c reset_ch(prev, spu); /* Step 45. */ } -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/platforms/celleb/beat.c ++++ b/arch/powerpc/platforms/celleb/beat.c +@@ -48,6 +48,7 @@ } u64 beat_halt_code = 0x1000000000000000UL; @@ -93635,7 +93039,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/celleb/beat.c void beat_halt(void) { -@@ -94,9 +95,8 @@ ssize_t beat_nvram_read(char *buf, size_ +@@ -94,9 +95,8 @@ len = count; if (len > BEAT_NVRW_CNT) len = BEAT_NVRW_CNT; @@ -93646,7 +93050,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/celleb/beat.c p += len; i += len; -@@ -121,9 +121,8 @@ ssize_t beat_nvram_write(char *buf, size +@@ -121,9 +121,8 @@ len = count; if (len > BEAT_NVRW_CNT) len = BEAT_NVRW_CNT; @@ -93657,7 +93061,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/celleb/beat.c p += len; i += len; -@@ -149,13 +148,14 @@ int64_t beat_get_term_char(u64 vterm, u6 +@@ -149,13 +148,14 @@ u64 db[2]; s64 ret; @@ -93673,7 +93077,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/celleb/beat.c int64_t beat_put_term_char(u64 vterm, u64 len, u64 t1, u64 t2) { -@@ -163,8 +163,9 @@ int64_t beat_put_term_char(u64 vterm, u6 +@@ -163,8 +163,9 @@ db[0] = t1; db[1] = t2; @@ -93684,7 +93088,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/celleb/beat.c void beat_power_save(void) { -@@ -261,7 +262,3 @@ static int __init beat_event_init(void) +@@ -261,7 +262,3 @@ } device_initcall(beat_event_init); @@ -93692,10 +93096,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/platforms/celleb/beat.h ++++ b/arch/powerpc/platforms/celleb/beat.h @@ -21,8 +21,8 @@ #ifndef _CELLEB_BEAT_H #define _CELLEB_BEAT_H @@ -93707,11 +93109,9 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/platforms/celleb/beat_wrapper.h ++++ b/arch/powerpc/platforms/celleb/beat_wrapper.h +@@ -197,7 +197,8 @@ u64 b[2]; memcpy(b, buffer, len); @@ -93721,10 +93121,8 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/celleb/beat_wrapper.h } static inline s64 beat_get_spe_privileged_state_1_registers( -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/celleb/htab.c ++++ b/arch/powerpc/platforms/celleb/htab.c @@ -35,9 +35,9 @@ #include "beat_wrapper.h" @@ -93737,7 +93135,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/celleb/htab.c #endif static DEFINE_SPINLOCK(beat_htab_lock); -@@ -116,7 +116,8 @@ static long beat_lpar_hpte_insert(unsign +@@ -116,7 +116,8 @@ hpte_r &= ~_PAGE_COHERENT; spin_lock(&beat_htab_lock); @@ -93747,11 +93145,9 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/platforms/celleb/interrupt.c ++++ b/arch/powerpc/platforms/celleb/interrupt.c +@@ -34,7 +34,7 @@ static uint64_t beatic_irq_mask_enable[(MAX_IRQS+255)/64]; static uint64_t beatic_irq_mask_ack[(MAX_IRQS+255)/64]; @@ -93760,7 +93156,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/celleb/interrupt.c /* * In this implementation, "virq" == "IRQ plug number", -@@ -49,13 +49,13 @@ static inline void beatic_update_irq_mas +@@ -49,13 +49,13 @@ off = (irq_plug / 256) * 4; masks[0] = beatic_irq_mask_enable[off + 0] @@ -93778,7 +93174,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/celleb/interrupt.c if (beat_set_interrupt_mask(irq_plug&~255UL, masks[0], masks[1], masks[2], masks[3]) != 0) panic("Failed to set mask IRQ!"); -@@ -96,7 +96,8 @@ static void beatic_end_irq(unsigned int +@@ -96,7 +96,8 @@ s64 err; unsigned long flags; @@ -93788,7 +93184,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/celleb/interrupt.c if ((err & 0xFFFFFFFF) != 0xFFFFFFF5) /* -11: wrong state */ panic("Failed to downcount IRQ! Error = %16lx", err); -@@ -138,7 +139,8 @@ static int beatic_pic_host_map(struct ir +@@ -138,7 +139,8 @@ struct irq_desc *desc = get_irq_desc(virq); int64_t err; @@ -93798,7 +93194,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/celleb/interrupt.c return -EIO; desc->status |= IRQ_LEVEL; -@@ -202,22 +204,22 @@ static inline unsigned int beatic_get_ir +@@ -202,22 +204,22 @@ beat_detect_pending_interrupts(i, pending); __asm__ ("cntlzd %0,%1":"=r"(ub): "r"(pending[0] & beatic_irq_mask_enable[i/64+0] @@ -93825,7 +93221,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/celleb/interrupt.c if (ub != 64) return i + ub + 192; } -@@ -250,7 +252,7 @@ void __init beatic_init_IRQ(void) +@@ -250,7 +252,7 @@ /* Allocate an irq host */ beatic_host = irq_alloc_host(NULL, IRQ_HOST_MAP_NOMAP, 0, @@ -93834,11 +93230,9 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/celleb/interrupt.c 0); BUG_ON(beatic_host == NULL); irq_set_default_host(beatic_host); -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/celleb/scc_epci.c ++++ b/arch/powerpc/platforms/celleb/scc_epci.c +@@ -161,9 +161,9 @@ if (bus != hose->bus) addr = celleb_epci_get_epci_cfg(hose) + (((bus->number & 0xff) << 16) @@ -93851,7 +93245,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/celleb/scc_epci.c else addr = celleb_epci_get_epci_cfg(hose) + (((devfn & 0xff) << 8) | (where & 0xff)); -@@ -174,7 +174,7 @@ static PCI_IO_ADDR celleb_epci_make_conf +@@ -174,7 +174,7 @@ } static int celleb_epci_read_config(struct pci_bus *bus, @@ -93860,10 +93254,8 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/celleb/scc_epci.c { PCI_IO_ADDR epci_base; PCI_IO_ADDR addr; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/celleb/scc_sio.c ++++ b/arch/powerpc/platforms/celleb/scc_sio.c @@ -28,7 +28,7 @@ /* sio irq0=0xb00010022 irq0=0xb00010023 irq2=0xb00010024 @@ -93873,7 +93265,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/celleb/scc_sio.c static struct { uint32_t offset; -@@ -84,7 +84,7 @@ static int __init txx9_serial_config(cha +@@ -84,7 +84,7 @@ int i; for (;;) { @@ -93882,11 +93274,9 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/celleb/scc_sio.c default: return 0; case 2: -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/celleb/spu_priv1.c ++++ b/arch/powerpc/platforms/celleb/spu_priv1.c +@@ -183,8 +183,7 @@ return enable; } @@ -93896,11 +93286,9 @@ Index: linux-2.6.25.4/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.4/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) +--- a/arch/powerpc/platforms/celleb/udbg_beat.c ++++ b/arch/powerpc/platforms/celleb/udbg_beat.c +@@ -54,7 +54,8 @@ if (inbuflen == 0) { /* get some more chars. */ inbuflen = 0; @@ -93910,7 +93298,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/celleb/udbg_beat.c if (rc != 0) inbuflen = 0; /* otherwise inbuflen is garbage */ } -@@ -78,7 +79,7 @@ static int udbg_getc_beat(void) +@@ -78,7 +79,7 @@ if (ch == -1) { /* This shouldn't be needed...but... */ volatile unsigned long delay; @@ -93919,11 +93307,9 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/celleb/udbg_beat.c ; } else { return ch; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c ++++ b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c +@@ -117,11 +117,11 @@ } if (mpic_paddr == 0) { @@ -93937,7 +93323,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c (u32) mpic_paddr); mpic = mpic_alloc(tsi_pic, mpic_paddr, -@@ -140,17 +140,17 @@ static void __init mpc7448_hpc2_init_IRQ +@@ -140,17 +140,17 @@ #ifdef CONFIG_PCI tsi_pci = of_find_node_by_type(NULL, "pci"); if (tsi_pci == NULL) { @@ -93958,11 +93344,9 @@ Index: linux-2.6.25.4/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.4/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( +--- a/arch/powerpc/platforms/embedded6xx/prpmc2800.c ++++ b/arch/powerpc/platforms/embedded6xx/prpmc2800.c +@@ -49,13 +49,13 @@ * ioremap mpp and gpp registers in case they are later * needed by prpmc2800_reset_board(). */ @@ -93978,10 +93362,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/platforms/iseries/exception.S ++++ b/arch/powerpc/platforms/iseries/exception.S @@ -38,11 +38,19 @@ .globl system_reset_iSeries @@ -94004,21 +93386,17 @@ Index: linux-2.6.25.4/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.4/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 { +--- a/arch/powerpc/platforms/iseries/ipl_parms.h ++++ b/arch/powerpc/platforms/iseries/ipl_parms.h +@@ -65,6 +65,4 @@ u64 xRsvd13; // Reserved x38-x3F }; -extern struct ItIplParmsReal xItIplParmsReal; - #endif /* _ISERIES_IPL_PARMS_H */ -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/iseries/lpardata.c ++++ b/arch/powerpc/platforms/iseries/lpardata.c @@ -14,10 +14,10 @@ #include <asm/ptrace.h> #include <asm/abs_addr.h> @@ -94040,7 +93418,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/iseries/lpardata.c .xDesc = 0xc8a5d9c4, /* "HvRD" ebcdic */ .xSize = sizeof(struct HvReleaseData), .xVpdAreasPtrOffset = offsetof(struct naca_struct, xItVpdAreas), -@@ -61,6 +61,63 @@ struct naca_struct naca = { +@@ -61,6 +61,63 @@ .xRamDiskSize = 0, }; @@ -94104,7 +93482,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/iseries/lpardata.c extern void system_reset_iSeries(void); extern void machine_check_iSeries(void); extern void data_access_iSeries(void); -@@ -129,7 +186,7 @@ struct ItLpNaca itLpNaca = { +@@ -129,7 +186,7 @@ }; /* May be filled in by the hypervisor so cannot end up in the BSS */ @@ -94113,7 +93491,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/iseries/lpardata.c /* May be filled in by the hypervisor so cannot end up in the BSS */ struct ItExtVpdPanel xItExtVpdPanel __attribute__((__section__(".data"))); -@@ -152,13 +209,54 @@ u64 xMsVpd[3400] __attribute__((__sec +@@ -152,13 +209,54 @@ /* Space for Recovery Log Buffer */ /* May be filled in by the hypervisor so cannot end up in the BSS */ @@ -94170,7 +93548,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/iseries/lpardata.c /* The LparMap data is now located at offset 0x6000 in head.S * It was put there so that the HvReleaseData could address it * with a 32-bit offset as required by the iSeries hypervisor -@@ -167,7 +265,7 @@ struct SpCommArea xSpCommArea = { +@@ -167,7 +265,7 @@ * the Naca via the HvReleaseData area. The HvReleaseData has the * offset into the Naca of the pointer to the ItVpdAreas. */ @@ -94179,7 +93557,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/iseries/lpardata.c .xSlicDesc = 0xc9a3e5c1, /* "ItVA" */ .xSlicSize = sizeof(struct ItVpdAreas), .xSlicVpdEntries = ItVpdMaxEntries, /* # VPD array entries */ -@@ -185,7 +283,7 @@ struct ItVpdAreas itVpdAreas = { +@@ -185,7 +283,7 @@ .xSlicVpdLens = { /* VPD lengths */ 0,0,0, /* 0 - 2 */ sizeof(xItExtVpdPanel), /* 3 Extended VPD */ @@ -94188,7 +93566,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/iseries/lpardata.c 0, /* 5 */ sizeof(struct ItIplParmsReal),/* 6 length of IPL parms */ 26992, /* 7 length of MS VPD */ -@@ -203,7 +301,7 @@ struct ItVpdAreas itVpdAreas = { +@@ -203,7 +301,7 @@ .xSlicVpdAdrs = { /* VPD addresses */ 0,0,0, /* 0 - 2 */ &xItExtVpdPanel, /* 3 Extended VPD */ @@ -94197,7 +93575,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/iseries/lpardata.c 0, /* 5 */ &xItIplParmsReal, /* 6 IPL parms */ &xMsVpd, /* 7 MS Vpd */ -@@ -219,10 +317,3 @@ struct ItVpdAreas itVpdAreas = { +@@ -219,10 +317,3 @@ 0,0 } }; @@ -94208,10 +93586,8 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/iseries/lpardata.c - .xSize = sizeof(struct ItLpRegSave), - }, -}; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/iseries/naca.h ++++ b/arch/powerpc/platforms/iseries/naca.h @@ -14,7 +14,7 @@ struct naca_struct { @@ -94221,10 +93597,8 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/iseries/naca.h void *xRamDisk; /* iSeries ramdisk 0x08 */ u64 xRamDiskSize; /* In pages 0x10 */ }; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/iseries/pci.c ++++ b/arch/powerpc/platforms/iseries/pci.c @@ -23,6 +23,7 @@ #undef DEBUG @@ -94233,7 +93607,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/iseries/pci.c #include <linux/kernel.h> #include <linux/list.h> #include <linux/string.h> -@@ -586,7 +587,7 @@ static inline struct device_node *xlate_ +@@ -586,7 +587,7 @@ static unsigned long last_jiffies; static int num_printed; @@ -94242,11 +93616,9 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/iseries/pci.c last_jiffies = jiffies; num_printed = 0; } -Index: linux-2.6.25.4/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 { +--- a/arch/powerpc/platforms/iseries/release_data.h ++++ b/arch/powerpc/platforms/iseries/release_data.h +@@ -58,6 +58,6 @@ char xRsvd3[20]; /* Reserved x2C-x3F */ }; @@ -94254,22 +93626,18 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/iseries/release_data.h +extern const struct HvReleaseData hvReleaseData; #endif /* _ISERIES_RELEASE_DATA_H */ -Index: linux-2.6.25.4/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 { +--- a/arch/powerpc/platforms/iseries/spcomm_area.h ++++ b/arch/powerpc/platforms/iseries/spcomm_area.h +@@ -31,6 +31,4 @@ u8 xRsvd2[80]; // Reserved 030-07F }; -extern struct SpCommArea xSpCommArea; - #endif /* _ISERIES_SPCOMM_AREA_H */ -Index: linux-2.6.25.4/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 { +--- a/arch/powerpc/platforms/iseries/vpd_areas.h ++++ b/arch/powerpc/platforms/iseries/vpd_areas.h +@@ -80,9 +80,9 @@ u32 xPlicDmaLens[ItDmaMaxEntries];// Array of DMA lengths 080-0A7 u32 xPlicDmaToks[ItDmaMaxEntries];// Array of DMA tokens 0A8-0CF u32 xSlicVpdLens[ItVpdMaxEntries];// Array of VPD lengths 0D0-12F @@ -94281,11 +93649,9 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/iseries/vpd_areas.h +extern const struct ItVpdAreas itVpdAreas; #endif /* _ISERIES_VPD_AREAS_H */ -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/maple/pci.c ++++ b/arch/powerpc/platforms/maple/pci.c +@@ -592,50 +592,3 @@ } return irq; } @@ -94336,10 +93702,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/platforms/maple/setup.c ++++ b/arch/powerpc/platforms/maple/setup.c @@ -43,6 +43,7 @@ #include <linux/smp.h> #include <linux/bitops.h> @@ -94356,7 +93720,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/maple/setup.c #include <asm/mpic.h> #include <asm/rtas.h> #include <asm/udbg.h> -@@ -319,7 +319,7 @@ static int __init maple_probe(void) +@@ -319,7 +319,7 @@ return 1; } @@ -94365,10 +93729,8 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/maple/setup.c .name = "Maple", .probe = maple_probe, .setup_arch = maple_setup_arch, -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/pasemi/dma_lib.c ++++ b/arch/powerpc/platforms/pasemi/dma_lib.c @@ -17,6 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -94386,7 +93748,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/pasemi/dma_lib.c static struct pasdma_status *dma_status; -@@ -43,6 +46,8 @@ static struct pci_dev *dma_pdev; +@@ -43,6 +46,8 @@ static DECLARE_BITMAP(txch_free, MAX_TXCH); static DECLARE_BITMAP(rxch_free, MAX_RXCH); @@ -94395,7 +93757,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/pasemi/dma_lib.c /* pasemi_read_iob_reg - read IOB register * @reg: Register to read (offset into PCI CFG space) -@@ -373,6 +378,106 @@ void pasemi_dma_free_buf(struct pasemi_d +@@ -373,6 +378,106 @@ } EXPORT_SYMBOL(pasemi_dma_free_buf); @@ -94502,7 +93864,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/pasemi/dma_lib.c static void *map_onedev(struct pci_dev *p, int index) { struct device_node *dn; -@@ -410,6 +515,7 @@ int pasemi_dma_init(void) +@@ -410,6 +515,7 @@ struct resource res; struct device_node *dn; int i, intf, err = 0; @@ -94510,7 +93872,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/pasemi/dma_lib.c u32 tmp; if (!machine_is(pasemi)) -@@ -478,6 +584,44 @@ int pasemi_dma_init(void) +@@ -478,6 +584,44 @@ for (i = 0; i < MAX_RXCH; i++) __set_bit(i, rxch_free); @@ -94555,10 +93917,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/platforms/pasemi/iommu.c ++++ b/arch/powerpc/platforms/pasemi/iommu.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2007, PA Semi, Inc @@ -94617,7 +93977,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/pasemi/iommu.c static u32 iob_l1_emptyval; static u32 iob_l2_emptyval; static u32 *iob_l2_base; -@@ -219,7 +218,7 @@ int __init iob_init(struct device_node * +@@ -219,7 +218,7 @@ for (i = 0; i < 64; i++) { /* Each L1 covers 32MB, i.e. 8K entries = 32K of ram */ regword = IOBMAP_L1E_V | (__pa(iob_l2_base + i*0x2000) >> 12); @@ -94626,10 +93986,8 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/pasemi/iommu.c } /* set 2GB translation window, based at 0 */ -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/powermac/setup.c ++++ b/arch/powerpc/platforms/powermac/setup.c @@ -53,6 +53,7 @@ #include <linux/suspend.h> #include <linux/of_device.h> @@ -94646,11 +94004,9 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/powermac/setup.c #include <asm/udbg.h> #include "pmac.h" -Index: linux-2.6.25.4/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_ +--- a/arch/powerpc/platforms/ps3/device-init.c ++++ b/arch/powerpc/platforms/ps3/device-init.c +@@ -499,41 +499,14 @@ } /** @@ -94694,7 +94050,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/ps3/device-init.c case PS3_DEV_TYPE_STOR_DISK: result = ps3_setup_storage_dev(repo, PS3_MATCH_ID_STOR_DISK); -@@ -572,6 +545,48 @@ static int ps3_register_repository_devic +@@ -572,6 +545,48 @@ return result; } @@ -94743,7 +94099,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/ps3/device-init.c static void ps3_find_and_add_device(u64 bus_id, u64 dev_id) { struct ps3_repository_device repo; -@@ -601,7 +616,7 @@ found: +@@ -601,7 +616,7 @@ pr_debug("%s:%u: device %lu:%lu found after %u retries\n", __func__, __LINE__, bus_id, dev_id, retries); @@ -94752,7 +94108,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/ps3/device-init.c return; } -@@ -905,8 +920,7 @@ static int __init ps3_register_devices(v +@@ -905,8 +920,7 @@ ps3_register_graphics_devices(); @@ -94762,10 +94118,8 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/ps3/device-init.c ps3_register_sound_devices(); -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/ps3/htab.c ++++ b/arch/powerpc/platforms/ps3/htab.c @@ -19,9 +19,10 @@ */ @@ -94778,11 +94132,9 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/ps3/htab.c #include <asm/udbg.h> #include <asm/lv1call.h> #include <asm/ps3fb.h> -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/platforms/ps3/interrupt.c ++++ b/arch/powerpc/platforms/ps3/interrupt.c +@@ -709,7 +709,7 @@ asm volatile("cntlzd %0,%1" : "=r" (plug) : "r" (x)); plug &= 0x3f; @@ -94791,10 +94143,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/platforms/ps3/mm.c ++++ b/arch/powerpc/platforms/ps3/mm.c @@ -21,9 +21,10 @@ #include <linux/kernel.h> #include <linux/module.h> @@ -94807,10 +94157,8 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/ps3/mm.c #include <asm/udbg.h> #include <asm/lv1call.h> -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/ps3/os-area.c ++++ b/arch/powerpc/platforms/ps3/os-area.c @@ -24,8 +24,9 @@ #include <linux/fs.h> #include <linux/syscalls.h> @@ -94822,11 +94170,9 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/ps3/os-area.c #include "platform.h" -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/platforms/ps3/setup.c ++++ b/arch/powerpc/platforms/ps3/setup.c +@@ -95,6 +95,14 @@ ps3_sys_manager_power_off(); /* never returns */ } @@ -94841,7 +94187,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/ps3/setup.c static void ps3_panic(char *str) { DBG("%s:%d %s\n", __func__, __LINE__, str); -@@ -105,7 +113,8 @@ static void ps3_panic(char *str) +@@ -105,7 +113,8 @@ printk(" Please press POWER button.\n"); printk("\n"); @@ -94851,7 +94197,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/ps3/setup.c } #if defined(CONFIG_FB_PS3) || defined(CONFIG_FB_PS3_MODULE) || \ -@@ -117,7 +126,7 @@ static void __init prealloc(struct ps3_p +@@ -117,7 +126,7 @@ p->address = __alloc_bootmem(p->size, p->align, __pa(MAX_DMA_ADDRESS)); if (!p->address) { @@ -94860,7 +94206,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/ps3/setup.c p->name); return; } -@@ -266,6 +275,7 @@ define_machine(ps3) { +@@ -266,6 +275,7 @@ .progress = ps3_progress, .restart = ps3_restart, .power_off = ps3_power_off, @@ -94868,10 +94214,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/platforms/ps3/spu.c ++++ b/arch/powerpc/platforms/ps3/spu.c @@ -27,6 +27,7 @@ #include <asm/spu.h> #include <asm/spu_priv1.h> @@ -94880,7 +94224,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/ps3/spu.c #include "../cell/spufs/spufs.h" #include "platform.h" -@@ -140,6 +141,12 @@ static void _dump_areas(unsigned int spe +@@ -140,6 +141,12 @@ pr_debug("%s:%d: shadow: %lxh\n", func, line, shadow); } @@ -94893,20 +94237,16 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/ps3/spu.c static unsigned long get_vas_id(void) { unsigned long id; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/pseries/Makefile ++++ b/arch/powerpc/platforms/pseries/Makefile +@@ -18,3 +18,4 @@ 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.4/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 +--- a/arch/powerpc/platforms/pseries/eeh.c ++++ b/arch/powerpc/platforms/pseries/eeh.c +@@ -945,7 +945,6 @@ unsigned int rets[3]; struct eeh_early_enable_info *info = data; int ret; @@ -94914,7 +94254,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/pseries/eeh.c const u32 *class_code = of_get_property(dn, "class-code", NULL); const u32 *vendor_id = of_get_property(dn, "vendor-id", NULL); const u32 *device_id = of_get_property(dn, "device-id", NULL); -@@ -959,8 +958,8 @@ static void *early_enable_eeh(struct dev +@@ -959,8 +958,8 @@ pdn->eeh_freeze_count = 0; pdn->eeh_false_positives = 0; @@ -94925,10 +94265,8 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/pseries/eeh.c /* Ignore bad nodes. */ if (!class_code || !vendor_id || !device_id) -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/pseries/lpar.c ++++ b/arch/powerpc/platforms/pseries/lpar.c @@ -40,6 +40,7 @@ #include <asm/smp.h> @@ -94937,7 +94275,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/pseries/lpar.c #ifdef DEBUG_LOW #define DBG_LOW(fmt...) do { udbg_printf(fmt); } while(0) -@@ -203,7 +204,6 @@ void __init find_udbg_vterm(void) +@@ -203,7 +204,6 @@ struct device_node *stdout_node; const u32 *termno; const char *name; @@ -94945,7 +94283,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/pseries/lpar.c /* find the boot console from /chosen/stdout */ if (!of_chosen) -@@ -219,8 +219,6 @@ void __init find_udbg_vterm(void) +@@ -219,8 +219,6 @@ printk(KERN_WARNING "stdout node missing 'name' property!\n"); goto out; } @@ -94954,7 +94292,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/pseries/lpar.c /* Check if it's a virtual terminal */ if (strncmp(name, "vty", 3) != 0) -@@ -234,15 +232,13 @@ void __init find_udbg_vterm(void) +@@ -234,15 +232,13 @@ udbg_putc = udbg_putcLP; udbg_getc = udbg_getcLP; udbg_getc_poll = udbg_getc_pollLP; @@ -94972,7 +94310,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/pseries/lpar.c } out: of_node_put(stdout_node); -@@ -520,6 +516,20 @@ static void pSeries_lpar_hpte_invalidate +@@ -520,6 +516,20 @@ BUG_ON(lpar_rc != H_SUCCESS); } @@ -94993,7 +94331,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/pseries/lpar.c /* Flag bits for H_BULK_REMOVE */ #define HBR_REQUEST 0x4000000000000000UL #define HBR_RESPONSE 0x8000000000000000UL -@@ -597,6 +607,7 @@ void __init hpte_init_lpar(void) +@@ -597,6 +607,7 @@ ppc_md.hpte_updateboltedpp = pSeries_lpar_hpte_updateboltedpp; ppc_md.hpte_insert = pSeries_lpar_hpte_insert; ppc_md.hpte_remove = pSeries_lpar_hpte_remove; @@ -95001,11 +94339,9 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/platforms/pseries/pci_dlpar.c ++++ b/arch/powerpc/platforms/pseries/pci_dlpar.c +@@ -123,7 +123,7 @@ /* Add to children of PCI bridge dev->bus */ child_bus = pci_add_new_bus(dev->bus, dev, sec_busno); if (!child_bus) { @@ -95014,10 +94350,8 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/pseries/pci_dlpar.c return -EIO; } sprintf(child_bus->name, "PCI Bus #%02x", child_bus->number); -Index: linux-2.6.25.4/arch/powerpc/platforms/pseries/phyp_dump.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/platforms/pseries/phyp_dump.c ++++ b/arch/powerpc/platforms/pseries/phyp_dump.c @@ -0,0 +1,507 @@ +/* + * Hypervisor-assisted dump @@ -95526,22 +94860,18 @@ Index: linux-2.6.25.4/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.4/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); +--- a/arch/powerpc/platforms/pseries/pseries.h ++++ b/arch/powerpc/platforms/pseries/pseries.h +@@ -38,4 +38,6 @@ /* Poweron flag used for enabling auto ups restart */ extern unsigned long rtas_poweron_auto; +extern void find_udbg_vterm(void); + #endif /* _PSERIES_PSERIES_H */ -Index: linux-2.6.25.4/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 * +--- a/arch/powerpc/platforms/pseries/reconfig.c ++++ b/arch/powerpc/platforms/pseries/reconfig.c +@@ -222,14 +222,14 @@ tmp = strchr(buf, ' '); if (!tmp) { printk(KERN_ERR "property parse failed in %s at line %d\n", @@ -95558,7 +94888,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/pseries/reconfig.c return NULL; } -@@ -238,12 +238,12 @@ static char * parse_next_property(char * +@@ -238,12 +238,12 @@ *length = simple_strtoul(tmp, &tmp, 10); if (*length == -1) { printk(KERN_ERR "property parse failed in %s at line %d\n", @@ -95573,7 +94903,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/pseries/reconfig.c return NULL; } -@@ -252,12 +252,12 @@ static char * parse_next_property(char * +@@ -252,12 +252,12 @@ tmp += *length; if (tmp > end) { printk(KERN_ERR "property parse failed in %s at line %d\n", @@ -95588,11 +94918,9 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/pseries/reconfig.c return NULL; } tmp++; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/pseries/scanlog.c ++++ b/arch/powerpc/platforms/pseries/scanlog.c +@@ -195,31 +195,30 @@ static int __init scanlog_init(void) { struct proc_dir_entry *ent; @@ -95642,10 +94970,8 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/pseries/scanlog.c } static void __exit scanlog_cleanup(void) -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/platforms/pseries/setup.c ++++ b/arch/powerpc/platforms/pseries/setup.c @@ -76,9 +76,6 @@ #define DBG(fmt...) #endif @@ -95656,7 +94982,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/pseries/setup.c int fwnmi_active; /* TRUE if an FWNMI handler is present */ static void pseries_shared_idle_sleep(void); -@@ -127,14 +124,60 @@ void pseries_8259_cascade(unsigned int i +@@ -127,14 +124,60 @@ desc->chip->eoi(irq); } @@ -95721,7 +95047,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/pseries/setup.c int naddr, n, i, opplen; struct mpic *mpic; -@@ -167,43 +210,13 @@ static void __init pseries_mpic_init_IRQ +@@ -167,43 +210,13 @@ mpic_init(mpic); /* Look for cascade */ @@ -95771,7 +95097,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/pseries/setup.c } static void pseries_lpar_enable_pmcs(void) -@@ -235,7 +248,7 @@ static void __init pseries_discover_pic( +@@ -235,7 +248,7 @@ smp_init_pseries_mpic(); return; } else if (strstr(typep, "ppc-xicp")) { @@ -95780,7 +95106,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/pseries/setup.c setup_kexec_cpu_down_xics(); smp_init_pseries_xics(); return; -@@ -393,6 +406,7 @@ static void pseries_dedicated_idle_sleep +@@ -393,6 +406,7 @@ { unsigned int cpu = smp_processor_id(); unsigned long start_snooze; @@ -95788,7 +95114,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/pseries/setup.c /* * Indicate to the HV that we are idle. Now would be -@@ -400,6 +414,7 @@ static void pseries_dedicated_idle_sleep +@@ -400,6 +414,7 @@ */ get_lppaca()->idle = 1; get_lppaca()->donate_dedicated_cpu = 1; @@ -95796,7 +95122,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/pseries/setup.c /* * We come in with interrupts disabled, and need_resched() -@@ -432,6 +447,8 @@ static void pseries_dedicated_idle_sleep +@@ -432,6 +447,8 @@ out: HMT_medium(); @@ -95805,11 +95131,9 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/pseries/setup.c get_lppaca()->donate_dedicated_cpu = 0; get_lppaca()->idle = 0; } -Index: linux-2.6.25.4/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 = { +--- a/arch/powerpc/platforms/pseries/xics.c ++++ b/arch/powerpc/platforms/pseries/xics.c +@@ -516,6 +516,8 @@ .set_affinity = xics_set_affinity }; @@ -95818,7 +95142,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/pseries/xics.c static int xics_host_match(struct irq_host *h, struct device_node *node) { -@@ -526,23 +528,13 @@ static int xics_host_match(struct irq_ho +@@ -526,23 +528,13 @@ return !of_device_is_compatible(node, "chrp,iic"); } @@ -95846,7 +95170,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/pseries/xics.c return 0; } -@@ -561,27 +553,20 @@ static int xics_host_xlate(struct irq_ho +@@ -561,27 +553,20 @@ return 0; } @@ -95880,7 +95204,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/pseries/xics.c XICS_IRQ_SPURIOUS); BUG_ON(xics_host == NULL); irq_set_default_host(xics_host); -@@ -655,52 +640,6 @@ static void __init xics_init_one_node(st +@@ -655,52 +640,6 @@ } } @@ -95933,7 +95257,7 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/pseries/xics.c void __init xics_init_IRQ(void) { struct device_node *np; -@@ -733,8 +672,6 @@ void __init xics_init_IRQ(void) +@@ -733,8 +672,6 @@ xics_setup_cpu(); @@ -95942,11 +95266,9 @@ Index: linux-2.6.25.4/arch/powerpc/platforms/pseries/xics.c ppc64_boot_msg(0x21, "XICS Done"); } -Index: linux-2.6.25.4/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 { +--- a/arch/powerpc/platforms/pseries/xics.h ++++ b/arch/powerpc/platforms/pseries/xics.h +@@ -28,7 +28,4 @@ extern struct xics_ipi_struct xics_ipi_message[NR_CPUS] __cacheline_aligned; @@ -95954,11 +95276,9 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/sysdev/Makefile ++++ b/arch/powerpc/sysdev/Makefile +@@ -12,6 +12,7 @@ obj-$(CONFIG_MMIO_NVRAM) += mmio_nvram.o obj-$(CONFIG_FSL_SOC) += fsl_soc.o obj-$(CONFIG_FSL_PCI) += fsl_pci.o @@ -95966,7 +95286,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/Makefile obj-$(CONFIG_RAPIDIO) += fsl_rio.o obj-$(CONFIG_TSI108_BRIDGE) += tsi108_pci.o tsi108_dev.o obj-$(CONFIG_QUICC_ENGINE) += qe_lib/ -@@ -27,6 +28,7 @@ obj-$(CONFIG_PPC_INDIRECT_PCI) += indire +@@ -27,6 +28,7 @@ obj-$(CONFIG_PPC_I8259) += i8259.o obj-$(CONFIG_IPIC) += ipic.o obj-$(CONFIG_4xx) += uic.o @@ -95974,10 +95294,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/sysdev/cpm1.c ++++ b/arch/powerpc/sysdev/cpm1.c @@ -44,9 +44,6 @@ #define CPM_MAP_SIZE (0x4000) @@ -95988,7 +95306,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/cpm1.c cpm8xx_t __iomem *cpmp; /* Pointer to comm processor space */ immap_t __iomem *mpc8xx_immr; static cpic8xx_t __iomem *cpic_reg; -@@ -229,12 +226,7 @@ void __init cpm_reset(void) +@@ -229,12 +226,7 @@ out_be32(&siu_conf->sc_sdcr, 1); immr_unmap(siu_conf); @@ -96001,7 +95319,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/cpm1.c } static DEFINE_SPINLOCK(cmd_lock); -@@ -257,7 +249,7 @@ int cpm_command(u32 command, u8 opcode) +@@ -257,7 +249,7 @@ if ((in_be16(&cpmp->cp_cpcr) & CPM_CR_FLG) == 0) goto out; @@ -96010,7 +95328,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/cpm1.c ret = -EIO; out: spin_unlock_irqrestore(&cmd_lock, flags); -@@ -293,110 +285,6 @@ cpm_setbrg(uint brg, uint rate) +@@ -293,110 +285,6 @@ CPM_BRG_EN | CPM_BRG_DIV16); } @@ -96121,10 +95439,8 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/cpm1.c struct cpm_ioport16 { __be16 dir, par, odr_sor, dat, intr; __be16 res[3]; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/sysdev/cpm2.c ++++ b/arch/powerpc/sysdev/cpm2.c @@ -46,10 +46,6 @@ #include <sysdev/fsl_soc.h> @@ -96136,7 +95452,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/cpm2.c cpm_cpm2_t __iomem *cpmp; /* Pointer to comm processor space */ /* We allocate this here because it is used almost exclusively for -@@ -71,15 +67,17 @@ void __init cpm2_reset(void) +@@ -71,15 +67,17 @@ /* Reclaim the DP memory for our use. */ @@ -96158,7 +95474,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/cpm2.c } static DEFINE_SPINLOCK(cmd_lock); -@@ -99,7 +97,7 @@ int cpm_command(u32 command, u8 opcode) +@@ -99,7 +97,7 @@ if ((in_be32(&cpmp->cp_cpcr) & CPM_CR_FLG) == 0) goto out; @@ -96167,7 +95483,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/cpm2.c ret = -EIO; out: spin_unlock_irqrestore(&cmd_lock, flags); -@@ -347,95 +345,6 @@ int cpm2_smc_clk_setup(enum cpm_clk_targ +@@ -347,95 +345,6 @@ return ret; } @@ -96263,11 +95579,9 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/cpm2.c struct cpm2_ioports { u32 dir, par, sor, odr, dat; u32 res[3]; -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/sysdev/cpm_common.c ++++ b/arch/powerpc/sysdev/cpm_common.c +@@ -58,7 +58,6 @@ } #endif @@ -96275,16 +95589,14 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/cpm_common.c static spinlock_t cpm_muram_lock; static rh_block_t cpm_boot_muram_rh_block[16]; static rh_info_t cpm_muram_info; -@@ -199,5 +198,3 @@ dma_addr_t cpm_muram_dma(void __iomem *a +@@ -199,5 +198,3 @@ return muram_pbase + ((u8 __iomem *)addr - muram_vbase); } EXPORT_SYMBOL(cpm_muram_dma); - -#endif /* CONFIG_PPC_CPM_NEW_BINDING */ -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/sysdev/dart_iommu.c ++++ b/arch/powerpc/sysdev/dart_iommu.c @@ -37,6 +37,7 @@ #include <linux/dma-mapping.h> #include <linux/vmalloc.h> @@ -96301,10 +95613,8 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/dart_iommu.c #include <asm/ppc-pci.h> #include "dart.h" -Index: linux-2.6.25.4/arch/powerpc/sysdev/fsl_lbc.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/sysdev/fsl_lbc.c ++++ b/arch/powerpc/sysdev/fsl_lbc.c @@ -0,0 +1,129 @@ +/* + * Freescale LBC and UPM routines. @@ -96435,11 +95745,9 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/fsl_lbc.c + return 0; +} +EXPORT_SYMBOL(fsl_upm_find); -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/sysdev/fsl_soc.c ++++ b/arch/powerpc/sysdev/fsl_soc.c +@@ -75,6 +75,33 @@ EXPORT_SYMBOL(get_immrbase); @@ -96473,7 +95781,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/fsl_soc.c #if defined(CONFIG_CPM2) || defined(CONFIG_QUICC_ENGINE) || defined(CONFIG_8xx) static u32 brgfreq = -1; -@@ -516,9 +543,9 @@ arch_initcall(fsl_i2c_of_init); +@@ -516,9 +543,9 @@ static int __init mpc83xx_wdt_init(void) { struct resource r; @@ -96485,7 +95793,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/fsl_soc.c int ret; np = of_find_compatible_node(NULL, "watchdog", "mpc83xx_wdt"); -@@ -528,19 +555,6 @@ static int __init mpc83xx_wdt_init(void) +@@ -528,19 +555,6 @@ goto nodev; } @@ -96505,7 +95813,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/fsl_soc.c memset(&r, 0, sizeof(r)); ret = of_address_to_resource(np, 0, &r); -@@ -553,20 +567,16 @@ static int __init mpc83xx_wdt_init(void) +@@ -553,20 +567,16 @@ goto err; } @@ -96527,7 +95835,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/fsl_soc.c of_node_put(np); nodev: return ret; -@@ -735,547 +745,6 @@ err: +@@ -735,547 +745,6 @@ arch_initcall(fsl_usb_of_init); @@ -97075,7 +96383,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/fsl_soc.c static int __init of_fsl_spi_probe(char *type, char *compatible, u32 sysclk, struct spi_board_info *board_infos, unsigned int num_board_infos, -@@ -1371,25 +840,9 @@ int __init fsl_spi_init(struct spi_board +@@ -1371,25 +840,9 @@ sysclk = get_brgfreq(); #endif if (sysclk == -1) { @@ -97103,10 +96411,8 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/fsl_soc.c } ret = of_fsl_spi_probe(NULL, "fsl,spi", sysclk, board_infos, -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/sysdev/fsl_soc.h ++++ b/arch/powerpc/sysdev/fsl_soc.h @@ -7,6 +7,7 @@ extern phys_addr_t get_immrbase(void); extern u32 get_brgfreq(void); @@ -97115,11 +96421,9 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/fsl_soc.h struct spi_board_info; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/sysdev/mpic.c ++++ b/arch/powerpc/sysdev/mpic.c +@@ -175,13 +175,16 @@ switch(type) { #ifdef CONFIG_PPC_DCR case mpic_access_dcr: @@ -97139,7 +96443,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/mpic.c } } -@@ -1000,7 +1003,7 @@ struct mpic * __init mpic_alloc(struct d +@@ -1000,7 +1003,7 @@ const char *name) { struct mpic *mpic; @@ -97148,7 +96452,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/mpic.c const char *vers; int i; int intvec_top; -@@ -1064,7 +1067,8 @@ struct mpic * __init mpic_alloc(struct d +@@ -1064,7 +1067,8 @@ /* Look for protected sources */ if (node) { @@ -97158,7 +96462,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/mpic.c const u32 *psrc = of_get_property(node, "protected-sources", &psize); if (psrc) { -@@ -1107,8 +1111,7 @@ struct mpic * __init mpic_alloc(struct d +@@ -1107,8 +1111,7 @@ * in, try to obtain one */ if (paddr == 0 && !(mpic->flags & MPIC_USES_DCR)) { @@ -97168,7 +96472,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/mpic.c BUG_ON(reg == NULL); paddr = of_translate_address(node, reg); BUG_ON(paddr == OF_BAD_ADDR); -@@ -1137,12 +1140,13 @@ struct mpic * __init mpic_alloc(struct d +@@ -1137,12 +1140,13 @@ * MPICs, num sources as well. On ISU MPICs, sources are counted * as ISUs are added */ @@ -97186,7 +96490,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/mpic.c /* Map the per-CPU registers */ for (i = 0; i < mpic->num_cpus; i++) { -@@ -1161,7 +1165,7 @@ struct mpic * __init mpic_alloc(struct d +@@ -1161,7 +1165,7 @@ mpic->isu_mask = (1 << mpic->isu_shift) - 1; /* Display version */ @@ -97195,7 +96499,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/mpic.c case 1: vers = "1.0"; break; -@@ -1321,7 +1325,7 @@ void __init mpic_set_serial_int(struct m +@@ -1321,7 +1325,7 @@ void mpic_irq_set_priority(unsigned int irq, unsigned int pri) { @@ -97204,7 +96508,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/mpic.c struct mpic *mpic = mpic_find(irq, &is_ipi); unsigned int src = mpic_irq_to_hw(irq); unsigned long flags; -@@ -1344,7 +1348,7 @@ void mpic_irq_set_priority(unsigned int +@@ -1344,7 +1348,7 @@ unsigned int mpic_irq_get_priority(unsigned int irq) { @@ -97213,7 +96517,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/mpic.c struct mpic *mpic = mpic_find(irq, &is_ipi); unsigned int src = mpic_irq_to_hw(irq); unsigned long flags; -@@ -1406,11 +1410,6 @@ void mpic_cpu_set_priority(int prio) +@@ -1406,11 +1410,6 @@ mpic_cpu_write(MPIC_INFO(CPU_CURRENT_TASK_PRI), prio); } @@ -97225,7 +96529,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/mpic.c void mpic_teardown_this_cpu(int secondary) { struct mpic *mpic = mpic_primary; -@@ -1430,6 +1429,10 @@ void mpic_teardown_this_cpu(int secondar +@@ -1430,6 +1429,10 @@ /* Set current processor priority to max */ mpic_cpu_write(MPIC_INFO(CPU_CURRENT_TASK_PRI), 0xf); @@ -97236,11 +96540,9 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/mpic.c spin_unlock_irqrestore(&mpic_lock, flags); } -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/sysdev/mv64x60_dev.c ++++ b/arch/powerpc/sysdev/mv64x60_dev.c +@@ -127,7 +127,7 @@ if (err) return err; @@ -97249,7 +96551,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/mv64x60_dev.c if (!prop) return -ENODEV; port_number = *(int *)prop; -@@ -136,6 +136,7 @@ static int __init mv64x60_mpsc_device_se +@@ -136,6 +136,7 @@ pdata.cache_mgmt = 1; /* All current revs need this set */ @@ -97257,7 +96559,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/mv64x60_dev.c prop = of_get_property(np, "max_idle", NULL); if (prop) pdata.max_idle = *prop; -@@ -205,30 +206,24 @@ error: +@@ -205,30 +206,24 @@ /* * Create mv64x60_eth platform devices */ @@ -97295,7 +96597,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/mv64x60_dev.c { struct resource r[1]; struct mv643xx_eth_platform_data pdata; -@@ -239,16 +234,12 @@ static int __init mv64x60_eth_device_set +@@ -239,16 +234,12 @@ const phandle *ph; int err; @@ -97313,7 +96615,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/mv64x60_dev.c if (!prop) return -ENODEV; pdata.port_number = *prop; -@@ -301,7 +292,7 @@ static int __init mv64x60_eth_device_set +@@ -301,7 +292,7 @@ of_node_put(phy); @@ -97322,7 +96624,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/mv64x60_dev.c if (!pdev) return -ENOMEM; -@@ -345,21 +336,19 @@ static int __init mv64x60_i2c_device_set +@@ -345,21 +336,19 @@ memset(&pdata, 0, sizeof(pdata)); @@ -97347,7 +96649,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/mv64x60_dev.c pdev = platform_device_alloc(MV64XXX_I2C_CTLR_NAME, id); if (!pdev) -@@ -401,10 +390,7 @@ static int __init mv64x60_wdt_device_set +@@ -401,10 +390,7 @@ memset(&pdata, 0, sizeof(pdata)); @@ -97359,7 +96661,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/mv64x60_dev.c np = of_get_parent(np); if (!np) -@@ -441,27 +427,43 @@ error: +@@ -441,27 +427,43 @@ static int __init mv64x60_device_setup(void) { @@ -97410,7 +96712,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/mv64x60_dev.c if (np) { if ((err = mv64x60_wdt_device_setup(np, id))) goto error; -@@ -489,10 +491,10 @@ static int __init mv64x60_add_mpsc_conso +@@ -489,10 +491,10 @@ if (!np) goto not_mpsc; @@ -97423,11 +96725,9 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/mv64x60_dev.c if (!prop) goto not_mpsc; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/sysdev/mv64x60_pci.c ++++ b/arch/powerpc/sysdev/mv64x60_pci.c +@@ -86,14 +86,14 @@ struct platform_device *pdev; const unsigned int *prop; @@ -97444,7 +96744,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/mv64x60_pci.c if (IS_ERR(pdev)) return PTR_ERR(pdev); -@@ -166,6 +166,6 @@ void __init mv64x60_pci_init(void) +@@ -166,6 +166,6 @@ { struct device_node *np; @@ -97452,11 +96752,9 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/mv64x60_pci.c + for_each_compatible_node(np, "pci", "marvell,mv64360-pci") mv64x60_add_bridge(np); } -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/sysdev/mv64x60_pic.c ++++ b/arch/powerpc/sysdev/mv64x60_pic.c +@@ -238,13 +238,13 @@ const unsigned int *reg; unsigned long flags; @@ -97472,11 +96770,9 @@ Index: linux-2.6.25.4/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.4/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) +--- a/arch/powerpc/sysdev/mv64x60_udbg.c ++++ b/arch/powerpc/sysdev/mv64x60_udbg.c +@@ -85,7 +85,7 @@ if (!stdout) return; @@ -97485,11 +96781,9 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/mv64x60_udbg.c if (np == stdout) break; } -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/sysdev/ppc4xx_pci.c ++++ b/arch/powerpc/sysdev/ppc4xx_pci.c +@@ -527,6 +527,7 @@ * * ibm,plb-pciex-440spe * ibm,plb-pciex-405ex @@ -97497,7 +96791,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/ppc4xx_pci.c * * Anything else will be rejected for now as they are all subtly * different unfortunately. -@@ -645,7 +646,7 @@ static int __init ppc440spe_pciex_core_i +@@ -645,7 +646,7 @@ int time_out = 20; /* Set PLL clock receiver to LVPECL */ @@ -97506,7 +96800,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/ppc4xx_pci.c /* Shouldn't we do all the calibration stuff etc... here ? */ if (ppc440spe_pciex_check_reset(np)) -@@ -659,8 +660,7 @@ static int __init ppc440spe_pciex_core_i +@@ -659,8 +660,7 @@ } /* De-assert reset of PCIe PLL, wait for lock */ @@ -97516,7 +96810,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/ppc4xx_pci.c udelay(3); while (time_out) { -@@ -712,9 +712,8 @@ static int ppc440spe_pciex_init_port_hw( +@@ -712,9 +712,8 @@ mtdcri(SDR0, port->sdr_base + PESDRn_440SPE_HSSL7SET1, 0x35000000); } @@ -97528,7 +96822,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/ppc4xx_pci.c return 0; } -@@ -775,6 +774,115 @@ static struct ppc4xx_pciex_hwops ppc440s +@@ -775,6 +774,115 @@ .setup_utl = ppc440speB_pciex_init_utl, }; @@ -97644,7 +96938,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/ppc4xx_pci.c #endif /* CONFIG_44x */ #ifdef CONFIG_40x -@@ -830,17 +938,9 @@ static int ppc405ex_pciex_init_port_hw(s +@@ -830,17 +938,9 @@ * PCIe boards don't show this problem. * This has to be re-tested and fixed in a later release! */ @@ -97662,7 +96956,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/ppc4xx_pci.c dcr_write(port->dcrs, DCRO_PEGPL_CFG, 0x10000000); /* guarded on */ -@@ -896,6 +996,8 @@ static int __init ppc4xx_pciex_check_cor +@@ -896,6 +996,8 @@ else ppc4xx_pciex_hwops = &ppc440speB_pcie_hwops; } @@ -97671,7 +96965,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/ppc4xx_pci.c #endif /* CONFIG_44x */ #ifdef CONFIG_40x if (of_device_is_compatible(np, "ibm,plb-pciex-405ex")) -@@ -1042,8 +1144,7 @@ static int __init ppc4xx_pciex_port_init +@@ -1042,8 +1144,7 @@ port->link = 0; } @@ -97681,10 +96975,8 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/ppc4xx_pci.c msleep(100); return 0; -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/sysdev/ppc4xx_pci.h ++++ b/arch/powerpc/sysdev/ppc4xx_pci.h @@ -271,6 +271,59 @@ #define PESDR1_405EX_PHYSTA 0x044C @@ -97758,10 +97050,8 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/ppc4xx_pci.h enum { -Index: linux-2.6.25.4/arch/powerpc/sysdev/ppc4xx_soc.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/powerpc/sysdev/ppc4xx_soc.c ++++ b/arch/powerpc/sysdev/ppc4xx_soc.c @@ -0,0 +1,200 @@ +/* + * IBM/AMCC PPC4xx SoC setup code @@ -97963,11 +97253,9 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/ppc4xx_soc.c + while (1) + ; /* Just in case the reset doesn't work */ +} -Index: linux-2.6.25.4/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 { +--- a/arch/powerpc/sysdev/qe_lib/qe.c ++++ b/arch/powerpc/sysdev/qe_lib/qe.c +@@ -55,7 +55,7 @@ /* We allocate this here because it is used almost exclusively for * the communication processor devices. */ @@ -97976,7 +97264,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/qe_lib/qe.c EXPORT_SYMBOL(qe_immr); static struct qe_snum snums[QE_NUM_OF_SNUM]; /* Dynamically allocated SNUMs */ -@@ -156,7 +156,7 @@ EXPORT_SYMBOL(qe_issue_cmd); +@@ -156,7 +156,7 @@ */ static unsigned int brg_clk = 0; @@ -97985,7 +97273,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/qe_lib/qe.c { struct device_node *qe; unsigned int size; -@@ -180,6 +180,7 @@ unsigned int get_brg_clk(void) +@@ -180,6 +180,7 @@ return brg_clk; } @@ -97993,7 +97281,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/qe_lib/qe.c /* Program the BRG to the given sampling rate and multiplier * -@@ -197,7 +198,7 @@ int qe_setbrg(enum qe_clock brg, unsigne +@@ -197,7 +198,7 @@ if ((brg < QE_BRG1) || (brg > QE_BRG16)) return -EINVAL; @@ -98002,7 +97290,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/qe_lib/qe.c if (divisor > QE_BRGC_DIVISOR_MAX + 1) { div16 = QE_BRGC_DIV16; -@@ -415,12 +416,6 @@ void qe_muram_dump(void) +@@ -415,12 +416,6 @@ } EXPORT_SYMBOL(qe_muram_dump); @@ -98015,10 +97303,8 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/qe_lib/qe.c /* The maximum number of RISCs we support */ #define MAX_QE_RISC 2 -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/sysdev/qe_lib/qe_io.c ++++ b/arch/powerpc/sysdev/qe_lib/qe_io.c @@ -22,6 +22,7 @@ #include <linux/ioport.h> @@ -98027,7 +97313,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/qe_lib/qe_io.c #include <asm/prom.h> #include <sysdev/fsl_soc.h> -@@ -41,7 +42,7 @@ struct port_regs { +@@ -41,7 +42,7 @@ #endif }; @@ -98036,7 +97322,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/qe_lib/qe_io.c static int num_par_io_ports = 0; int par_io_init(struct device_node *np) -@@ -165,7 +166,7 @@ int par_io_of_config(struct device_node +@@ -165,7 +166,7 @@ } ph = of_get_property(np, "pio-handle", NULL); @@ -98045,7 +97331,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/qe_lib/qe_io.c printk(KERN_ERR "pio-handle not available \n"); return -1; } -@@ -200,7 +201,7 @@ static void dump_par_io(void) +@@ -200,7 +201,7 @@ { unsigned int i; @@ -98054,11 +97340,9 @@ Index: linux-2.6.25.4/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.4/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 * +--- a/arch/powerpc/sysdev/qe_lib/ucc_fast.c ++++ b/arch/powerpc/sysdev/qe_lib/ucc_fast.c +@@ -148,57 +148,57 @@ /* check if the UCC port number is in range. */ if ((uf_info->ucc_num < 0) || (uf_info->ucc_num > UCC_MAX_NUM - 1)) { @@ -98126,7 +97410,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/qe_lib/ucc_fast.c return -ENOMEM; } -@@ -207,7 +207,7 @@ int ucc_fast_init(struct ucc_fast_info * +@@ -207,7 +207,7 @@ /* Set the PHY base address */ uccf->uf_regs = ioremap(uf_info->regs, sizeof(struct ucc_fast)); if (uccf->uf_regs == NULL) { @@ -98135,7 +97419,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/qe_lib/ucc_fast.c return -ENOMEM; } -@@ -230,7 +230,7 @@ int ucc_fast_init(struct ucc_fast_info * +@@ -230,7 +230,7 @@ /* Set UCC to fast type */ ret = ucc_set_type(uf_info->ucc_num, UCC_SPEED_TYPE_FAST); if (ret) { @@ -98144,7 +97428,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/qe_lib/ucc_fast.c ucc_fast_free(uccf); return ret; } -@@ -270,7 +270,7 @@ int ucc_fast_init(struct ucc_fast_info * +@@ -270,7 +270,7 @@ qe_muram_alloc(uf_info->utfs, UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT); if (IS_ERR_VALUE(uccf->ucc_fast_tx_virtual_fifo_base_offset)) { printk(KERN_ERR "%s: cannot allocate MURAM for TX FIFO\n", @@ -98153,7 +97437,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/qe_lib/ucc_fast.c uccf->ucc_fast_tx_virtual_fifo_base_offset = 0; ucc_fast_free(uccf); return -ENOMEM; -@@ -283,7 +283,7 @@ int ucc_fast_init(struct ucc_fast_info * +@@ -283,7 +283,7 @@ UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT); if (IS_ERR_VALUE(uccf->ucc_fast_rx_virtual_fifo_base_offset)) { printk(KERN_ERR "%s: cannot allocate MURAM for RX FIFO\n", @@ -98162,7 +97446,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/qe_lib/ucc_fast.c uccf->ucc_fast_rx_virtual_fifo_base_offset = 0; ucc_fast_free(uccf); return -ENOMEM; -@@ -314,7 +314,7 @@ int ucc_fast_init(struct ucc_fast_info * +@@ -314,7 +314,7 @@ ucc_set_qe_mux_rxtx(uf_info->ucc_num, uf_info->rx_clock, COMM_DIR_RX)) { printk(KERN_ERR "%s: illegal value for RX clock\n", @@ -98171,7 +97455,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/qe_lib/ucc_fast.c ucc_fast_free(uccf); return -EINVAL; } -@@ -323,7 +323,7 @@ int ucc_fast_init(struct ucc_fast_info * +@@ -323,7 +323,7 @@ ucc_set_qe_mux_rxtx(uf_info->ucc_num, uf_info->tx_clock, COMM_DIR_TX)) { printk(KERN_ERR "%s: illegal value for TX clock\n", @@ -98180,11 +97464,9 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/qe_lib/ucc_fast.c ucc_fast_free(uccf); return -EINVAL; } -Index: linux-2.6.25.4/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 * +--- a/arch/powerpc/sysdev/qe_lib/ucc_slow.c ++++ b/arch/powerpc/sysdev/qe_lib/ucc_slow.c +@@ -142,7 +142,7 @@ /* check if the UCC port number is in range. */ if ((us_info->ucc_num < 0) || (us_info->ucc_num > UCC_MAX_NUM - 1)) { @@ -98193,7 +97475,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/qe_lib/ucc_slow.c return -EINVAL; } -@@ -161,7 +161,7 @@ int ucc_slow_init(struct ucc_slow_info * +@@ -161,7 +161,7 @@ uccs = kzalloc(sizeof(struct ucc_slow_private), GFP_KERNEL); if (!uccs) { printk(KERN_ERR "%s: Cannot allocate private data\n", @@ -98202,7 +97484,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/qe_lib/ucc_slow.c return -ENOMEM; } -@@ -170,7 +170,7 @@ int ucc_slow_init(struct ucc_slow_info * +@@ -170,7 +170,7 @@ /* Set the PHY base address */ uccs->us_regs = ioremap(us_info->regs, sizeof(struct ucc_slow)); if (uccs->us_regs == NULL) { @@ -98211,7 +97493,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/qe_lib/ucc_slow.c return -ENOMEM; } -@@ -189,7 +189,7 @@ int ucc_slow_init(struct ucc_slow_info * +@@ -189,7 +189,7 @@ uccs->us_pram_offset = qe_muram_alloc(UCC_SLOW_PRAM_SIZE, ALIGNMENT_OF_UCC_SLOW_PRAM); if (IS_ERR_VALUE(uccs->us_pram_offset)) { @@ -98220,7 +97502,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/qe_lib/ucc_slow.c ucc_slow_free(uccs); return -ENOMEM; } -@@ -202,7 +202,7 @@ int ucc_slow_init(struct ucc_slow_info * +@@ -202,7 +202,7 @@ /* Set UCC to slow type */ ret = ucc_set_type(us_info->ucc_num, UCC_SPEED_TYPE_SLOW); if (ret) { @@ -98229,7 +97511,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/qe_lib/ucc_slow.c ucc_slow_free(uccs); return ret; } -@@ -216,7 +216,7 @@ int ucc_slow_init(struct ucc_slow_info * +@@ -216,7 +216,7 @@ qe_muram_alloc(us_info->rx_bd_ring_len * sizeof(struct qe_bd), QE_ALIGNMENT_OF_BD); if (IS_ERR_VALUE(uccs->rx_base_offset)) { @@ -98238,7 +97520,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/qe_lib/ucc_slow.c us_info->rx_bd_ring_len); uccs->rx_base_offset = 0; ucc_slow_free(uccs); -@@ -227,7 +227,7 @@ int ucc_slow_init(struct ucc_slow_info * +@@ -227,7 +227,7 @@ qe_muram_alloc(us_info->tx_bd_ring_len * sizeof(struct qe_bd), QE_ALIGNMENT_OF_BD); if (IS_ERR_VALUE(uccs->tx_base_offset)) { @@ -98247,7 +97529,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/qe_lib/ucc_slow.c uccs->tx_base_offset = 0; ucc_slow_free(uccs); return -ENOMEM; -@@ -317,7 +317,7 @@ int ucc_slow_init(struct ucc_slow_info * +@@ -317,7 +317,7 @@ if (ucc_set_qe_mux_rxtx(us_info->ucc_num, us_info->rx_clock, COMM_DIR_RX)) { printk(KERN_ERR "%s: illegal value for RX clock\n", @@ -98256,7 +97538,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/qe_lib/ucc_slow.c ucc_slow_free(uccs); return -EINVAL; } -@@ -325,7 +325,7 @@ int ucc_slow_init(struct ucc_slow_info * +@@ -325,7 +325,7 @@ if (ucc_set_qe_mux_rxtx(us_info->ucc_num, us_info->tx_clock, COMM_DIR_TX)) { printk(KERN_ERR "%s: illegal value for TX clock\n", @@ -98265,21 +97547,17 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/qe_lib/ucc_slow.c ucc_slow_free(uccs); return -EINVAL; } -Index: linux-2.6.25.4/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) +--- a/arch/powerpc/sysdev/rtc_cmos_setup.c ++++ b/arch/powerpc/sysdev/rtc_cmos_setup.c +@@ -56,3 +56,5 @@ return 0; } fs_initcall(add_rtc); + +MODULE_LICENSE("GPL"); -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/sysdev/tsi108_dev.c ++++ b/arch/powerpc/sysdev/tsi108_dev.c +@@ -84,7 +84,7 @@ ret = of_address_to_resource(np, 0, &r[0]); DBG("%s: name:start->end = %s:0x%lx-> 0x%lx\n", @@ -98288,7 +97566,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/tsi108_dev.c if (ret) goto err; -@@ -93,7 +93,7 @@ static int __init tsi108_eth_of_init(voi +@@ -93,7 +93,7 @@ r[1].end = irq_of_parse_and_map(np, 0); r[1].flags = IORESOURCE_IRQ; DBG("%s: name:start->end = %s:0x%lx-> 0x%lx\n", @@ -98297,11 +97575,9 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/tsi108_dev.c tsi_eth_dev = platform_device_register_simple("tsi-ethernet", i++, &r[0], -Index: linux-2.6.25.4/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 +--- a/arch/powerpc/sysdev/tsi108_pci.c ++++ b/arch/powerpc/sysdev/tsi108_pci.c +@@ -207,7 +207,7 @@ /* PCI Config mapping */ tsi108_pci_cfg_base = (u32)ioremap(cfg_phys, TSI108_PCI_CFG_SIZE); tsi108_pci_cfg_phys = cfg_phys; @@ -98310,7 +97586,7 @@ Index: linux-2.6.25.4/arch/powerpc/sysdev/tsi108_pci.c tsi108_pci_cfg_base); /* Fetch host bridge registers address */ -@@ -395,7 +395,7 @@ static int pci_irq_host_xlate(struct irq +@@ -395,7 +395,7 @@ static int pci_irq_host_map(struct irq_host *h, unsigned int virq, irq_hw_number_t hw) { unsigned int irq; @@ -98319,10 +97595,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/arch/powerpc/xmon/xmon.c ++++ b/arch/powerpc/xmon/xmon.c @@ -45,7 +45,6 @@ #ifdef CONFIG_PPC64 #include <asm/hvcall.h> @@ -98331,7 +97605,7 @@ Index: linux-2.6.25.4/arch/powerpc/xmon/xmon.c #endif #include "nonstdio.h" -@@ -1244,15 +1243,12 @@ static void get_function_bounds(unsigned +@@ -1244,15 +1243,12 @@ static int xmon_depth_to_print = 64; @@ -98351,7 +97625,7 @@ Index: linux-2.6.25.4/arch/powerpc/xmon/xmon.c #define REGS_OFFSET 16 #endif -@@ -1318,7 +1314,7 @@ static void xmon_show_stack(unsigned lon +@@ -1318,7 +1314,7 @@ /* Look for "regshere" marker to see if this is an exception frame. */ if (mread(sp + MARKER_OFFSET, &marker, sizeof(unsigned long)) @@ -98360,7 +97634,7 @@ Index: linux-2.6.25.4/arch/powerpc/xmon/xmon.c if (mread(sp + REGS_OFFSET, ®s, sizeof(regs)) != sizeof(regs)) { printf("Couldn't read registers at %lx\n", -@@ -1598,7 +1594,6 @@ void super_regs(void) +@@ -1598,7 +1594,6 @@ if (firmware_has_feature(FW_FEATURE_ISERIES)) { struct paca_struct *ptrPaca; struct lppaca *ptrLpPaca; @@ -98368,7 +97642,7 @@ Index: linux-2.6.25.4/arch/powerpc/xmon/xmon.c /* Dump out relevant Paca data areas. */ printf("Paca: \n"); -@@ -1611,15 +1606,6 @@ void super_regs(void) +@@ -1611,15 +1606,6 @@ printf(" Saved Gpr3=%.16lx Saved Gpr4=%.16lx \n", ptrLpPaca->saved_gpr3, ptrLpPaca->saved_gpr4); printf(" Saved Gpr5=%.16lx \n", ptrLpPaca->saved_gpr5); @@ -98384,10 +97658,8 @@ Index: linux-2.6.25.4/arch/powerpc/xmon/xmon.c } #endif -Index: linux-2.6.25.4/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 +--- a/arch/ppc/8xx_io/commproc.c ++++ b/arch/ppc/8xx_io/commproc.c @@ -43,7 +43,7 @@ ({ \ u32 offset = offsetof(immap_t, member); \ @@ -98397,11 +97669,9 @@ Index: linux-2.6.25.4/arch/ppc/8xx_io/commproc.c addr; \ }) -Index: linux-2.6.25.4/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 +--- a/arch/ppc/8xx_io/fec.c ++++ b/arch/ppc/8xx_io/fec.c +@@ -520,7 +520,7 @@ #ifdef CONFIG_USE_MDIO fec_enet_mii(dev); #else @@ -98410,7 +97680,7 @@ Index: linux-2.6.25.4/arch/ppc/8xx_io/fec.c #endif /* CONFIG_USE_MDIO */ } -@@ -1441,7 +1441,7 @@ irqreturn_t mii_link_interrupt(int irq, +@@ -1441,7 +1441,7 @@ fecp->fec_ecntrl = ecntrl; /* restore old settings */ } #else @@ -98419,11 +97689,9 @@ Index: linux-2.6.25.4/arch/ppc/8xx_io/fec.c #endif /* CONFIG_USE_MDIO */ #ifndef CONFIG_RPXCLASSIC -Index: linux-2.6.25.4/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: +--- a/arch/ppc/kernel/head.S ++++ b/arch/ppc/kernel/head.S +@@ -701,23 +701,6 @@ b fast_exception_return /* @@ -98447,11 +97715,9 @@ Index: linux-2.6.25.4/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.4/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) +--- a/arch/ppc/mm/init.c ++++ b/arch/ppc/mm/init.c +@@ -109,7 +109,6 @@ printk("Mem-info:\n"); show_free_areas(); @@ -98459,11 +97725,9 @@ Index: linux-2.6.25.4/arch/ppc/mm/init.c i = max_mapnr; while (i-- > 0) { total++; -Index: linux-2.6.25.4/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) +--- a/arch/ppc/platforms/radstone_ppc7d.c ++++ b/arch/ppc/platforms/radstone_ppc7d.c +@@ -512,7 +512,7 @@ { int irq; @@ -98472,7 +97736,7 @@ Index: linux-2.6.25.4/arch/ppc/platforms/radstone_ppc7d.c i8259_init(0, 0); mv64360_init_irq(); -@@ -569,7 +569,7 @@ static int __init ppc7d_map_irq(struct p +@@ -569,7 +569,7 @@ }; const long min_idsel = 10, max_idsel = 14, irqs_per_slot = 4; @@ -98481,7 +97745,7 @@ Index: linux-2.6.25.4/arch/ppc/platforms/radstone_ppc7d.c dev->vendor, dev->device, PCI_FUNC(dev->devfn), idsel, pin); return PCI_IRQ_TABLE_LOOKUP; -@@ -1300,7 +1300,7 @@ static void ppc7d_init2(void) +@@ -1300,7 +1300,7 @@ u32 data; u8 data8; @@ -98490,7 +97754,7 @@ Index: linux-2.6.25.4/arch/ppc/platforms/radstone_ppc7d.c /* Wait for debugger? */ if (ppc7d_wait_debugger) { -@@ -1333,7 +1333,7 @@ static void ppc7d_init2(void) +@@ -1333,7 +1333,7 @@ ppc_md.set_rtc_time = ppc7d_set_rtc_time; ppc_md.get_rtc_time = ppc7d_get_rtc_time; @@ -98499,11 +97763,9 @@ Index: linux-2.6.25.4/arch/ppc/platforms/radstone_ppc7d.c } /* Called from machine_init(), early, before any of the __init functions -Index: linux-2.6.25.4/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 +--- a/arch/ppc/syslib/mpc52xx_setup.c ++++ b/arch/ppc/syslib/mpc52xx_setup.c +@@ -279,7 +279,7 @@ int mpc52xx_set_psc_clkdiv(int psc_id, int clkdiv) { @@ -98512,11 +97774,9 @@ Index: linux-2.6.25.4/arch/ppc/syslib/mpc52xx_setup.c struct mpc52xx_cdm __iomem *cdm; unsigned long flags; u16 mclken_div; -Index: linux-2.6.25.4/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 +--- a/arch/sparc64/Kconfig ++++ b/arch/sparc64/Kconfig +@@ -16,6 +16,7 @@ bool default y select HAVE_IDE @@ -98524,11 +97784,9 @@ Index: linux-2.6.25.4/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.4/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"); +--- a/drivers/block/viodasd.c ++++ b/drivers/block/viodasd.c +@@ -69,7 +69,7 @@ enum { PARTITION_SHIFT = 3, MAX_DISKNO = HVMAXARCHITECTEDVIRTUALDISKS, @@ -98537,11 +97795,9 @@ Index: linux-2.6.25.4/drivers/block/viodasd.c }; static DEFINE_SPINLOCK(viodasd_spinlock); -Index: linux-2.6.25.4/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 +--- a/drivers/char/hvc_beat.c ++++ b/drivers/char/hvc_beat.c +@@ -78,8 +78,8 @@ for (rest = cnt; rest > 0; rest -= nlen) { nlen = (rest > 16) ? 16 : rest; memcpy(kb, buf, nlen); @@ -98552,10 +97808,8 @@ Index: linux-2.6.25.4/drivers/char/hvc_beat.c } return cnt; } -Index: linux-2.6.25.4/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 +--- a/drivers/char/xilinx_hwicap/buffer_icap.c ++++ b/drivers/char/xilinx_hwicap/buffer_icap.c @@ -74,7 +74,7 @@ /** @@ -98577,7 +97831,7 @@ Index: linux-2.6.25.4/drivers/char/xilinx_hwicap/buffer_icap.c } /** -@@ -117,20 +117,8 @@ static inline u32 buffer_icap_get_bram(v +@@ -117,20 +117,8 @@ **/ static inline bool buffer_icap_busy(void __iomem *base_address) { @@ -98600,10 +97854,8 @@ Index: linux-2.6.25.4/drivers/char/xilinx_hwicap/buffer_icap.c } /** -Index: linux-2.6.25.4/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 +--- a/drivers/char/xilinx_hwicap/buffer_icap.h ++++ b/drivers/char/xilinx_hwicap/buffer_icap.h @@ -44,8 +44,6 @@ #include <asm/io.h> #include "xilinx_hwicap.h" @@ -98613,7 +97865,7 @@ Index: linux-2.6.25.4/drivers/char/xilinx_hwicap/buffer_icap.h /* Loads a partial bitstream from system memory. */ int buffer_icap_set_configuration(struct hwicap_drvdata *drvdata, u32 *data, u32 Size); -@@ -54,4 +52,7 @@ int buffer_icap_set_configuration(struct +@@ -54,4 +52,7 @@ int buffer_icap_get_configuration(struct hwicap_drvdata *drvdata, u32 *data, u32 Size); @@ -98621,10 +97873,8 @@ Index: linux-2.6.25.4/drivers/char/xilinx_hwicap/buffer_icap.h +void buffer_icap_reset(struct hwicap_drvdata *drvdata); + #endif -Index: linux-2.6.25.4/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 +--- a/drivers/char/xilinx_hwicap/fifo_icap.c ++++ b/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 */ @@ -98639,7 +97889,7 @@ Index: linux-2.6.25.4/drivers/char/xilinx_hwicap/fifo_icap.c #define XHI_WFO_MAX_VACANCY 1024 /* Max Write FIFO Vacancy, in words */ #define XHI_RFO_MAX_OCCUPANCY 256 /* Max Read FIFO Occupancy, in words */ -@@ -152,13 +145,35 @@ static inline void fifo_icap_start_readb +@@ -152,13 +145,35 @@ } /** @@ -98676,11 +97926,9 @@ Index: linux-2.6.25.4/drivers/char/xilinx_hwicap/fifo_icap.c return (status & XHI_SR_DONE_MASK) ? 0 : 1; } -Index: linux-2.6.25.4/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( +--- a/drivers/char/xilinx_hwicap/fifo_icap.h ++++ b/drivers/char/xilinx_hwicap/fifo_icap.h +@@ -56,6 +56,7 @@ u32 *FrameBuffer, u32 NumWords); @@ -98688,10 +97936,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c ++++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c @@ -36,7 +36,7 @@ *****************************************************************************/ @@ -98732,7 +97978,7 @@ Index: linux-2.6.25.4/drivers/char/xilinx_hwicap/xilinx_hwicap.c /* An array, which is set to true when the device is registered. */ static bool probed_devices[HWICAP_DEVICES]; static struct mutex icap_sem; -@@ -250,8 +246,26 @@ static int hwicap_get_configuration_regi +@@ -250,8 +246,26 @@ * Create the data to be written to the ICAP. */ buffer[index++] = XHI_DUMMY_PACKET; @@ -98759,7 +98005,7 @@ Index: linux-2.6.25.4/drivers/char/xilinx_hwicap/xilinx_hwicap.c buffer[index++] = hwicap_type_1_read(reg) | 1; buffer[index++] = XHI_NOOP_PACKET; buffer[index++] = XHI_NOOP_PACKET; -@@ -587,7 +601,7 @@ static int __devinit hwicap_setup(struct +@@ -587,7 +601,7 @@ probed_devices[id] = 1; mutex_unlock(&icap_sem); @@ -98768,7 +98014,7 @@ Index: linux-2.6.25.4/drivers/char/xilinx_hwicap/xilinx_hwicap.c drvdata = kzalloc(sizeof(struct hwicap_drvdata), GFP_KERNEL); if (!drvdata) { -@@ -664,12 +678,14 @@ static int __devinit hwicap_setup(struct +@@ -664,12 +678,14 @@ static struct hwicap_driver_config buffer_icap_config = { .get_configuration = buffer_icap_get_configuration, .set_configuration = buffer_icap_set_configuration, @@ -98783,7 +98029,7 @@ Index: linux-2.6.25.4/drivers/char/xilinx_hwicap/xilinx_hwicap.c .reset = fifo_icap_reset, }; -@@ -690,7 +706,7 @@ static int __devexit hwicap_remove(struc +@@ -690,7 +706,7 @@ dev_set_drvdata(dev, NULL); mutex_lock(&icap_sem); @@ -98792,7 +98038,7 @@ Index: linux-2.6.25.4/drivers/char/xilinx_hwicap/xilinx_hwicap.c mutex_unlock(&icap_sem); return 0; /* success */ } -@@ -830,23 +846,12 @@ static int __init hwicap_module_init(voi +@@ -830,23 +846,12 @@ icap_class = class_create(THIS_MODULE, "xilinx_config"); mutex_init(&icap_sem); @@ -98822,7 +98068,7 @@ Index: linux-2.6.25.4/drivers/char/xilinx_hwicap/xilinx_hwicap.c retval = platform_driver_register(&hwicap_platform_driver); -@@ -871,7 +876,7 @@ static int __init hwicap_module_init(voi +@@ -871,7 +876,7 @@ static void __exit hwicap_module_cleanup(void) { @@ -98831,11 +98077,9 @@ Index: linux-2.6.25.4/drivers/char/xilinx_hwicap/xilinx_hwicap.c class_destroy(icap_class); -Index: linux-2.6.25.4/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 { +--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.h ++++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.h +@@ -65,10 +65,27 @@ }; struct hwicap_driver_config { @@ -98863,7 +98107,7 @@ Index: linux-2.6.25.4/drivers/char/xilinx_hwicap/xilinx_hwicap.h void (*reset)(struct hwicap_drvdata *drvdata); }; -@@ -163,6 +180,13 @@ struct config_registers { +@@ -163,6 +180,13 @@ /* Constant to use for CRC check when CRC has been disabled */ #define XHI_DISABLED_AUTO_CRC 0x0000DEFCUL @@ -98877,10 +98121,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/drivers/mtd/nand/fsl_elbc_nand.c ++++ b/drivers/mtd/nand/fsl_elbc_nand.c @@ -36,207 +36,12 @@ #include <linux/mtd/partitions.h> @@ -99090,7 +98332,7 @@ Index: linux-2.6.25.4/drivers/mtd/nand/fsl_elbc_nand.c struct fsl_elbc_ctrl; /* mtd information per set */ -@@ -261,7 +66,7 @@ struct fsl_elbc_ctrl { +@@ -261,7 +66,7 @@ /* device info */ struct device *dev; @@ -99099,7 +98341,7 @@ Index: linux-2.6.25.4/drivers/mtd/nand/fsl_elbc_nand.c int irq; wait_queue_head_t irq_wait; unsigned int irq_status; /* status read from LTESR by irq handler */ -@@ -322,7 +127,7 @@ static void set_addr(struct mtd_info *mt +@@ -322,7 +127,7 @@ struct nand_chip *chip = mtd->priv; struct fsl_elbc_mtd *priv = chip->priv; struct fsl_elbc_ctrl *ctrl = priv->ctrl; @@ -99108,7 +98350,7 @@ Index: linux-2.6.25.4/drivers/mtd/nand/fsl_elbc_nand.c int buf_num; ctrl->page = page_addr; -@@ -363,7 +168,7 @@ static int fsl_elbc_run_command(struct m +@@ -363,7 +168,7 @@ struct nand_chip *chip = mtd->priv; struct fsl_elbc_mtd *priv = chip->priv; struct fsl_elbc_ctrl *ctrl = priv->ctrl; @@ -99117,7 +98359,7 @@ Index: linux-2.6.25.4/drivers/mtd/nand/fsl_elbc_nand.c /* Setup the FMR[OP] to execute without write protection */ out_be32(&lbc->fmr, priv->fmr | 3); -@@ -406,7 +211,7 @@ static void fsl_elbc_do_read(struct nand +@@ -406,7 +211,7 @@ { struct fsl_elbc_mtd *priv = chip->priv; struct fsl_elbc_ctrl *ctrl = priv->ctrl; @@ -99126,7 +98368,7 @@ Index: linux-2.6.25.4/drivers/mtd/nand/fsl_elbc_nand.c if (priv->page_size) { out_be32(&lbc->fir, -@@ -439,7 +244,7 @@ static void fsl_elbc_cmdfunc(struct mtd_ +@@ -439,7 +244,7 @@ struct nand_chip *chip = mtd->priv; struct fsl_elbc_mtd *priv = chip->priv; struct fsl_elbc_ctrl *ctrl = priv->ctrl; @@ -99135,7 +98377,7 @@ Index: linux-2.6.25.4/drivers/mtd/nand/fsl_elbc_nand.c ctrl->use_mdr = 0; -@@ -775,7 +580,7 @@ static int fsl_elbc_wait(struct mtd_info +@@ -775,7 +580,7 @@ { struct fsl_elbc_mtd *priv = chip->priv; struct fsl_elbc_ctrl *ctrl = priv->ctrl; @@ -99144,7 +98386,7 @@ Index: linux-2.6.25.4/drivers/mtd/nand/fsl_elbc_nand.c if (ctrl->status != LTESR_CC) return NAND_STATUS_FAIL; -@@ -807,7 +612,7 @@ static int fsl_elbc_chip_init_tail(struc +@@ -807,7 +612,7 @@ struct nand_chip *chip = mtd->priv; struct fsl_elbc_mtd *priv = chip->priv; struct fsl_elbc_ctrl *ctrl = priv->ctrl; @@ -99153,7 +98395,7 @@ Index: linux-2.6.25.4/drivers/mtd/nand/fsl_elbc_nand.c unsigned int al; /* calculate FMR Address Length field */ -@@ -922,7 +727,7 @@ static void fsl_elbc_write_page(struct m +@@ -922,7 +727,7 @@ static int fsl_elbc_chip_init(struct fsl_elbc_mtd *priv) { struct fsl_elbc_ctrl *ctrl = priv->ctrl; @@ -99162,7 +98404,7 @@ Index: linux-2.6.25.4/drivers/mtd/nand/fsl_elbc_nand.c struct nand_chip *chip = &priv->chip; dev_dbg(priv->dev, "eLBC Set Information for bank %d\n", priv->bank); -@@ -986,7 +791,7 @@ static int fsl_elbc_chip_remove(struct f +@@ -986,7 +791,7 @@ static int fsl_elbc_chip_probe(struct fsl_elbc_ctrl *ctrl, struct device_node *node) { @@ -99171,7 +98413,7 @@ Index: linux-2.6.25.4/drivers/mtd/nand/fsl_elbc_nand.c struct fsl_elbc_mtd *priv; struct resource res; #ifdef CONFIG_MTD_PARTITIONS -@@ -1083,7 +888,7 @@ err: +@@ -1083,7 +888,7 @@ static int __devinit fsl_elbc_ctrl_init(struct fsl_elbc_ctrl *ctrl) { @@ -99180,7 +98422,7 @@ Index: linux-2.6.25.4/drivers/mtd/nand/fsl_elbc_nand.c /* clear event registers */ setbits32(&lbc->ltesr, LTESR_NAND_MASK); -@@ -1128,7 +933,7 @@ static int __devexit fsl_elbc_ctrl_remov +@@ -1128,7 +933,7 @@ static irqreturn_t fsl_elbc_ctrl_irq(int irqno, void *data) { struct fsl_elbc_ctrl *ctrl = data; @@ -99189,11 +98431,9 @@ Index: linux-2.6.25.4/drivers/mtd/nand/fsl_elbc_nand.c __be32 status = in_be32(&lbc->ltesr) & LTESR_NAND_MASK; if (status) { -Index: linux-2.6.25.4/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 +--- a/drivers/net/Makefile ++++ b/drivers/net/Makefile +@@ -219,7 +219,8 @@ obj-$(CONFIG_BFIN_MAC) += bfin_mac.o obj-$(CONFIG_DM9000) += dm9000.o obj-$(CONFIG_FEC_8XX) += fec_8xx/ @@ -99203,11 +98443,9 @@ Index: linux-2.6.25.4/drivers/net/Makefile obj-$(CONFIG_MLX4_CORE) += mlx4/ obj-$(CONFIG_ENC28J60) += enc28j60.o -Index: linux-2.6.25.4/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 +--- a/drivers/net/iseries_veth.c ++++ b/drivers/net/iseries_veth.c +@@ -308,7 +308,8 @@ static int veth_allocate_events(HvLpIndex rlp, int number) { @@ -99217,10 +98455,8 @@ Index: linux-2.6.25.4/drivers/net/iseries_veth.c mf_allocate_lp_events(rlp, HvLpEvent_Type_VirtualLan, sizeof(struct veth_lpevent), number, -Index: linux-2.6.25.4/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 +--- a/drivers/net/pasemi_mac.c ++++ b/drivers/net/pasemi_mac.c @@ -55,15 +55,10 @@ * - Multiqueue RX/TX */ @@ -99255,7 +98491,7 @@ Index: linux-2.6.25.4/drivers/net/pasemi_mac.c MODULE_LICENSE("GPL"); MODULE_AUTHOR ("Olof Johansson <olof@lixom.net>"); MODULE_DESCRIPTION("PA Semi PWRficient Ethernet driver"); -@@ -94,6 +79,8 @@ static int debug = -1; /* -1 == use DEFA +@@ -94,6 +79,8 @@ module_param(debug, int, 0); MODULE_PARM_DESC(debug, "PA Semi MAC bitmapped debugging message enable value"); @@ -99264,7 +98500,7 @@ Index: linux-2.6.25.4/drivers/net/pasemi_mac.c static int translation_enabled(void) { #if defined(CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE) -@@ -322,6 +309,104 @@ static int pasemi_mac_unmap_tx_skb(struc +@@ -322,6 +309,104 @@ return (nfrags + 3) & ~1; } @@ -99369,7 +98605,7 @@ Index: linux-2.6.25.4/drivers/net/pasemi_mac.c static int pasemi_mac_setup_rx_resources(const struct net_device *dev) { struct pasemi_mac_rxring *ring; -@@ -445,7 +530,7 @@ pasemi_mac_setup_tx_resources(const stru +@@ -445,7 +530,7 @@ cfg = PAS_DMA_TXCHAN_CFG_TY_IFACE | PAS_DMA_TXCHAN_CFG_TATTR(mac->dma_if) | PAS_DMA_TXCHAN_CFG_UP | @@ -99378,7 +98614,7 @@ Index: linux-2.6.25.4/drivers/net/pasemi_mac.c if (translation_enabled()) cfg |= PAS_DMA_TXCHAN_CFG_TRD | PAS_DMA_TXCHAN_CFG_TRR; -@@ -810,13 +895,21 @@ restart: +@@ -810,13 +895,21 @@ u64 mactx = TX_DESC(txring, i); struct sk_buff *skb; @@ -99403,7 +98639,7 @@ Index: linux-2.6.25.4/drivers/net/pasemi_mac.c if (unlikely(mactx & XCT_MACTX_O)) /* Not yet transmitted */ break; -@@ -1041,13 +1134,7 @@ static int pasemi_mac_open(struct net_de +@@ -1041,13 +1134,7 @@ { struct pasemi_mac *mac = netdev_priv(dev); unsigned int flags; @@ -99418,7 +98654,7 @@ Index: linux-2.6.25.4/drivers/net/pasemi_mac.c flags = PAS_MAC_CFG_TXP_FCE | PAS_MAC_CFG_TXP_FPC(3) | PAS_MAC_CFG_TXP_SL(3) | PAS_MAC_CFG_TXP_COB(0xf) | -@@ -1064,6 +1151,19 @@ static int pasemi_mac_open(struct net_de +@@ -1064,6 +1151,19 @@ if (!mac->tx) goto out_tx_ring; @@ -99438,7 +98674,7 @@ Index: linux-2.6.25.4/drivers/net/pasemi_mac.c /* 0x3ff with 33MHz clock is about 31us */ write_iob_reg(PAS_IOB_DMA_COM_TIMEOUTCFG, PAS_IOB_DMA_COM_TIMEOUTCFG_TCNT(0x3ff)); -@@ -1247,7 +1347,7 @@ static int pasemi_mac_close(struct net_d +@@ -1247,7 +1347,7 @@ { struct pasemi_mac *mac = netdev_priv(dev); unsigned int sta; @@ -99447,7 +98683,7 @@ Index: linux-2.6.25.4/drivers/net/pasemi_mac.c rxch = rx_ring(mac)->chan.chno; txch = tx_ring(mac)->chan.chno; -@@ -1292,6 +1392,13 @@ static int pasemi_mac_close(struct net_d +@@ -1292,6 +1392,13 @@ free_irq(mac->tx->chan.irq, mac->tx); free_irq(mac->rx->chan.irq, mac->rx); @@ -99461,7 +98697,7 @@ Index: linux-2.6.25.4/drivers/net/pasemi_mac.c /* Free resources */ pasemi_mac_free_rx_resources(mac); pasemi_mac_free_tx_resources(mac); -@@ -1299,35 +1406,113 @@ static int pasemi_mac_close(struct net_d +@@ -1299,35 +1406,113 @@ return 0; } @@ -99595,7 +98831,7 @@ Index: linux-2.6.25.4/drivers/net/pasemi_mac.c nfrags = skb_shinfo(skb)->nr_frags; -@@ -1350,24 +1535,46 @@ static int pasemi_mac_start_tx(struct sk +@@ -1350,24 +1535,46 @@ } } @@ -99647,7 +98883,7 @@ Index: linux-2.6.25.4/drivers/net/pasemi_mac.c TX_DESC(txring, fill) = mactx; TX_DESC_INFO(txring, fill).dma = nfrags; fill++; -@@ -1441,12 +1648,33 @@ static int pasemi_mac_poll(struct napi_s +@@ -1441,12 +1648,33 @@ return pkts; } @@ -99682,7 +98918,7 @@ Index: linux-2.6.25.4/drivers/net/pasemi_mac.c if (new_mtu < PE_MIN_MTU || new_mtu > PE_MAX_MTU) return -EINVAL; -@@ -1468,6 +1696,16 @@ static int pasemi_mac_change_mtu(struct +@@ -1468,6 +1696,16 @@ pasemi_mac_pause_rxint(mac); pasemi_mac_clean_rx(rx_ring(mac), RX_RING_SIZE); pasemi_mac_free_rx_buffers(mac); @@ -99699,7 +98935,7 @@ Index: linux-2.6.25.4/drivers/net/pasemi_mac.c } /* Change maxf, i.e. what size frames are accepted. -@@ -1482,6 +1720,7 @@ static int pasemi_mac_change_mtu(struct +@@ -1482,6 +1720,7 @@ /* MTU + ETH_HLEN + VLAN_HLEN + 2 64B cachelines */ mac->bufsz = new_mtu + ETH_HLEN + ETH_FCS_LEN + LOCAL_SKB_ALIGN + 128; @@ -99707,7 +98943,7 @@ Index: linux-2.6.25.4/drivers/net/pasemi_mac.c if (running) { write_dma_reg(PAS_DMA_RXINT_RCMDSTA(mac->dma_if), rcmdsta | PAS_DMA_RXINT_RCMDSTA_EN); -@@ -1494,7 +1733,7 @@ static int pasemi_mac_change_mtu(struct +@@ -1494,7 +1733,7 @@ pasemi_mac_intf_enable(mac); } @@ -99716,7 +98952,7 @@ Index: linux-2.6.25.4/drivers/net/pasemi_mac.c } static int __devinit -@@ -1528,7 +1767,7 @@ pasemi_mac_probe(struct pci_dev *pdev, c +@@ -1528,7 +1767,7 @@ netif_napi_add(dev, &mac->napi, pasemi_mac_poll, 64); dev->features = NETIF_F_IP_CSUM | NETIF_F_LLTX | NETIF_F_SG | @@ -99725,7 +98961,7 @@ Index: linux-2.6.25.4/drivers/net/pasemi_mac.c mac->lro_mgr.max_aggr = LRO_MAX_AGGR; mac->lro_mgr.max_desc = MAX_LRO_DESCRIPTORS; -@@ -1588,8 +1827,12 @@ pasemi_mac_probe(struct pci_dev *pdev, c +@@ -1588,8 +1827,12 @@ dev->mtu = PE_DEF_MTU; /* 1500 MTU + ETH_HLEN + VLAN_HLEN + 2 64B cachelines */ mac->bufsz = dev->mtu + ETH_HLEN + ETH_FCS_LEN + LOCAL_SKB_ALIGN + 128; @@ -99738,10 +98974,8 @@ Index: linux-2.6.25.4/drivers/net/pasemi_mac.c if (err) goto out; -Index: linux-2.6.25.4/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 +--- a/drivers/net/pasemi_mac.h ++++ b/drivers/net/pasemi_mac.h @@ -26,7 +26,14 @@ #include <linux/spinlock.h> #include <linux/phy.h> @@ -99757,7 +98991,7 @@ Index: linux-2.6.25.4/drivers/net/pasemi_mac.h struct pasemi_mac_txring { struct pasemi_dmachan chan; /* Must be first */ -@@ -51,6 +58,15 @@ struct pasemi_mac_rxring { +@@ -51,6 +58,15 @@ struct pasemi_mac *mac; /* Needed in intr handler */ }; @@ -99773,7 +99007,7 @@ Index: linux-2.6.25.4/drivers/net/pasemi_mac.h struct pasemi_mac { struct net_device *netdev; struct pci_dev *pdev; -@@ -60,10 +76,12 @@ struct pasemi_mac { +@@ -60,10 +76,12 @@ struct napi_struct napi; int bufsz; /* RX ring buffer size */ @@ -99787,7 +99021,7 @@ Index: linux-2.6.25.4/drivers/net/pasemi_mac.h u8 mac_addr[6]; -@@ -74,6 +92,7 @@ struct pasemi_mac { +@@ -74,6 +92,7 @@ struct pasemi_mac_txring *tx; struct pasemi_mac_rxring *rx; @@ -99795,7 +99029,7 @@ Index: linux-2.6.25.4/drivers/net/pasemi_mac.h char tx_irq_name[10]; /* "eth%d tx" */ char rx_irq_name[10]; /* "eth%d rx" */ int link; -@@ -90,6 +109,16 @@ struct pasemi_mac_buffer { +@@ -90,6 +109,16 @@ dma_addr_t dma; }; @@ -99812,7 +99046,7 @@ Index: linux-2.6.25.4/drivers/net/pasemi_mac.h /* PCI register offsets and formats */ -@@ -101,6 +130,7 @@ enum { +@@ -101,6 +130,7 @@ PAS_MAC_CFG_ADR0 = 0x8c, PAS_MAC_CFG_ADR1 = 0x90, PAS_MAC_CFG_TXP = 0x98, @@ -99820,7 +99054,7 @@ Index: linux-2.6.25.4/drivers/net/pasemi_mac.h PAS_MAC_IPC_CHNL = 0x208, }; -@@ -172,6 +202,8 @@ enum { +@@ -172,6 +202,8 @@ #define PAS_MAC_CFG_TXP_TIFG(x) (((x) << PAS_MAC_CFG_TXP_TIFG_S) & \ PAS_MAC_CFG_TXP_TIFG_M) @@ -99829,16 +99063,14 @@ Index: linux-2.6.25.4/drivers/net/pasemi_mac.h #define PAS_MAC_IPC_CHNL_DCHNO_M 0x003f0000 #define PAS_MAC_IPC_CHNL_DCHNO_S 16 #define PAS_MAC_IPC_CHNL_DCHNO(x) (((x) << PAS_MAC_IPC_CHNL_DCHNO_S) & \ -@@ -181,4 +213,5 @@ enum { +@@ -181,4 +213,5 @@ #define PAS_MAC_IPC_CHNL_BCH(x) (((x) << PAS_MAC_IPC_CHNL_BCH_S) & \ PAS_MAC_IPC_CHNL_BCH_M) + #endif /* PASEMI_MAC_H */ -Index: linux-2.6.25.4/drivers/net/pasemi_mac_ethtool.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/drivers/net/pasemi_mac_ethtool.c ++++ b/drivers/net/pasemi_mac_ethtool.c @@ -0,0 +1,159 @@ +/* + * Copyright (C) 2006-2008 PA Semi, Inc @@ -99999,11 +99231,9 @@ Index: linux-2.6.25.4/drivers/net/pasemi_mac_ethtool.c + .get_ethtool_stats = pasemi_mac_get_ethtool_stats, +}; + -Index: linux-2.6.25.4/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 +--- a/drivers/net/ps3_gelic_net.c ++++ b/drivers/net/ps3_gelic_net.c +@@ -1266,6 +1266,85 @@ return 0; } @@ -100089,7 +99319,7 @@ Index: linux-2.6.25.4/drivers/net/ps3_gelic_net.c static struct ethtool_ops gelic_ether_ethtool_ops = { .get_drvinfo = gelic_net_get_drvinfo, .get_settings = gelic_ether_get_settings, -@@ -1274,6 +1353,8 @@ static struct ethtool_ops gelic_ether_et +@@ -1274,6 +1353,8 @@ .set_tx_csum = ethtool_op_set_tx_csum, .get_rx_csum = gelic_net_get_rx_csum, .set_rx_csum = gelic_net_set_rx_csum, @@ -100098,11 +99328,9 @@ Index: linux-2.6.25.4/drivers/net/ps3_gelic_net.c }; /** -Index: linux-2.6.25.4/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 { +--- a/drivers/net/ps3_gelic_net.h ++++ b/drivers/net/ps3_gelic_net.h +@@ -182,12 +182,32 @@ GELIC_LV1_GET_ETH_PORT_STATUS = 2, GELIC_LV1_SET_NEGOTIATION_MODE = 3, GELIC_LV1_GET_VLAN_ID = 4, @@ -100135,11 +99363,9 @@ Index: linux-2.6.25.4/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.4/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 +--- a/drivers/net/ucc_geth.c ++++ b/drivers/net/ucc_geth.c +@@ -3853,7 +3853,13 @@ ugeth_vdbg("%s: IN", __FUNCTION__); @@ -100154,11 +99380,9 @@ Index: linux-2.6.25.4/drivers/net/ucc_geth.c ucc_num = *prop - 1; if ((ucc_num < 0) || (ucc_num > 7)) return -ENODEV; -Index: linux-2.6.25.4/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 +--- a/drivers/net/ucc_geth_mii.c ++++ b/drivers/net/ucc_geth_mii.c +@@ -203,9 +203,14 @@ if ((res.start >= tempres.start) && (res.end <= tempres.end)) { /* set this UCC to be the MII master */ @@ -100176,10 +99400,8 @@ Index: linux-2.6.25.4/drivers/net/ucc_geth_mii.c ucc_set_qe_mux_mii_mng(*id - 1); -Index: linux-2.6.25.4/drivers/of/Kconfig -=================================================================== ---- linux-2.6.25.4.orig/drivers/of/Kconfig -+++ linux-2.6.25.4/drivers/of/Kconfig +--- a/drivers/of/Kconfig ++++ b/drivers/of/Kconfig @@ -1,3 +1,15 @@ config OF_DEVICE def_bool y @@ -100196,20 +99418,16 @@ Index: linux-2.6.25.4/drivers/of/Kconfig + depends on OF && I2C + help + OpenFirmware I2C accessors -Index: linux-2.6.25.4/drivers/of/Makefile -=================================================================== ---- linux-2.6.25.4.orig/drivers/of/Makefile -+++ linux-2.6.25.4/drivers/of/Makefile +--- a/drivers/of/Makefile ++++ b/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.4/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 +--- a/drivers/of/base.c ++++ b/drivers/of/base.c +@@ -117,6 +117,32 @@ EXPORT_SYMBOL(of_device_is_compatible); /** @@ -100242,10 +99460,8 @@ Index: linux-2.6.25.4/drivers/of/base.c * of_get_parent - Get a node's parent if any * @node: Node to get parent * -Index: linux-2.6.25.4/drivers/of/gpio.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/drivers/of/gpio.c ++++ b/drivers/of/gpio.c @@ -0,0 +1,242 @@ +/* + * OF helpers for the GPIO API @@ -100489,10 +99705,8 @@ Index: linux-2.6.25.4/drivers/of/gpio.c + return ret; +} +EXPORT_SYMBOL(of_mm_gpiochip_add); -Index: linux-2.6.25.4/drivers/of/i2c.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/drivers/of/i2c.c ++++ b/drivers/of/i2c.c @@ -0,0 +1,115 @@ +/* + * OF helpers for the I2C API @@ -100609,10 +99823,8 @@ Index: linux-2.6.25.4/drivers/of/i2c.c + } +} +EXPORT_SYMBOL(of_register_i2c_devices); -Index: linux-2.6.25.4/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 +--- a/drivers/ps3/ps3-sys-manager.c ++++ b/drivers/ps3/ps3-sys-manager.c @@ -24,6 +24,7 @@ #include <linux/reboot.h> @@ -100621,7 +99833,7 @@ Index: linux-2.6.25.4/drivers/ps3/ps3-sys-manager.c #include <asm/ps3.h> #include "vuart.h" -@@ -187,6 +188,7 @@ enum ps3_sys_manager_next_op { +@@ -187,6 +188,7 @@ * controller, and bluetooth controller. * @PS3_SM_WAKE_RTC: * @PS3_SM_WAKE_RTC_ERROR: @@ -100629,7 +99841,7 @@ Index: linux-2.6.25.4/drivers/ps3/ps3-sys-manager.c * @PS3_SM_WAKE_P_O_R: Power on reset. * * Additional wakeup sources when specifying PS3_SM_NEXT_OP_SYS_SHUTDOWN. -@@ -200,10 +202,19 @@ enum ps3_sys_manager_wake_source { +@@ -200,10 +202,19 @@ PS3_SM_WAKE_DEFAULT = 0, PS3_SM_WAKE_RTC = 0x00000040, PS3_SM_WAKE_RTC_ERROR = 0x00000080, @@ -100649,7 +99861,7 @@ Index: linux-2.6.25.4/drivers/ps3/ps3-sys-manager.c * enum ps3_sys_manager_cmd - Command from system manager to guest. * * The guest completes the actions needed, then acks or naks the command via -@@ -581,6 +592,23 @@ fail_id: +@@ -581,6 +592,23 @@ return -EIO; } @@ -100673,7 +99885,7 @@ Index: linux-2.6.25.4/drivers/ps3/ps3-sys-manager.c /** * ps3_sys_manager_final_power_off - The final platform machine_power_off routine. * -@@ -601,13 +629,9 @@ static void ps3_sys_manager_final_power_ +@@ -601,13 +629,9 @@ ps3_vuart_cancel_async(dev); ps3_sys_manager_send_next_op(dev, PS3_SM_NEXT_OP_SYS_SHUTDOWN, @@ -100689,7 +99901,7 @@ Index: linux-2.6.25.4/drivers/ps3/ps3-sys-manager.c } /** -@@ -638,14 +662,42 @@ static void ps3_sys_manager_final_restar +@@ -638,14 +662,42 @@ ps3_sys_manager_send_attr(dev, 0); ps3_sys_manager_send_next_op(dev, PS3_SM_NEXT_OP_SYS_REBOOT, @@ -100737,10 +99949,8 @@ Index: linux-2.6.25.4/drivers/ps3/ps3-sys-manager.c /** * ps3_sys_manager_work - Asynchronous read handler. -Index: linux-2.6.25.4/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 +--- a/drivers/ps3/sys-manager-core.c ++++ b/drivers/ps3/sys-manager-core.c @@ -19,6 +19,7 @@ */ @@ -100749,7 +99959,7 @@ Index: linux-2.6.25.4/drivers/ps3/sys-manager-core.c #include <asm/ps3.h> /** -@@ -50,10 +51,7 @@ void ps3_sys_manager_power_off(void) +@@ -50,10 +51,7 @@ if (ps3_sys_manager_ops.power_off) ps3_sys_manager_ops.power_off(ps3_sys_manager_ops.dev); @@ -100761,7 +99971,7 @@ Index: linux-2.6.25.4/drivers/ps3/sys-manager-core.c } void ps3_sys_manager_restart(void) -@@ -61,8 +59,14 @@ void ps3_sys_manager_restart(void) +@@ -61,8 +59,14 @@ if (ps3_sys_manager_ops.restart) ps3_sys_manager_ops.restart(ps3_sys_manager_ops.dev); @@ -100778,11 +99988,9 @@ Index: linux-2.6.25.4/drivers/ps3/sys-manager-core.c + lv1_pause(1); } + -Index: linux-2.6.25.4/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 +--- a/drivers/serial/cpm_uart/cpm_uart.h ++++ b/drivers/serial/cpm_uart/cpm_uart.h +@@ -92,6 +92,9 @@ /* these are located in their respective files */ void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd); @@ -100792,11 +100000,9 @@ Index: linux-2.6.25.4/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.4/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 +--- a/drivers/serial/cpm_uart/cpm_uart_core.c ++++ b/drivers/serial/cpm_uart/cpm_uart_core.c +@@ -966,24 +966,23 @@ if (!mem) return -ENOMEM; @@ -100829,7 +100035,7 @@ Index: linux-2.6.25.4/drivers/serial/cpm_uart/cpm_uart_core.c } pinfo->tx_nrfifos = TX_NUM_FIFO; -@@ -1007,7 +1006,7 @@ static int cpm_uart_init_port(struct dev +@@ -1007,7 +1006,7 @@ return cpm_uart_request_port(&pinfo->port); out_pram: @@ -100838,10 +100044,8 @@ Index: linux-2.6.25.4/drivers/serial/cpm_uart/cpm_uart_core.c out_mem: iounmap(mem); return ret; -Index: linux-2.6.25.4/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 +--- a/drivers/serial/cpm_uart/cpm_uart_cpm1.c ++++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.c @@ -45,6 +45,8 @@ #include <linux/serial_core.h> #include <linux/kernel.h> @@ -100851,7 +100055,7 @@ Index: linux-2.6.25.4/drivers/serial/cpm_uart/cpm_uart_cpm1.c #include "cpm_uart.h" /**************************************************************/ -@@ -54,6 +56,18 @@ void cpm_line_cr_cmd(struct uart_cpm_por +@@ -54,6 +56,18 @@ { cpm_command(port->command, cmd); } @@ -100870,10 +100074,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c ++++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.c @@ -41,6 +41,9 @@ #include <asm/io.h> #include <asm/irq.h> @@ -100884,7 +100086,7 @@ Index: linux-2.6.25.4/drivers/serial/cpm_uart/cpm_uart_cpm2.c #include <linux/serial_core.h> #include <linux/kernel.h> -@@ -54,6 +57,55 @@ void cpm_line_cr_cmd(struct uart_cpm_por +@@ -54,6 +57,55 @@ { cpm_command(port->command, cmd); } @@ -100940,11 +100142,9 @@ Index: linux-2.6.25.4/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.4/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_ +--- a/drivers/serial/of_serial.c ++++ b/drivers/serial/of_serial.c +@@ -56,7 +56,9 @@ port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP | UPF_FIXED_PORT; port->dev = &ofdev->dev; @@ -100955,11 +100155,9 @@ Index: linux-2.6.25.4/drivers/serial/of_serial.c return 0; } -Index: linux-2.6.25.4/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 +--- a/drivers/serial/ucc_uart.c ++++ b/drivers/serial/ucc_uart.c +@@ -1270,10 +1270,18 @@ /* Get the UCC number (device ID) */ /* UCCs are numbered 1-7 */ @@ -100982,10 +100180,8 @@ Index: linux-2.6.25.4/drivers/serial/ucc_uart.c kfree(qe_port); return -ENODEV; } -Index: linux-2.6.25.4/include/asm-powerpc/Kbuild -=================================================================== ---- linux-2.6.25.4.orig/include/asm-powerpc/Kbuild -+++ linux-2.6.25.4/include/asm-powerpc/Kbuild +--- a/include/asm-powerpc/Kbuild ++++ b/include/asm-powerpc/Kbuild @@ -1,5 +1,6 @@ include include/asm-generic/Kbuild.asm @@ -100993,7 +100189,7 @@ Index: linux-2.6.25.4/include/asm-powerpc/Kbuild header-y += auxvec.h header-y += ioctls.h header-y += mman.h -@@ -23,7 +24,6 @@ header-y += sigcontext.h +@@ -23,7 +24,6 @@ header-y += statfs.h header-y += ps3fb.h @@ -101001,10 +100197,8 @@ Index: linux-2.6.25.4/include/asm-powerpc/Kbuild unifdef-y += asm-compat.h unifdef-y += bootx.h unifdef-y += byteorder.h -Index: linux-2.6.25.4/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 +--- a/include/asm-powerpc/abs_addr.h ++++ b/include/asm-powerpc/abs_addr.h @@ -12,10 +12,11 @@ * 2 of the License, or (at your option) any later version. */ @@ -101018,11 +100212,9 @@ Index: linux-2.6.25.4/include/asm-powerpc/abs_addr.h #include <asm/firmware.h> struct mschunks_map { -Index: linux-2.6.25.4/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 +--- a/include/asm-powerpc/bitops.h ++++ b/include/asm-powerpc/bitops.h +@@ -312,24 +312,26 @@ asm ("cntlzw %0,%1" : "=r" (lz) : "r" (x)); return 32 - lz; } @@ -101064,10 +100256,8 @@ Index: linux-2.6.25.4/include/asm-powerpc/bitops.h /* Little-endian versions */ -Index: linux-2.6.25.4/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 +--- a/include/asm-powerpc/cpm.h ++++ b/include/asm-powerpc/cpm.h @@ -4,6 +4,20 @@ #include <linux/compiler.h> #include <linux/types.h> @@ -101089,10 +100279,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/include/asm-powerpc/cpm1.h ++++ b/include/asm-powerpc/cpm1.h @@ -28,19 +28,6 @@ #define CPM_CR_CHAN ((ushort)0x00f0) #define CPM_CR_FLG ((ushort)0x0001) @@ -101113,10 +100301,8 @@ Index: linux-2.6.25.4/include/asm-powerpc/cpm1.h /* Channel numbers. */ #define CPM_CR_CH_SCC1 ((ushort)0x0000) -Index: linux-2.6.25.4/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 +--- a/include/asm-powerpc/cpm2.h ++++ b/include/asm-powerpc/cpm2.h @@ -71,18 +71,9 @@ #define CPM_CR_FCC_PAGE(x) (x + 0x04) @@ -101137,11 +100323,9 @@ Index: linux-2.6.25.4/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.4/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_ +--- a/include/asm-powerpc/cputhreads.h ++++ b/include/asm-powerpc/cputhreads.h +@@ -35,7 +35,7 @@ res = CPU_MASK_NONE; for (i = 0; i < NR_CPUS; i += threads_per_core) { @@ -101150,11 +100334,9 @@ Index: linux-2.6.25.4/include/asm-powerpc/cputhreads.h if (cpus_intersects(threads, tmp)) cpu_set(i, res); } -Index: linux-2.6.25.4/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 +--- a/include/asm-powerpc/dcr-native.h ++++ b/include/asm-powerpc/dcr-native.h +@@ -82,6 +82,19 @@ spin_unlock_irqrestore(&dcr_ind_lock, flags); } @@ -101174,7 +100356,7 @@ Index: linux-2.6.25.4/include/asm-powerpc/dcr-native.h #define mfdcri(base, reg) __mfdcri(DCRN_ ## base ## _CONFIG_ADDR, \ DCRN_ ## base ## _CONFIG_DATA, \ reg) -@@ -90,6 +103,10 @@ static inline void __mtdcri(int base_add +@@ -90,6 +103,10 @@ DCRN_ ## base ## _CONFIG_DATA, \ reg, data) @@ -101185,10 +100367,8 @@ Index: linux-2.6.25.4/include/asm-powerpc/dcr-native.h #endif /* __ASSEMBLY__ */ #endif /* __KERNEL__ */ #endif /* _ASM_POWERPC_DCR_NATIVE_H */ -Index: linux-2.6.25.4/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 +--- a/include/asm-powerpc/dcr-regs.h ++++ b/include/asm-powerpc/dcr-regs.h @@ -68,4 +68,82 @@ #define SDR0_UART3 0x0123 #define SDR0_CUST0 0x4000 @@ -101272,11 +100452,9 @@ Index: linux-2.6.25.4/include/asm-powerpc/dcr-regs.h +#define L2C_SNP_ESR 0x00000800 + #endif /* __DCR_REGS_H__ */ -Index: linux-2.6.25.4/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: \ +--- a/include/asm-powerpc/exception.h ++++ b/include/asm-powerpc/exception.h +@@ -228,18 +228,18 @@ BEGIN_FW_FTR_SECTION; \ stb r11,PACAHARDIRQEN(r13); \ END_FW_FTR_SECTION_IFCLR(FW_FEATURE_ISERIES); \ @@ -101298,10 +100476,8 @@ Index: linux-2.6.25.4/include/asm-powerpc/exception.h #endif /* CONFIG_PPC_ISERIES */ #define ENABLE_INTS \ -Index: linux-2.6.25.4/include/asm-powerpc/fsl_lbc.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/asm-powerpc/fsl_lbc.h ++++ b/include/asm-powerpc/fsl_lbc.h @@ -0,0 +1,311 @@ +/* Freescale Local Bus Controller + * @@ -101614,10 +100790,8 @@ Index: linux-2.6.25.4/include/asm-powerpc/fsl_lbc.h +} + +#endif /* __ASM_FSL_LBC_H */ -Index: linux-2.6.25.4/include/asm-powerpc/gpio.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/asm-powerpc/gpio.h ++++ b/include/asm-powerpc/gpio.h @@ -0,0 +1,56 @@ +/* + * Generic GPIO API implementation for PowerPC. @@ -101675,11 +100849,9 @@ Index: linux-2.6.25.4/include/asm-powerpc/gpio.h +#endif /* CONFIG_HAVE_GPIO_LIB */ + +#endif /* __ASM_POWERPC_GPIO_H */ -Index: linux-2.6.25.4/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 +--- a/include/asm-powerpc/hw_irq.h ++++ b/include/asm-powerpc/hw_irq.h +@@ -27,7 +27,7 @@ return flags; } @@ -101688,7 +100860,7 @@ Index: linux-2.6.25.4/include/asm-powerpc/hw_irq.h { unsigned long flags, zero; -@@ -39,14 +39,15 @@ static inline unsigned long local_irq_di +@@ -39,14 +39,15 @@ return flags; } @@ -101709,10 +100881,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/include/asm-powerpc/immap_qe.h ++++ b/include/asm-powerpc/immap_qe.h @@ -20,6 +20,7 @@ #ifdef __KERNEL__ @@ -101721,7 +100891,7 @@ Index: linux-2.6.25.4/include/asm-powerpc/immap_qe.h #define QE_IMMAP_SIZE (1024 * 1024) /* 1MB from 1MB+IMMR */ -@@ -468,7 +469,7 @@ struct qe_immap { +@@ -468,7 +469,7 @@ u8 res18[0xC0000]; /* 0x140000 - 0x200000 */ } __attribute__ ((packed)); @@ -101730,10 +100900,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/include/asm-powerpc/irqflags.h ++++ b/include/asm-powerpc/irqflags.h @@ -2,30 +2,43 @@ * include/asm-powerpc/irqflags.h * @@ -101790,10 +100958,8 @@ Index: linux-2.6.25.4/include/asm-powerpc/irqflags.h #endif #endif -Index: linux-2.6.25.4/include/asm-powerpc/iseries/alpaca.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/asm-powerpc/iseries/alpaca.h ++++ b/include/asm-powerpc/iseries/alpaca.h @@ -0,0 +1,31 @@ +/* + * Copyright © 2008 Stephen Rothwell IBM Corporation @@ -101826,9 +100992,7 @@ Index: linux-2.6.25.4/include/asm-powerpc/iseries/alpaca.h +}; + +#endif /* _ASM_POWERPC_ISERIES_ALPACA_H */ -Index: linux-2.6.25.4/include/asm-powerpc/iseries/it_lp_reg_save.h -=================================================================== ---- linux-2.6.25.4.orig/include/asm-powerpc/iseries/it_lp_reg_save.h +--- a/include/asm-powerpc/iseries/it_lp_reg_save.h +++ /dev/null @@ -1,85 +0,0 @@ -/* @@ -101916,10 +101080,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/include/asm-powerpc/lmb.h ++++ b/include/asm-powerpc/lmb.h @@ -1,81 +1,15 @@ #ifndef _ASM_POWERPC_LMB_H #define _ASM_POWERPC_LMB_H @@ -102010,11 +101172,9 @@ Index: linux-2.6.25.4/include/asm-powerpc/lmb.h - -#endif /* __KERNEL__ */ #endif /* _ASM_POWERPC_LMB_H */ -Index: linux-2.6.25.4/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 { +--- a/include/asm-powerpc/machdep.h ++++ b/include/asm-powerpc/machdep.h +@@ -68,6 +68,8 @@ unsigned long vflags, int psize, int ssize); long (*hpte_remove)(unsigned long hpte_group); @@ -102023,7 +101183,7 @@ Index: linux-2.6.25.4/include/asm-powerpc/machdep.h void (*flush_hash_range)(unsigned long number, int local); /* special for kexec, to be called in real mode, linar mapping is -@@ -196,9 +198,6 @@ struct machdep_calls { +@@ -196,9 +198,6 @@ May be NULL. */ void (*init)(void); @@ -102033,10 +101193,8 @@ Index: linux-2.6.25.4/include/asm-powerpc/machdep.h void (*kgdb_map_scc)(void); /* -Index: linux-2.6.25.4/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 +--- a/include/asm-powerpc/macio.h ++++ b/include/asm-powerpc/macio.h @@ -2,7 +2,7 @@ #define __MACIO_ASIC_H__ #ifdef __KERNEL__ @@ -102046,10 +101204,8 @@ Index: linux-2.6.25.4/include/asm-powerpc/macio.h extern struct bus_type macio_bus_type; -Index: linux-2.6.25.4/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 +--- a/include/asm-powerpc/mmu-40x.h ++++ b/include/asm-powerpc/mmu-40x.h @@ -53,8 +53,6 @@ #ifndef __ASSEMBLY__ @@ -102059,10 +101215,8 @@ Index: linux-2.6.25.4/include/asm-powerpc/mmu-40x.h typedef struct { unsigned long id; unsigned long vdso_base; -Index: linux-2.6.25.4/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 +--- a/include/asm-powerpc/mmu-44x.h ++++ b/include/asm-powerpc/mmu-44x.h @@ -53,8 +53,6 @@ #ifndef __ASSEMBLY__ @@ -102072,10 +101226,8 @@ Index: linux-2.6.25.4/include/asm-powerpc/mmu-44x.h typedef struct { unsigned long id; unsigned long vdso_base; -Index: linux-2.6.25.4/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 +--- a/include/asm-powerpc/mmu-8xx.h ++++ b/include/asm-powerpc/mmu-8xx.h @@ -136,8 +136,6 @@ #define SPRN_M_TW 799 @@ -102085,10 +101237,8 @@ Index: linux-2.6.25.4/include/asm-powerpc/mmu-8xx.h typedef struct { unsigned long id; unsigned long vdso_base; -Index: linux-2.6.25.4/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 +--- a/include/asm-powerpc/mmu-fsl-booke.h ++++ b/include/asm-powerpc/mmu-fsl-booke.h @@ -73,12 +73,6 @@ #ifndef __ASSEMBLY__ @@ -102102,11 +101252,9 @@ Index: linux-2.6.25.4/include/asm-powerpc/mmu-fsl-booke.h typedef struct { unsigned long id; unsigned long vdso_base; -Index: linux-2.6.25.4/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 { +--- a/include/asm-powerpc/mmu-hash32.h ++++ b/include/asm-powerpc/mmu-hash32.h +@@ -84,8 +84,6 @@ unsigned long vdso_base; } mm_context_t; @@ -102115,11 +101263,9 @@ Index: linux-2.6.25.4/include/asm-powerpc/mmu-hash32.h #endif /* !__ASSEMBLY__ */ #endif /* _ASM_POWERPC_MMU_HASH32_H_ */ -Index: linux-2.6.25.4/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 +--- a/include/asm-powerpc/mmu-hash64.h ++++ b/include/asm-powerpc/mmu-hash64.h +@@ -469,9 +469,6 @@ VSID_MODULUS_256M) #define KERNEL_VSID(ea) VSID_SCRAMBLE(GET_ESID(ea)) @@ -102129,11 +101275,9 @@ Index: linux-2.6.25.4/include/asm-powerpc/mmu-hash64.h #endif /* __ASSEMBLY__ */ #endif /* _ASM_POWERPC_MMU_HASH64_H_ */ -Index: linux-2.6.25.4/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; +--- a/include/asm-powerpc/paca.h ++++ b/include/asm-powerpc/paca.h +@@ -42,10 +42,7 @@ * Defines the layout of the paca. * * This structure is not directly accessed by firmware or the service @@ -102145,7 +101289,7 @@ Index: linux-2.6.25.4/include/asm-powerpc/paca.h */ struct paca_struct { /* -@@ -55,14 +52,7 @@ struct paca_struct { +@@ -55,14 +52,7 @@ * avoid cacheline bouncing. */ @@ -102160,10 +101304,8 @@ Index: linux-2.6.25.4/include/asm-powerpc/paca.h /* * MAGIC: the spinlock functions in arch/powerpc/lib/locks.c -Index: linux-2.6.25.4/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 +--- a/include/asm-powerpc/page.h ++++ b/include/asm-powerpc/page.h @@ -53,6 +53,7 @@ #define PAGE_OFFSET ASM_CONST(CONFIG_KERNEL_START) @@ -102172,10 +101314,8 @@ Index: linux-2.6.25.4/include/asm-powerpc/page.h #ifdef CONFIG_FLATMEM #define pfn_valid(pfn) ((pfn) < max_mapnr) -Index: linux-2.6.25.4/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 +--- a/include/asm-powerpc/page_32.h ++++ b/include/asm-powerpc/page_32.h @@ -3,8 +3,6 @@ #define VM_DATA_DEFAULT_FLAGS VM_DATA_DEFAULT_FLAGS32 @@ -102185,10 +101325,8 @@ Index: linux-2.6.25.4/include/asm-powerpc/page_32.h #ifdef CONFIG_NOT_COHERENT_CACHE #define ARCH_KMALLOC_MINALIGN L1_CACHE_BYTES #endif -Index: linux-2.6.25.4/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 +--- a/include/asm-powerpc/pasemi_dma.h ++++ b/include/asm-powerpc/pasemi_dma.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 PA Semi, Inc @@ -102196,7 +101334,7 @@ Index: linux-2.6.25.4/include/asm-powerpc/pasemi_dma.h * * Hardware register layout and descriptor formats for the on-board * DMA engine on PA Semi PWRficient. Used by ethernet, function and security -@@ -40,6 +40,11 @@ enum { +@@ -40,6 +40,11 @@ PAS_DMA_COM_TXSTA = 0x104, /* Transmit Status Register */ PAS_DMA_COM_RXCMD = 0x108, /* Receive Command Register */ PAS_DMA_COM_RXSTA = 0x10c, /* Receive Status Register */ @@ -102208,7 +101346,7 @@ Index: linux-2.6.25.4/include/asm-powerpc/pasemi_dma.h }; -@@ -123,11 +128,16 @@ enum { +@@ -123,11 +128,16 @@ #define PAS_DMA_TXCHAN_TCMDSTA_DA 0x00000100 #define PAS_DMA_TXCHAN_CFG(c) (0x304+(c)*_PAS_DMA_TXCHAN_STRIDE) #define PAS_DMA_TXCHAN_CFG_TY_IFACE 0x00000000 /* Type = interface */ @@ -102226,7 +101364,7 @@ Index: linux-2.6.25.4/include/asm-powerpc/pasemi_dma.h #define PAS_DMA_TXCHAN_CFG_WT_S 6 #define PAS_DMA_TXCHAN_CFG_WT(x) (((x) << PAS_DMA_TXCHAN_CFG_WT_S) & \ PAS_DMA_TXCHAN_CFG_WT_M) -@@ -394,11 +404,62 @@ enum { +@@ -394,11 +404,62 @@ XCT_COPY_LLEN_M) #define XCT_COPY_SE 0x0000000000000001ull @@ -102290,7 +101428,7 @@ Index: linux-2.6.25.4/include/asm-powerpc/pasemi_dma.h #define CTRL_CMD_REG_S 0 #define CTRL_CMD_REG(x) ((((long)(x)) << CTRL_CMD_REG_S) & \ CTRL_CMD_REG_M) -@@ -461,6 +522,16 @@ extern void *pasemi_dma_alloc_buf(struct +@@ -461,6 +522,16 @@ extern void pasemi_dma_free_buf(struct pasemi_dmachan *chan, int size, dma_addr_t *handle); @@ -102307,11 +101445,9 @@ Index: linux-2.6.25.4/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.4/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 { +--- a/include/asm-powerpc/pci-bridge.h ++++ b/include/asm-powerpc/pci-bridge.h +@@ -117,7 +117,7 @@ #ifndef CONFIG_PPC64 @@ -102320,7 +101456,7 @@ Index: linux-2.6.25.4/include/asm-powerpc/pci-bridge.h { return bus->sysdata; } -@@ -235,7 +235,7 @@ extern void pcibios_fixup_new_pci_device +@@ -235,7 +235,7 @@ extern int pcibios_remove_root_bus(struct pci_controller *phb); @@ -102329,11 +101465,9 @@ Index: linux-2.6.25.4/include/asm-powerpc/pci-bridge.h { struct device_node *busdn = bus->sysdata; -Index: linux-2.6.25.4/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; +--- a/include/asm-powerpc/pgtable-ppc32.h ++++ b/include/asm-powerpc/pgtable-ppc32.h +@@ -98,9 +98,6 @@ #define USER_PTRS_PER_PGD (TASK_SIZE / PGDIR_SIZE) #define FIRST_USER_ADDRESS 0 @@ -102343,7 +101477,7 @@ Index: linux-2.6.25.4/include/asm-powerpc/pgtable-ppc32.h #define pte_ERROR(e) \ printk("%s:%d: bad pte %llx.\n", __FILE__, __LINE__, \ (unsigned long long)pte_val(e)) -@@ -420,7 +417,8 @@ extern int icache_44x_need_flush; +@@ -420,7 +417,8 @@ #define _PAGE_IO (_PAGE_KERNEL | _PAGE_NO_CACHE | _PAGE_GUARDED) #define _PAGE_RAM (_PAGE_KERNEL | _PAGE_HWEXEC) @@ -102353,7 +101487,7 @@ Index: linux-2.6.25.4/include/asm-powerpc/pgtable-ppc32.h /* We want the debuggers to be able to set breakpoints anywhere, so * don't write protect the kernel text */ #define _PAGE_RAM_TEXT _PAGE_RAM -@@ -692,7 +690,7 @@ extern pgprot_t phys_mem_access_prot(str +@@ -692,7 +690,7 @@ #define pmd_page_vaddr(pmd) \ ((unsigned long) (pmd_val(pmd) & PAGE_MASK)) #define pmd_page(pmd) \ @@ -102362,10 +101496,8 @@ Index: linux-2.6.25.4/include/asm-powerpc/pgtable-ppc32.h #endif /* to find an entry in a kernel page-table-directory */ -Index: linux-2.6.25.4/include/asm-powerpc/phyp_dump.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/asm-powerpc/phyp_dump.h ++++ b/include/asm-powerpc/phyp_dump.h @@ -0,0 +1,47 @@ +/* + * Hypervisor-assisted dump @@ -102414,10 +101546,8 @@ Index: linux-2.6.25.4/include/asm-powerpc/phyp_dump.h + +#endif /* CONFIG_PHYP_DUMP */ +#endif /* _PPC64_PHYP_DUMP_H */ -Index: linux-2.6.25.4/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 +--- a/include/asm-powerpc/pmi.h ++++ b/include/asm-powerpc/pmi.h @@ -29,8 +29,6 @@ #ifdef __KERNEL__ @@ -102427,10 +101557,8 @@ Index: linux-2.6.25.4/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.4/include/asm-powerpc/ppc4xx.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/asm-powerpc/ppc4xx.h ++++ b/include/asm-powerpc/ppc4xx.h @@ -0,0 +1,18 @@ +/* + * PPC4xx Prototypes and definitions @@ -102450,11 +101578,9 @@ Index: linux-2.6.25.4/include/asm-powerpc/ppc4xx.h +extern void ppc4xx_reset_system(char *cmd); + +#endif /* __ASM_POWERPC_PPC4xx_H__ */ -Index: linux-2.6.25.4/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 { +--- a/include/asm-powerpc/ps3.h ++++ b/include/asm-powerpc/ps3.h +@@ -434,8 +434,11 @@ }; void ps3_sys_manager_register_ops(const struct ps3_sys_manager_ops *ops); @@ -102468,11 +101594,9 @@ Index: linux-2.6.25.4/include/asm-powerpc/ps3.h struct ps3_prealloc { const char *name; -Index: linux-2.6.25.4/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 { +--- a/include/asm-powerpc/ptrace.h ++++ b/include/asm-powerpc/ptrace.h +@@ -58,6 +58,11 @@ #define __ARCH_WANT_COMPAT_SYS_PTRACE #define STACK_FRAME_OVERHEAD 112 /* size of minimum stack frame */ @@ -102484,7 +101608,7 @@ Index: linux-2.6.25.4/include/asm-powerpc/ptrace.h /* Size of dummy stack frame allocated when calling signal handler. */ #define __SIGNAL_FRAMESIZE 128 -@@ -66,6 +71,10 @@ struct pt_regs { +@@ -66,6 +71,10 @@ #else /* __powerpc64__ */ #define STACK_FRAME_OVERHEAD 16 /* size of minimum stack frame */ @@ -102495,11 +101619,9 @@ Index: linux-2.6.25.4/include/asm-powerpc/ptrace.h /* Size of stack frame allocated when calling signal handler. */ #define __SIGNAL_FRAMESIZE 64 -Index: linux-2.6.25.4/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 +--- a/include/asm-powerpc/qe.h ++++ b/include/asm-powerpc/qe.h +@@ -85,6 +85,7 @@ /* QE internal API */ int qe_issue_cmd(u32 cmd, u32 device, u8 mcn_protocol, u32 cmd_input); enum qe_clock qe_clock_source(const char *source); @@ -102507,7 +101629,7 @@ Index: linux-2.6.25.4/include/asm-powerpc/qe.h int qe_setbrg(enum qe_clock brg, unsigned int rate, unsigned int multiplier); int qe_get_snum(void); void qe_put_snum(u8 snum); -@@ -92,7 +93,16 @@ unsigned long qe_muram_alloc(int size, i +@@ -92,7 +93,16 @@ int qe_muram_free(unsigned long offset); unsigned long qe_muram_alloc_fixed(unsigned long offset, int size); void qe_muram_dump(void); @@ -102525,11 +101647,9 @@ Index: linux-2.6.25.4/include/asm-powerpc/qe.h /* Structure that defines QE firmware binary files. * -Index: linux-2.6.25.4/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 { +--- a/include/asm-powerpc/rwsem.h ++++ b/include/asm-powerpc/rwsem.h +@@ -32,11 +32,20 @@ #define RWSEM_ACTIVE_WRITE_BIAS (RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS) spinlock_t wait_lock; struct list_head wait_list; @@ -102552,7 +101672,7 @@ Index: linux-2.6.25.4/include/asm-powerpc/rwsem.h #define DECLARE_RWSEM(name) \ struct rw_semaphore name = __RWSEM_INITIALIZER(name) -@@ -46,12 +55,15 @@ extern struct rw_semaphore *rwsem_down_w +@@ -46,12 +55,15 @@ extern struct rw_semaphore *rwsem_wake(struct rw_semaphore *sem); extern struct rw_semaphore *rwsem_downgrade_wake(struct rw_semaphore *sem); @@ -102574,7 +101694,7 @@ Index: linux-2.6.25.4/include/asm-powerpc/rwsem.h /* * lock for reading -@@ -78,7 +90,7 @@ static inline int __down_read_trylock(st +@@ -78,7 +90,7 @@ /* * lock for writing */ @@ -102583,7 +101703,7 @@ Index: linux-2.6.25.4/include/asm-powerpc/rwsem.h { int tmp; -@@ -88,6 +100,11 @@ static inline void __down_write(struct r +@@ -88,6 +100,11 @@ rwsem_down_write_failed(sem); } @@ -102595,10 +101715,8 @@ Index: linux-2.6.25.4/include/asm-powerpc/rwsem.h static inline int __down_write_trylock(struct rw_semaphore *sem) { int tmp; -Index: linux-2.6.25.4/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 +--- a/include/asm-powerpc/sparsemem.h ++++ b/include/asm-powerpc/sparsemem.h @@ -15,6 +15,7 @@ #ifdef CONFIG_MEMORY_HOTPLUG @@ -102607,10 +101725,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/include/asm-powerpc/spinlock.h ++++ b/include/asm-powerpc/spinlock.h @@ -19,6 +19,7 @@ * * (the type definitions are in asm/spinlock_types.h) @@ -102619,10 +101735,8 @@ Index: linux-2.6.25.4/include/asm-powerpc/spinlock.h #ifdef CONFIG_PPC64 #include <asm/paca.h> #include <asm/hvcall.h> -Index: linux-2.6.25.4/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 +--- a/include/asm-powerpc/string.h ++++ b/include/asm-powerpc/string.h @@ -7,6 +7,7 @@ #define __HAVE_ARCH_STRNCPY #define __HAVE_ARCH_STRLEN @@ -102631,7 +101745,7 @@ Index: linux-2.6.25.4/include/asm-powerpc/string.h #define __HAVE_ARCH_STRCAT #define __HAVE_ARCH_MEMSET #define __HAVE_ARCH_MEMCPY -@@ -18,6 +19,7 @@ extern char * strcpy(char *,const char * +@@ -18,6 +19,7 @@ extern char * strncpy(char *,const char *, __kernel_size_t); extern __kernel_size_t strlen(const char *); extern int strcmp(const char *,const char *); @@ -102639,11 +101753,9 @@ Index: linux-2.6.25.4/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.4/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; +--- a/include/asm-powerpc/types.h ++++ b/include/asm-powerpc/types.h +@@ -84,6 +84,13 @@ typedef __vector128 vector128; @@ -102657,10 +101769,8 @@ Index: linux-2.6.25.4/include/asm-powerpc/types.h #ifdef __powerpc64__ typedef u64 dma_addr_t; #else -Index: linux-2.6.25.4/include/asm-sparc64/lmb.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/asm-sparc64/lmb.h ++++ b/include/asm-sparc64/lmb.h @@ -0,0 +1,10 @@ +#ifndef _SPARC64_LMB_H +#define _SPARC64_LMB_H @@ -102672,10 +101782,8 @@ Index: linux-2.6.25.4/include/asm-sparc64/lmb.h +#define LMB_REAL_LIMIT 0 + +#endif /* !(_SPARC64_LMB_H) */ -Index: linux-2.6.25.4/include/linux/lmb.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/lmb.h ++++ b/include/linux/lmb.h @@ -0,0 +1,85 @@ +#ifndef _LINUX_LMB_H +#define _LINUX_LMB_H @@ -102762,11 +101870,9 @@ Index: linux-2.6.25.4/include/linux/lmb.h +#endif /* __KERNEL__ */ + +#endif /* _LINUX_LMB_H */ -Index: linux-2.6.25.4/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 +--- a/include/linux/of.h ++++ b/include/linux/of.h +@@ -62,6 +62,7 @@ int *lenp); extern int of_device_is_compatible(const struct device_node *device, const char *); @@ -102774,10 +101880,8 @@ Index: linux-2.6.25.4/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.4/include/linux/of_gpio.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/of_gpio.h ++++ b/include/linux/of_gpio.h @@ -0,0 +1,69 @@ +/* + * OF helpers for the GPIO API @@ -102848,10 +101952,8 @@ Index: linux-2.6.25.4/include/linux/of_gpio.h +#endif /* CONFIG_OF_GPIO */ + +#endif /* __LINUX_OF_GPIO_H */ -Index: linux-2.6.25.4/include/linux/of_i2c.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/of_i2c.h ++++ b/include/linux/of_i2c.h @@ -0,0 +1,24 @@ +/* + * Generic I2C API implementation for PowerPC. @@ -102877,11 +101979,9 @@ Index: linux-2.6.25.4/include/linux/of_i2c.h +#endif /* CONFIG_OF_I2C */ + +#endif /* __LINUX_OF_I2C_H */ -Index: linux-2.6.25.4/lib/Kconfig -=================================================================== ---- linux-2.6.25.4.orig/lib/Kconfig -+++ linux-2.6.25.4/lib/Kconfig -@@ -141,4 +141,7 @@ config HAS_DMA +--- a/lib/Kconfig ++++ b/lib/Kconfig +@@ -141,4 +141,7 @@ config CHECK_SIGNATURE bool @@ -102889,11 +101989,9 @@ Index: linux-2.6.25.4/lib/Kconfig + boolean + endmenu -Index: linux-2.6.25.4/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 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -70,6 +70,8 @@ lib-$(CONFIG_GENERIC_BUG) += bug.o @@ -102902,10 +102000,8 @@ Index: linux-2.6.25.4/lib/Makefile hostprogs-y := gen_crc32table clean-files := crc32table.h -Index: linux-2.6.25.4/lib/lmb.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/lib/lmb.c ++++ b/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 4cffc5bec2..79ee43e16a 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,8 +1,6 @@ -Index: linux-2.6.25.4/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 +--- a/drivers/usb/serial/usb-serial.c ++++ b/drivers/usb/serial/usb-serial.c +@@ -58,6 +58,7 @@ drivers depend on it. */ @@ -10,7 +8,7 @@ Index: linux-2.6.25.4/drivers/usb/serial/usb-serial.c static int debug; static struct usb_serial *serial_table[SERIAL_TTY_MINORS]; /* initially all NULL */ static DEFINE_MUTEX(table_lock); -@@ -904,7 +905,7 @@ int usb_serial_probe(struct usb_interfac +@@ -904,7 +905,7 @@ dev_err(&interface->dev, "No free urbs available\n"); goto probe_error; } @@ -19,7 +17,7 @@ Index: linux-2.6.25.4/drivers/usb/serial/usb-serial.c port->bulk_in_size = buffer_size; port->bulk_in_endpointAddress = endpoint->bEndpointAddress; port->bulk_in_buffer = kmalloc (buffer_size, GFP_KERNEL); -@@ -1316,3 +1317,5 @@ MODULE_LICENSE("GPL"); +@@ -1316,3 +1317,5 @@ module_param(debug, bool, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(debug, "Debug enabled or not"); diff --git a/target/linux/generic-2.6/patches-2.6.25/840-unable_to_open_console.patch b/target/linux/generic-2.6/patches-2.6.25/840-unable_to_open_console.patch index bb106a51db..1289129a89 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,8 +1,6 @@ -Index: linux-2.6.25.4/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) +--- a/init/main.c ++++ b/init/main.c +@@ -775,7 +775,7 @@ numa_default_policy(); if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) diff --git a/target/linux/generic-2.6/patches-2.6.25/850-jffs2_erase_progress_indicator.patch b/target/linux/generic-2.6/patches-2.6.25/850-jffs2_erase_progress_indicator.patch index c593d0a46c..2d4eafd1f4 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,8 +1,6 @@ -Index: linux-2.6.25.4/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 +--- a/fs/jffs2/erase.c ++++ b/fs/jffs2/erase.c +@@ -35,6 +35,8 @@ { int ret; uint32_t bad_offset; @@ -11,7 +9,7 @@ Index: linux-2.6.25.4/fs/jffs2/erase.c #ifdef __ECOS ret = jffs2_flash_erase(c, jeb); if (!ret) { -@@ -47,6 +49,11 @@ static void jffs2_erase_block(struct jff +@@ -47,6 +49,11 @@ D1(printk(KERN_DEBUG "jffs2_erase_block(): erase block %#08x (range %#08x-%#08x)\n", jeb->offset, jeb->offset, jeb->offset + c->sector_size)); diff --git a/target/linux/generic-2.6/patches-2.6.25/900-headers_type_and_time.patch b/target/linux/generic-2.6/patches-2.6.25/900-headers_type_and_time.patch index 07c5129d08..b15fd56a9d 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,5 @@ -Index: linux-2.6.25.4/include/linux/time.h -=================================================================== ---- linux-2.6.25.4.orig/include/linux/time.h -+++ linux-2.6.25.4/include/linux/time.h +--- a/include/linux/time.h ++++ b/include/linux/time.h @@ -1,6 +1,10 @@ #ifndef _LINUX_TIME_H #define _LINUX_TIME_H @@ -13,17 +11,15 @@ Index: linux-2.6.25.4/include/linux/time.h #include <linux/types.h> #ifdef __KERNEL__ -@@ -232,4 +236,6 @@ struct itimerval { +@@ -232,4 +236,6 @@ */ #define TIMER_ABSTIME 0x01 +#endif /* __KERNEL__ DEBIAN */ + #endif -Index: linux-2.6.25.4/include/linux/types.h -=================================================================== ---- linux-2.6.25.4.orig/include/linux/types.h -+++ linux-2.6.25.4/include/linux/types.h +--- a/include/linux/types.h ++++ b/include/linux/types.h @@ -1,6 +1,14 @@ #ifndef _LINUX_TYPES_H #define _LINUX_TYPES_H @@ -39,7 +35,7 @@ Index: linux-2.6.25.4/include/linux/types.h #ifdef __KERNEL__ #define DECLARE_BITMAP(name,bits) \ -@@ -161,6 +169,8 @@ typedef unsigned long blkcnt_t; +@@ -161,6 +169,8 @@ #endif /* __KERNEL_STRICT_NAMES */ diff --git a/target/linux/generic-2.6/patches-2.6.25/902-darwin_scripts_include.patch b/target/linux/generic-2.6/patches-2.6.25/902-darwin_scripts_include.patch index 1e115430a3..36b4d259f5 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,5 @@ -Index: linux-2.6.25.4/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 +--- a/scripts/genksyms/parse.c_shipped ++++ b/scripts/genksyms/parse.c_shipped @@ -160,7 +160,9 @@ @@ -12,10 +10,8 @@ Index: linux-2.6.25.4/scripts/genksyms/parse.c_shipped #include "genksyms.h" static int is_typedef; -Index: linux-2.6.25.4/scripts/genksyms/parse.y -=================================================================== ---- linux-2.6.25.4.orig/scripts/genksyms/parse.y -+++ linux-2.6.25.4/scripts/genksyms/parse.y +--- a/scripts/genksyms/parse.y ++++ b/scripts/genksyms/parse.y @@ -24,7 +24,9 @@ %{ @@ -26,10 +22,8 @@ Index: linux-2.6.25.4/scripts/genksyms/parse.y #include "genksyms.h" static int is_typedef; -Index: linux-2.6.25.4/scripts/kallsyms.c -=================================================================== ---- linux-2.6.25.4.orig/scripts/kallsyms.c -+++ linux-2.6.25.4/scripts/kallsyms.c +--- a/scripts/kallsyms.c ++++ b/scripts/kallsyms.c @@ -28,6 +28,35 @@ #include <stdlib.h> #include <string.h> @@ -66,11 +60,9 @@ Index: linux-2.6.25.4/scripts/kallsyms.c #define KSYM_NAME_LEN 128 -Index: linux-2.6.25.4/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 +--- a/scripts/kconfig/Makefile ++++ b/scripts/kconfig/Makefile +@@ -93,6 +93,9 @@ # we really need to do so. (Do not call gcc as part of make mrproper) HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) HOST_LOADLIBES = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) @@ -80,10 +72,8 @@ Index: linux-2.6.25.4/scripts/kconfig/Makefile HOST_EXTRACFLAGS += -DLOCALE -Index: linux-2.6.25.4/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 +--- a/scripts/mod/mk_elfconfig.c ++++ b/scripts/mod/mk_elfconfig.c @@ -1,7 +1,11 @@ #include <stdio.h> #include <stdlib.h> @@ -96,10 +86,8 @@ Index: linux-2.6.25.4/scripts/mod/mk_elfconfig.c int main(int argc, char **argv) -Index: linux-2.6.25.4/scripts/mod/modpost.h -=================================================================== ---- linux-2.6.25.4.orig/scripts/mod/modpost.h -+++ linux-2.6.25.4/scripts/mod/modpost.h +--- a/scripts/mod/modpost.h ++++ b/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 4312856a4c..81e10834e3 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,8 +1,6 @@ -Index: linux-2.6.25.4/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 +--- a/drivers/net/wireless/hostap/hostap_ap.c ++++ b/drivers/net/wireless/hostap/hostap_ap.c +@@ -2397,13 +2397,13 @@ addr[count].sa_family = ARPHRD_ETHER; memcpy(addr[count].sa_data, sta->addr, ETH_ALEN); if (sta->last_rx_silence == 0) @@ -22,7 +20,7 @@ Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap_ap.c qual[count].updated = sta->last_rx_updated; sta->last_rx_updated = IW_QUAL_DBM; -@@ -2468,13 +2468,13 @@ int prism2_ap_translate_scan(struct net_ +@@ -2468,13 +2468,13 @@ memset(&iwe, 0, sizeof(iwe)); iwe.cmd = IWEVQUAL; if (sta->last_rx_silence == 0) @@ -42,10 +40,8 @@ Index: linux-2.6.25.4/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.4/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 +--- a/drivers/net/wireless/hostap/hostap_config.h ++++ b/drivers/net/wireless/hostap/hostap_config.h @@ -45,4 +45,9 @@ */ /* #define PRISM2_NO_STATION_MODES */ @@ -56,11 +52,9 @@ Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap_config.h +#define RAW_TXPOWER_SETTING + #endif /* HOSTAP_CONFIG_H */ -Index: linux-2.6.25.4/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 +--- a/drivers/net/wireless/hostap/hostap.h ++++ b/drivers/net/wireless/hostap/hostap.h +@@ -89,6 +89,7 @@ extern const struct ethtool_ops prism2_ethtool_ops; int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd); @@ -68,11 +62,9 @@ Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap.h #endif /* HOSTAP_H */ -Index: linux-2.6.25.4/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 +--- a/drivers/net/wireless/hostap/hostap_hw.c ++++ b/drivers/net/wireless/hostap/hostap_hw.c +@@ -933,6 +933,7 @@ prism2_hw_reset(dev); } @@ -80,11 +72,9 @@ Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap_hw.c return res; } -Index: linux-2.6.25.4/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 +--- a/drivers/net/wireless/hostap/hostap_info.c ++++ b/drivers/net/wireless/hostap/hostap_info.c +@@ -434,6 +434,11 @@ } /* Get BSSID if we have a valid AP address */ @@ -96,11 +86,9 @@ Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap_info.c if (connected) { netif_carrier_on(local->dev); netif_carrier_on(local->ddev); -Index: linux-2.6.25.4/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 +--- a/drivers/net/wireless/hostap/hostap_ioctl.c ++++ b/drivers/net/wireless/hostap/hostap_ioctl.c +@@ -1500,23 +1500,20 @@ val = 255; tmp = val; @@ -128,7 +116,7 @@ Index: linux-2.6.25.4/drivers/net/wireless/hostap/hostap_ioctl.c return (unsigned char) tmp; } -@@ -4076,3 +4073,35 @@ int hostap_ioctl(struct net_device *dev, +@@ -4076,3 +4073,35 @@ return ret; } diff --git a/target/linux/generic-2.6/patches-2.6.25/903-stddef_include.patch b/target/linux/generic-2.6/patches-2.6.25/903-stddef_include.patch index 7dd82f4591..c0c01c0101 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,8 +1,6 @@ -Index: linux-2.6.25.4/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 { +--- a/include/linux/stddef.h ++++ b/include/linux/stddef.h +@@ -16,6 +16,7 @@ false = 0, true = 1 }; @@ -10,7 +8,7 @@ Index: linux-2.6.25.4/include/linux/stddef.h #undef offsetof #ifdef __compiler_offsetof -@@ -23,6 +24,5 @@ enum { +@@ -23,6 +24,5 @@ #else #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) #endif diff --git a/target/linux/generic-2.6/patches-2.6.25/904-ls_time_locale.patch b/target/linux/generic-2.6/patches-2.6.25/904-ls_time_locale.patch index c9a8e30777..401b15126d 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,8 +1,6 @@ -Index: linux-2.6.25.4/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() { +--- a/scripts/gen_initramfs_list.sh ++++ b/scripts/gen_initramfs_list.sh +@@ -125,7 +125,7 @@ str="${ftype} ${name} ${location} ${str}" ;; "nod") @@ -11,7 +9,7 @@ Index: linux-2.6.25.4/scripts/gen_initramfs_list.sh local maj=`field 5 ${dev}` local min=`field 6 ${dev}` maj=${maj%,} -@@ -135,7 +135,7 @@ parse() { +@@ -135,7 +135,7 @@ str="${ftype} ${name} ${str} ${dev} ${maj} ${min}" ;; "slink") diff --git a/target/linux/generic-2.6/patches-2.6.25/905-i386_build.patch b/target/linux/generic-2.6/patches-2.6.25/905-i386_build.patch index 0db1e89dcc..c701fdaa95 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,5 @@ -Index: linux-2.6.25.4/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 +--- a/arch/x86/boot/tools/build.c ++++ b/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 083e048267..eeb7285a04 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,8 +1,6 @@ -Index: linux-2.6.25.4/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 +--- a/drivers/spi/Kconfig ++++ b/drivers/spi/Kconfig +@@ -100,6 +100,11 @@ inexpensive battery powered microcontroller evaluation board. This same cable can be used to flash new firmware. @@ -14,11 +12,9 @@ Index: linux-2.6.25.4/drivers/spi/Kconfig config SPI_IMX tristate "Freescale iMX SPI controller" depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL -Index: linux-2.6.25.4/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. +--- a/drivers/spi/Makefile ++++ b/drivers/spi/Makefile +@@ -16,6 +16,7 @@ obj-$(CONFIG_SPI_BITBANG) += spi_bitbang.o obj-$(CONFIG_SPI_AU1550) += au1550_spi.o obj-$(CONFIG_SPI_BUTTERFLY) += spi_butterfly.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 f616efbf31..5b3755e871 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,11 +30,9 @@ and didn't make it with the ppc32 equivalent. Thanks. --- -Index: linux-2.6.25.4/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 +--- a/include/asm-ppc/io.h ++++ b/include/asm-ppc/io.h +@@ -413,11 +413,21 @@ return readw(addr); } @@ -56,7 +54,7 @@ Index: linux-2.6.25.4/include/asm-ppc/io.h static inline void iowrite8(u8 val, void __iomem *addr) { writeb(val, addr); -@@ -428,11 +438,21 @@ static inline void iowrite16(u16 val, vo +@@ -428,11 +438,21 @@ writew(val, 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 7414920cd3..c6c28a0037 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,5 @@ -Index: linux-2.6.25.4/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 +--- a/arch/arm/tools/mach-types ++++ b/arch/arm/tools/mach-types @@ -12,7 +12,7 @@ # # http://www.arm.linux.org.uk/developer/machines/?action=new @@ -11,7 +9,7 @@ Index: linux-2.6.25.4/arch/arm/tools/mach-types # # machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number # -@@ -381,13 +381,13 @@ ks8695p ARCH_KS8695P KS8695P 363 +@@ -381,13 +381,13 @@ se4000 ARCH_SE4000 SE4000 364 quadriceps ARCH_QUADRICEPS QUADRICEPS 365 bronco ARCH_BRONCO BRONCO 366 @@ -27,7 +25,7 @@ Index: linux-2.6.25.4/arch/arm/tools/mach-types rcube ARCH_RCUBE RCUBE 374 rea_olv ARCH_REA_OLV REA_OLV 375 pxa_iphone ARCH_PXA_IPHONE PXA_IPHONE 376 -@@ -1463,7 +1463,7 @@ artemis MACH_ARTEMIS ARTEMIS 1462 +@@ -1463,7 +1463,7 @@ htctitan MACH_HTCTITAN HTCTITAN 1463 qranium MACH_QRANIUM QRANIUM 1464 adx_wsc2 MACH_ADX_WSC2 ADX_WSC2 1465 @@ -36,7 +34,7 @@ Index: linux-2.6.25.4/arch/arm/tools/mach-types bboard MACH_BBOARD BBOARD 1467 cambria MACH_CAMBRIA CAMBRIA 1468 mt7xxx MACH_MT7XXX MT7XXX 1469 -@@ -1611,3 +1611,112 @@ kb9263 MACH_KB9263 KB9263 1612 +@@ -1611,3 +1611,112 @@ mt7108 MACH_MT7108 MT7108 1613 smtr2440 MACH_SMTR2440 SMTR2440 1614 manao MACH_MANAO MANAO 1615 |