summaryrefslogtreecommitdiff
path: root/target/linux/generic-2.6/patches-2.6.24
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-02-08 19:16:45 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-02-08 19:16:45 +0000
commit09de82989a23c0844422dba103d7534a81cfaeef (patch)
treeb82a2992141db38036a3058645e8dcadfb7385ef /target/linux/generic-2.6/patches-2.6.24
parent6fbcb132369d914e4a9779f23628490243afe6f6 (diff)
downloadmtk-20170518-09de82989a23c0844422dba103d7534a81cfaeef.zip
mtk-20170518-09de82989a23c0844422dba103d7534a81cfaeef.tar.gz
mtk-20170518-09de82989a23c0844422dba103d7534a81cfaeef.tar.bz2
generic-2.6/2.6.24: refresh patches
SVN-Revision: 14450
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.24')
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/001-squashfs.patch12
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/002-lzma_decompress.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/003-squashfs_lzma.patch10
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/004-extra_optimization.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/005-squashfs_fix.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/006-gcc4_inline_fix.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/007-samsung_flash.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/009-revert_intel_flash_breakage.patch16
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/012-mips_cpu_tlb.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/013-mips_gdb_stub.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/060-block2mtd_init.patch14
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/065-rootfs_split.patch44
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/070-redboot_space.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/080-mtd_plat_nand_chip_fixup.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/100-netfilter_layer7_2.17.patch10
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/101-netfilter_layer7_pktmatch.patch10
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/110-ipp2p_0.8.1rc1.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/130-netfilter_ipset.patch10
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/140-netfilter_time.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/150-netfilter_imq.patch20
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/170-netfilter_chaostables_0.8.patch14
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/171-netfilter_tarpit.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/180-netfilter_depends.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/190-netfilter_rtsp.patch8
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/200-sched_esfq.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/202-mips-freestanding.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/204-jffs2_eofdetect.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/208-rtl8110sb_fix.patch8
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/209-mini_fo.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/213-kobject_uevent.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/220-sound_kconfig.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/400-ledtrig_morse.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/401-led_alix.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/402-ledtrig_default_on.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/410-gpio_buttons.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/420-gpiodev.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/510-yaffs_support.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/600-phy_extension.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/601-br2684-routed-support.patch68
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/700-powerpc_git.patch2530
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/801-usb_serial_endpoint_size.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/840-unable_to_open_console.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/850-jffs2_erase_progress_indicator.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/900-headers_type_and_time.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/902-darwin_scripts_include.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/903-hostap_txpower.patch14
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/903-stddef_include.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/904-ls_time_locale.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/921-gpio_spi_driver.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/922-w1_gpio_driver_backport.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/930-ppc_big_endian_io_memory_accessors.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/940-arm_mach_types.patch16
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/950-mtd_cfi_intel_p33_compatbility.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/975-crypto_kconfig_hacks.patch8
54 files changed, 1474 insertions, 1474 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.24/001-squashfs.patch b/target/linux/generic-2.6/patches-2.6.24/001-squashfs.patch
index c535c34..1db4091 100644
--- a/target/linux/generic-2.6/patches-2.6.24/001-squashfs.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/001-squashfs.patch
@@ -1,6 +1,6 @@
--- a/fs/Kconfig
+++ b/fs/Kconfig
-@@ -1405,6 +1405,71 @@
+@@ -1405,6 +1405,71 @@ config CRAMFS
If unsure, say N.
@@ -74,7 +74,7 @@
depends on BLOCK
--- a/fs/Makefile
+++ b/fs/Makefile
-@@ -72,6 +72,7 @@
+@@ -72,6 +72,7 @@ obj-$(CONFIG_JBD) += jbd/
obj-$(CONFIG_JBD2) += jbd2/
obj-$(CONFIG_EXT2_FS) += ext2/
obj-$(CONFIG_CRAMFS) += cramfs/
@@ -4128,7 +4128,7 @@
#include <linux/initrd.h>
#include <linux/string.h>
-@@ -39,6 +40,7 @@
+@@ -39,6 +40,7 @@ static int __init crd_load(int in_fd, in
* numbers could not be found.
*
* We currently check for the following magic numbers:
@@ -4136,7 +4136,7 @@
* minix
* ext2
* romfs
-@@ -53,6 +55,7 @@
+@@ -53,6 +55,7 @@ identify_ramdisk_image(int fd, int start
struct ext2_super_block *ext2sb;
struct romfs_super_block *romfsb;
struct cramfs_super *cramfsb;
@@ -4144,7 +4144,7 @@
int nblocks = -1;
unsigned char *buf;
-@@ -64,6 +67,7 @@
+@@ -64,6 +67,7 @@ identify_ramdisk_image(int fd, int start
ext2sb = (struct ext2_super_block *) buf;
romfsb = (struct romfs_super_block *) buf;
cramfsb = (struct cramfs_super *) buf;
@@ -4152,7 +4152,7 @@
memset(buf, 0xe5, size);
/*
-@@ -101,6 +105,15 @@
+@@ -101,6 +105,15 @@ identify_ramdisk_image(int fd, int start
goto done;
}
diff --git a/target/linux/generic-2.6/patches-2.6.24/002-lzma_decompress.patch b/target/linux/generic-2.6/patches-2.6.24/002-lzma_decompress.patch
index 5ebf699..4a4e266 100644
--- a/target/linux/generic-2.6/patches-2.6.24/002-lzma_decompress.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/002-lzma_decompress.patch
@@ -769,7 +769,7 @@
+}
--- a/lib/Makefile
+++ b/lib/Makefile
-@@ -14,7 +14,7 @@
+@@ -14,7 +14,7 @@ lib-$(CONFIG_SMP) += cpumask.o
lib-y += kobject.o kref.o klist.o
obj-y += div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \
@@ -778,7 +778,7 @@
ifeq ($(CONFIG_DEBUG_KOBJECT),y)
CFLAGS_kobject.o += -DDEBUG
-@@ -64,6 +64,7 @@
+@@ -64,6 +64,7 @@ obj-$(CONFIG_SMP) += percpu_counter.o
obj-$(CONFIG_AUDIT_GENERIC) += audit.o
obj-$(CONFIG_SWIOTLB) += swiotlb.o
diff --git a/target/linux/generic-2.6/patches-2.6.24/003-squashfs_lzma.patch b/target/linux/generic-2.6/patches-2.6.24/003-squashfs_lzma.patch
index 16cc873..9050e37 100644
--- a/target/linux/generic-2.6/patches-2.6.24/003-squashfs_lzma.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/003-squashfs_lzma.patch
@@ -38,7 +38,7 @@
static void squashfs_put_super(struct super_block *);
static int squashfs_statfs(struct dentry *, struct kstatfs *);
static int squashfs_symlink_readpage(struct file *file, struct page *page);
-@@ -64,7 +81,11 @@
+@@ -64,7 +81,11 @@ static int squashfs_get_sb(struct file_s
const char *, void *, struct vfsmount *);
@@ -50,7 +50,7 @@
static struct file_system_type squashfs_fs_type = {
.owner = THIS_MODULE,
-@@ -249,6 +270,15 @@
+@@ -249,6 +270,15 @@ SQSH_EXTERN unsigned int squashfs_read_d
if (compressed) {
int zlib_err;
@@ -66,7 +66,7 @@
stream.next_in = c_buffer;
stream.avail_in = c_byte;
stream.next_out = buffer;
-@@ -263,7 +293,7 @@
+@@ -263,7 +293,7 @@ SQSH_EXTERN unsigned int squashfs_read_d
bytes = 0;
} else
bytes = stream.total_out;
@@ -75,7 +75,7 @@
up(&msblk->read_data_mutex);
}
-@@ -2045,15 +2075,19 @@
+@@ -2045,15 +2075,19 @@ static int __init init_squashfs_fs(void)
printk(KERN_INFO "squashfs: version 3.0 (2006/03/15) "
"Phillip Lougher\n");
@@ -95,7 +95,7 @@
destroy_inodecache();
}
-@@ -2064,7 +2098,9 @@
+@@ -2064,7 +2098,9 @@ out:
static void __exit exit_squashfs_fs(void)
{
diff --git a/target/linux/generic-2.6/patches-2.6.24/004-extra_optimization.patch b/target/linux/generic-2.6/patches-2.6.24/004-extra_optimization.patch
index a6810cd..9167a7b 100644
--- a/target/linux/generic-2.6/patches-2.6.24/004-extra_optimization.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/004-extra_optimization.patch
@@ -1,6 +1,6 @@
--- a/Makefile
+++ b/Makefile
-@@ -527,6 +527,9 @@
+@@ -527,6 +527,9 @@ KBUILD_CFLAGS += $(call cc-optio
NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
CHECKFLAGS += $(NOSTDINC_FLAGS)
diff --git a/target/linux/generic-2.6/patches-2.6.24/005-squashfs_fix.patch b/target/linux/generic-2.6/patches-2.6.24/005-squashfs_fix.patch
index 961829e..56b7fc2 100644
--- a/target/linux/generic-2.6/patches-2.6.24/005-squashfs_fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/005-squashfs_fix.patch
@@ -8,7 +8,7 @@
#include <linux/squashfs_fs_sb.h>
#include <linux/squashfs_fs_i.h>
#include <linux/buffer_head.h>
-@@ -2125,7 +2126,7 @@
+@@ -2125,7 +2126,7 @@ static void squashfs_destroy_inode(struc
}
diff --git a/target/linux/generic-2.6/patches-2.6.24/006-gcc4_inline_fix.patch b/target/linux/generic-2.6/patches-2.6.24/006-gcc4_inline_fix.patch
index dbb7e7c..cd62e9c 100644
--- a/target/linux/generic-2.6/patches-2.6.24/006-gcc4_inline_fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/006-gcc4_inline_fix.patch
@@ -1,6 +1,6 @@
--- a/include/asm-mips/system.h
+++ b/include/asm-mips/system.h
-@@ -185,7 +185,7 @@
+@@ -185,7 +185,7 @@ extern __u64 __xchg_u64_unsupported_on_3
if something tries to do an invalid xchg(). */
extern void __xchg_called_with_bad_pointer(void);
diff --git a/target/linux/generic-2.6/patches-2.6.24/007-samsung_flash.patch b/target/linux/generic-2.6/patches-2.6.24/007-samsung_flash.patch
index 335ffd9..1d679e0 100644
--- a/target/linux/generic-2.6/patches-2.6.24/007-samsung_flash.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/007-samsung_flash.patch
@@ -8,7 +8,7 @@
static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
-@@ -294,12 +295,19 @@
+@@ -294,12 +295,19 @@ struct mtd_info *cfi_cmdset_0002(struct
if (extp->MajorVersion != '1' ||
(extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
diff --git a/target/linux/generic-2.6/patches-2.6.24/009-revert_intel_flash_breakage.patch b/target/linux/generic-2.6/patches-2.6.24/009-revert_intel_flash_breakage.patch
index bff4512..0237dca 100644
--- a/target/linux/generic-2.6/patches-2.6.24/009-revert_intel_flash_breakage.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/009-revert_intel_flash_breakage.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
-@@ -944,7 +944,7 @@
+@@ -944,7 +944,7 @@ static void __xipram xip_enable(struct m
static int __xipram xip_wait_for_operation(
struct map_info *map, struct flchip *chip,
@@ -9,7 +9,7 @@
{
struct cfi_private *cfi = map->fldrv_priv;
struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
-@@ -953,7 +953,7 @@
+@@ -953,7 +953,7 @@ static int __xipram xip_wait_for_operati
flstate_t oldstate, newstate;
start = xip_currtime();
@@ -18,7 +18,7 @@
if (usec == 0)
usec = 500000;
done = 0;
-@@ -1063,8 +1063,8 @@
+@@ -1063,8 +1063,8 @@ static int __xipram xip_wait_for_operati
#define XIP_INVAL_CACHED_RANGE(map, from, size) \
INVALIDATE_CACHED_RANGE(map, from, size)
@@ -29,7 +29,7 @@
#else
-@@ -1076,65 +1076,65 @@
+@@ -1076,65 +1076,65 @@ static int __xipram xip_wait_for_operati
static int inval_cache_and_wait_for_operation(
struct map_info *map, struct flchip *chip,
unsigned long cmd_adr, unsigned long inval_adr, int inval_len,
@@ -130,7 +130,7 @@
/* Done and happy. */
chip->state = FL_STATUS;
return 0;
-@@ -1143,7 +1143,8 @@
+@@ -1143,7 +1143,8 @@ static int inval_cache_and_wait_for_oper
#endif
#define WAIT_TIMEOUT(map, chip, adr, udelay) \
@@ -140,7 +140,7 @@
static int do_point_onechip (struct map_info *map, struct flchip *chip, loff_t adr, size_t len)
-@@ -1374,7 +1375,7 @@
+@@ -1374,7 +1375,7 @@ static int __xipram do_write_oneword(str
ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
adr, map_bankwidth(map),
@@ -149,7 +149,7 @@
if (ret) {
xip_enable(map, chip, adr);
printk(KERN_ERR "%s: word write error (status timeout)\n", map->name);
-@@ -1614,7 +1615,7 @@
+@@ -1614,7 +1615,7 @@ static int __xipram do_write_buffer(stru
ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr,
initial_adr, initial_len,
@@ -158,7 +158,7 @@
if (ret) {
map_write(map, CMD(0x70), cmd_adr);
chip->state = FL_STATUS;
-@@ -1749,7 +1750,7 @@
+@@ -1749,7 +1750,7 @@ static int __xipram do_erase_oneblock(st
ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
adr, len,
diff --git a/target/linux/generic-2.6/patches-2.6.24/012-mips_cpu_tlb.patch b/target/linux/generic-2.6/patches-2.6.24/012-mips_cpu_tlb.patch
index 3c65405..0b07c30 100644
--- a/target/linux/generic-2.6/patches-2.6.24/012-mips_cpu_tlb.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/012-mips_cpu_tlb.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
-@@ -902,7 +902,6 @@
+@@ -902,7 +902,6 @@ static __init void build_tlb_write_entry
case CPU_R10000:
case CPU_R12000:
case CPU_R14000:
@@ -8,7 +8,7 @@
case CPU_SB1:
case CPU_SB1A:
case CPU_4KSC:
-@@ -935,6 +934,7 @@
+@@ -935,6 +934,7 @@ static __init void build_tlb_write_entry
tlbw(p);
break;
diff --git a/target/linux/generic-2.6/patches-2.6.24/013-mips_gdb_stub.patch b/target/linux/generic-2.6/patches-2.6.24/013-mips_gdb_stub.patch
index b50a0de..877fe9b 100644
--- a/target/linux/generic-2.6/patches-2.6.24/013-mips_gdb_stub.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/013-mips_gdb_stub.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/kernel/gdb-stub.c
+++ b/arch/mips/kernel/gdb-stub.c
-@@ -656,6 +656,7 @@
+@@ -656,6 +656,7 @@ void set_async_breakpoint(unsigned long
*epc = (unsigned long)async_breakpoint;
}
@@ -8,7 +8,7 @@
static void kgdb_wait(void *arg)
{
unsigned flags;
-@@ -668,6 +669,7 @@
+@@ -668,6 +669,7 @@ static void kgdb_wait(void *arg)
local_irq_restore(flags);
}
diff --git a/target/linux/generic-2.6/patches-2.6.24/060-block2mtd_init.patch b/target/linux/generic-2.6/patches-2.6.24/060-block2mtd_init.patch
index 4a1c958..f5d9b0c 100644
--- a/target/linux/generic-2.6/patches-2.6.24/060-block2mtd_init.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/060-block2mtd_init.patch
@@ -8,7 +8,7 @@
#include <linux/buffer_head.h>
#include <linux/mutex.h>
#include <linux/mount.h>
-@@ -237,10 +238,11 @@
+@@ -237,10 +238,11 @@ static void block2mtd_free_device(struct
/* FIXME: ensure that mtd->size % erase_size == 0 */
@@ -21,7 +21,7 @@
if (!devname)
return NULL;
-@@ -279,14 +281,18 @@
+@@ -279,14 +281,18 @@ static struct block2mtd_dev *add_device(
/* Setup the MTD structure */
/* make the name contain the block device in */
@@ -45,7 +45,7 @@
dev->mtd.erasesize = erase_size;
dev->mtd.writesize = 1;
dev->mtd.type = MTD_RAM;
-@@ -298,15 +304,18 @@
+@@ -298,15 +304,18 @@ static struct block2mtd_dev *add_device(
dev->mtd.read = block2mtd_read;
dev->mtd.priv = dev;
dev->mtd.owner = THIS_MODULE;
@@ -68,7 +68,7 @@
return dev;
devinit_err:
-@@ -379,9 +388,9 @@
+@@ -379,9 +388,9 @@ static char block2mtd_paramline[80 + 12]
static int block2mtd_setup2(const char *val)
{
@@ -80,7 +80,7 @@
char *name;
size_t erase_size = PAGE_SIZE;
int i, ret;
-@@ -392,7 +401,7 @@
+@@ -392,7 +401,7 @@ static int block2mtd_setup2(const char *
strcpy(str, val);
kill_final_newline(str);
@@ -89,7 +89,7 @@
token[i] = strsep(&str, ",");
if (str)
-@@ -411,8 +420,10 @@
+@@ -411,8 +420,10 @@ static int block2mtd_setup2(const char *
parse_err("illegal erase size");
}
}
@@ -101,7 +101,7 @@
return 0;
}
-@@ -446,7 +457,7 @@
+@@ -446,7 +457,7 @@ static int block2mtd_setup(const char *v
module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
diff --git a/target/linux/generic-2.6/patches-2.6.24/065-rootfs_split.patch b/target/linux/generic-2.6/patches-2.6.24/065-rootfs_split.patch
index a32cb66..6916e06 100644
--- a/target/linux/generic-2.6/patches-2.6.24/065-rootfs_split.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/065-rootfs_split.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
-@@ -47,6 +47,16 @@
+@@ -47,6 +47,16 @@ config MTD_PARTITIONS
devices. Partitioning on NFTL 'devices' is a different - that's the
'normal' form of partitioning used on a block device.
@@ -28,7 +28,7 @@
/* Our partition linked list */
static LIST_HEAD(mtd_partitions);
-@@ -39,7 +41,7 @@
+@@ -39,7 +41,7 @@ struct mtd_part {
* the pointer to that structure with this macro.
*/
#define PART(x) ((struct mtd_part *)(x))
@@ -37,7 +37,7 @@
/*
* MTD methods which simply translate the effective address and pass through
-@@ -308,6 +310,312 @@
+@@ -308,6 +310,312 @@ int del_mtd_partitions(struct mtd_info *
return 0;
}
@@ -350,7 +350,7 @@
/*
* This function, given a master MTD object and a partition table, creates
* and registers slave MTD objects which are bound to the master according to
-@@ -320,168 +628,31 @@
+@@ -320,168 +628,31 @@ int add_mtd_partitions(struct mtd_info *
int nbparts)
{
struct mtd_part *slave;
@@ -540,7 +540,7 @@
}
}
-@@ -557,6 +728,32 @@
+@@ -557,6 +728,32 @@ int parse_mtd_partitions(struct mtd_info
return ret;
}
@@ -575,7 +575,7 @@
EXPORT_SYMBOL_GPL(deregister_mtd_parser);
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
-@@ -34,6 +34,8 @@
+@@ -34,6 +34,8 @@ struct block2mtd_dev {
struct block_device *blkdev;
struct mtd_info mtd;
struct mutex write_mutex;
@@ -584,7 +584,7 @@
};
-@@ -86,6 +88,12 @@
+@@ -86,6 +88,12 @@ static int block2mtd_erase(struct mtd_in
size_t len = instr->len;
int err;
@@ -597,7 +597,7 @@
instr->state = MTD_ERASING;
mutex_lock(&dev->write_mutex);
err = _block2mtd_erase(dev, from, len);
-@@ -98,6 +106,10 @@
+@@ -98,6 +106,10 @@ static int block2mtd_erase(struct mtd_in
instr->state = MTD_ERASE_DONE;
mtd_erase_callback(instr);
@@ -608,7 +608,7 @@
return err;
}
-@@ -109,10 +121,14 @@
+@@ -109,10 +121,14 @@ static int block2mtd_read(struct mtd_inf
struct page *page;
int index = from >> PAGE_SHIFT;
int offset = from & (PAGE_SIZE-1);
@@ -626,7 +626,7 @@
if (from + len > mtd->size)
len = mtd->size - from;
-@@ -127,10 +143,14 @@
+@@ -127,10 +143,14 @@ static int block2mtd_read(struct mtd_inf
len = len - cpylen;
page = page_read(dev->blkdev->bd_inode->i_mapping, index);
@@ -645,7 +645,7 @@
memcpy(buf, page_address(page) + offset, cpylen);
page_cache_release(page);
-@@ -141,7 +161,10 @@
+@@ -141,7 +161,10 @@ static int block2mtd_read(struct mtd_inf
offset = 0;
index++;
}
@@ -657,7 +657,7 @@
}
-@@ -193,12 +216,22 @@
+@@ -193,12 +216,22 @@ static int block2mtd_write(struct mtd_in
size_t *retlen, const u_char *buf)
{
struct block2mtd_dev *dev = mtd->priv;
@@ -684,7 +684,7 @@
if (to + len > mtd->size)
len = mtd->size - to;
-@@ -207,6 +240,9 @@
+@@ -207,6 +240,9 @@ static int block2mtd_write(struct mtd_in
mutex_unlock(&dev->write_mutex);
if (err > 0)
err = 0;
@@ -694,7 +694,7 @@
return err;
}
-@@ -215,51 +251,29 @@
+@@ -215,51 +251,29 @@ static int block2mtd_write(struct mtd_in
static void block2mtd_sync(struct mtd_info *mtd)
{
struct block2mtd_dev *dev = mtd->priv;
@@ -754,7 +754,7 @@
if (devt) {
bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
}
-@@ -267,17 +281,96 @@
+@@ -267,17 +281,96 @@ static struct block2mtd_dev *add_device(
#endif
if (IS_ERR(bdev)) {
@@ -854,7 +854,7 @@
/* Setup the MTD structure */
/* make the name contain the block device in */
-@@ -304,6 +397,7 @@
+@@ -304,6 +397,7 @@ static struct block2mtd_dev *add_device(
dev->mtd.read = block2mtd_read;
dev->mtd.priv = dev;
dev->mtd.owner = THIS_MODULE;
@@ -872,7 +872,7 @@
#include <asm/uaccess.h>
-@@ -754,6 +755,13 @@
+@@ -754,6 +755,13 @@ static int mtd_ioctl(struct inode *inode
file->f_pos = 0;
break;
}
@@ -888,7 +888,7 @@
ret = -ENOTTY;
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
-@@ -98,6 +98,7 @@
+@@ -98,6 +98,7 @@ struct mtd_oob_ops {
uint8_t *oobbuf;
};
@@ -896,7 +896,7 @@
struct mtd_info {
u_char type;
u_int32_t flags;
-@@ -202,6 +203,9 @@
+@@ -202,6 +203,9 @@ struct mtd_info {
struct module *owner;
int usecount;
@@ -916,7 +916,7 @@
struct mtd_partition {
char *name; /* identifier string */
u_int32_t size; /* partition size */
-@@ -43,6 +44,7 @@
+@@ -43,6 +44,7 @@ struct mtd_partition {
u_int32_t mask_flags; /* master MTD flags to mask out for this partition */
struct nand_ecclayout *ecclayout; /* out of band layout for this partition (NAND only)*/
struct mtd_info **mtdp; /* pointer to store the MTD object */
@@ -924,7 +924,7 @@
};
#define MTDPART_OFS_NXTBLK (-2)
-@@ -52,6 +54,7 @@
+@@ -52,6 +54,7 @@ struct mtd_partition {
int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
int del_mtd_partitions(struct mtd_info *);
@@ -934,7 +934,7 @@
* Functions dealing with the various ways of partitioning the space
--- a/include/mtd/mtd-abi.h
+++ b/include/mtd/mtd-abi.h
-@@ -95,6 +95,7 @@
+@@ -95,6 +95,7 @@ struct otp_info {
#define ECCGETLAYOUT _IOR('M', 17, struct nand_ecclayout)
#define ECCGETSTATS _IOR('M', 18, struct mtd_ecc_stats)
#define MTDFILEMODE _IO('M', 19)
diff --git a/target/linux/generic-2.6/patches-2.6.24/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.24/070-redboot_space.patch
index b4d57cb..940536d 100644
--- a/target/linux/generic-2.6/patches-2.6.24/070-redboot_space.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/070-redboot_space.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/redboot.c
+++ b/drivers/mtd/redboot.c
-@@ -236,14 +236,21 @@
+@@ -236,14 +236,21 @@ static int parse_redboot_partitions(stru
#endif
names += strlen(names)+1;
diff --git a/target/linux/generic-2.6/patches-2.6.24/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic-2.6/patches-2.6.24/080-mtd_plat_nand_chip_fixup.patch
index ef885ed..61f2806 100644
--- a/target/linux/generic-2.6/patches-2.6.24/080-mtd_plat_nand_chip_fixup.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/080-mtd_plat_nand_chip_fixup.patch
@@ -1,6 +1,6 @@
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
-@@ -573,6 +573,7 @@
+@@ -573,6 +573,7 @@ struct platform_nand_chip {
int chip_delay;
unsigned int options;
const char **part_probe_types;
@@ -10,7 +10,7 @@
--- a/drivers/mtd/nand/plat_nand.c
+++ b/drivers/mtd/nand/plat_nand.c
-@@ -70,7 +70,18 @@
+@@ -70,7 +70,18 @@ static int __init plat_nand_probe(struct
platform_set_drvdata(pdev, data);
/* Scan to find existance of the device */
diff --git a/target/linux/generic-2.6/patches-2.6.24/100-netfilter_layer7_2.17.patch b/target/linux/generic-2.6/patches-2.6.24/100-netfilter_layer7_2.17.patch
index cbe6d81..9315486 100644
--- a/target/linux/generic-2.6/patches-2.6.24/100-netfilter_layer7_2.17.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/100-netfilter_layer7_2.17.patch
@@ -1,6 +1,6 @@
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
-@@ -633,6 +633,27 @@
+@@ -633,6 +633,27 @@ config NETFILTER_XT_MATCH_STATE
To compile it as a module, choose M here. If unsure, say N.
@@ -30,7 +30,7 @@
depends on NETFILTER_XTABLES
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
-@@ -73,6 +73,7 @@
+@@ -73,6 +73,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_QUOTA) +
obj-$(CONFIG_NETFILTER_XT_MATCH_REALM) += xt_realm.o
obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
@@ -2027,7 +2027,7 @@
+}
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
-@@ -206,6 +206,14 @@
+@@ -206,6 +206,14 @@ destroy_conntrack(struct nf_conntrack *n
* too. */
nf_ct_remove_expectations(ct);
@@ -2044,7 +2044,7 @@
BUG_ON(hlist_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnode));
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
-@@ -180,7 +180,12 @@
+@@ -180,7 +180,12 @@ static int ct_seq_show(struct seq_file *
return -ENOSPC;
#endif
@@ -2060,7 +2060,7 @@
return 0;
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
-@@ -124,6 +124,22 @@
+@@ -124,6 +124,22 @@ struct nf_conn
u_int32_t secmark;
#endif
diff --git a/target/linux/generic-2.6/patches-2.6.24/101-netfilter_layer7_pktmatch.patch b/target/linux/generic-2.6/patches-2.6.24/101-netfilter_layer7_pktmatch.patch
index 167d578..be2dff8 100644
--- a/target/linux/generic-2.6/patches-2.6.24/101-netfilter_layer7_pktmatch.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/101-netfilter_layer7_pktmatch.patch
@@ -1,6 +1,6 @@
--- a/include/linux/netfilter/xt_layer7.h
+++ b/include/linux/netfilter/xt_layer7.h
-@@ -8,6 +8,7 @@
+@@ -8,6 +8,7 @@ struct xt_layer7_info {
char protocol[MAX_PROTOCOL_LEN];
char pattern[MAX_PATTERN_LEN];
u_int8_t invert;
@@ -10,7 +10,7 @@
#endif /* _XT_LAYER7_H */
--- a/net/netfilter/xt_layer7.c
+++ b/net/netfilter/xt_layer7.c
-@@ -297,34 +297,36 @@
+@@ -297,34 +297,36 @@ static int match_no_append(struct nf_con
}
/* add the new app data to the conntrack. Return number of bytes added. */
@@ -61,7 +61,7 @@
return length;
}
-@@ -411,7 +413,7 @@
+@@ -411,7 +413,7 @@ match(const struct sk_buff *skbin,
const struct xt_layer7_info * info = matchinfo;
enum ip_conntrack_info master_ctinfo, ctinfo;
struct nf_conn *master_conntrack, *conntrack;
@@ -70,7 +70,7 @@
unsigned int pattern_result, appdatalen;
regexp * comppattern;
-@@ -439,8 +441,8 @@
+@@ -439,8 +441,8 @@ match(const struct sk_buff *skbin,
master_conntrack = master_ct(master_conntrack);
/* if we've classified it or seen too many packets */
@@ -81,7 +81,7 @@
pattern_result = match_no_append(conntrack, master_conntrack,
ctinfo, master_ctinfo, info);
-@@ -473,6 +475,25 @@
+@@ -473,6 +475,25 @@ match(const struct sk_buff *skbin,
/* 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.24/110-ipp2p_0.8.1rc1.patch b/target/linux/generic-2.6/patches-2.6.24/110-ipp2p_0.8.1rc1.patch
index 3000af7..232c163 100644
--- a/target/linux/generic-2.6/patches-2.6.24/110-ipp2p_0.8.1rc1.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/110-ipp2p_0.8.1rc1.patch
@@ -893,7 +893,7 @@
+
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
-@@ -63,6 +63,12 @@
+@@ -63,6 +63,12 @@ config IP_NF_MATCH_IPRANGE
To compile it as a module, choose M here. If unsure, say N.
@@ -908,7 +908,7 @@
depends on IP_NF_IPTABLES
--- a/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
-@@ -50,6 +50,8 @@
+@@ -50,6 +50,8 @@ obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_
obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o
obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
diff --git a/target/linux/generic-2.6/patches-2.6.24/130-netfilter_ipset.patch b/target/linux/generic-2.6/patches-2.6.24/130-netfilter_ipset.patch
index cee1cdc..52b272c 100644
--- a/target/linux/generic-2.6/patches-2.6.24/130-netfilter_ipset.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/130-netfilter_ipset.patch
@@ -1,7 +1,7 @@
--- a/include/linux/netfilter_ipv4/Kbuild
+++ b/include/linux/netfilter_ipv4/Kbuild
-@@ -45,3 +45,14 @@
-
+@@ -45,3 +45,14 @@ header-y += ipt_ttl.h
+
unifdef-y += ip_queue.h
unifdef-y += ip_tables.h
+
@@ -7534,7 +7534,7 @@
+module_exit(ipt_SET_fini);
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
-@@ -408,5 +408,122 @@
+@@ -408,5 +408,122 @@ config IP_NF_ARP_MANGLE
Allows altering the ARP packet payload: source and destination
hardware and network addresses.
@@ -7659,7 +7659,7 @@
--- a/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
-@@ -49,6 +49,7 @@
+@@ -49,6 +49,7 @@ obj-$(CONFIG_IP_NF_MATCH_OWNER) += ipt_o
obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o
obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
@@ -7667,7 +7667,7 @@
obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o
-@@ -64,6 +65,18 @@
+@@ -64,6 +65,18 @@ obj-$(CONFIG_IP_NF_TARGET_SAME) += ipt_S
obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TOS.o
obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o
obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o
diff --git a/target/linux/generic-2.6/patches-2.6.24/140-netfilter_time.patch b/target/linux/generic-2.6/patches-2.6.24/140-netfilter_time.patch
index b29c064..da04359 100644
--- a/target/linux/generic-2.6/patches-2.6.24/140-netfilter_time.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/140-netfilter_time.patch
@@ -204,7 +204,7 @@
+}
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
-@@ -78,6 +78,22 @@
+@@ -78,6 +78,22 @@ config IP_NF_MATCH_TOS
To compile it as a module, choose M here. If unsure, say N.
@@ -229,7 +229,7 @@
depends on IP_NF_IPTABLES
--- a/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
-@@ -50,6 +50,7 @@
+@@ -50,6 +50,7 @@ obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_
obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o
obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o
diff --git a/target/linux/generic-2.6/patches-2.6.24/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.24/150-netfilter_imq.patch
index ec6dfc6..a0d65ed 100644
--- a/target/linux/generic-2.6/patches-2.6.24/150-netfilter_imq.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/150-netfilter_imq.patch
@@ -412,7 +412,7 @@
+MODULE_LICENSE("GPL");
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
-@@ -112,6 +112,129 @@
+@@ -112,6 +112,129 @@ config EQUALIZER
To compile this driver as a module, choose M here: the module
will be called eql. If unsure, say N.
@@ -544,7 +544,7 @@
select CRC32
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
-@@ -139,6 +139,7 @@
+@@ -139,6 +139,7 @@ obj-$(CONFIG_SLHC) += slhc.o
obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
obj-$(CONFIG_DUMMY) += dummy.o
@@ -588,7 +588,7 @@
+#endif /* _IP6T_IMQ_H */
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -295,6 +295,10 @@
+@@ -295,6 +295,10 @@ struct sk_buff {
struct nf_conntrack *nfct;
struct sk_buff *nfct_reasm;
#endif
@@ -599,7 +599,7 @@
#ifdef CONFIG_BRIDGE_NETFILTER
struct nf_bridge_info *nf_bridge;
#endif
-@@ -1728,6 +1732,10 @@
+@@ -1728,6 +1732,10 @@ static inline void __nf_copy(struct sk_b
dst->nfct_reasm = src->nfct_reasm;
nf_conntrack_get_reasm(src->nfct_reasm);
#endif
@@ -622,7 +622,7 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/stat.h>
-@@ -1533,7 +1536,11 @@
+@@ -1533,7 +1536,11 @@ static int dev_gso_segment(struct sk_buf
int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
if (likely(!skb->next)) {
@@ -709,7 +709,7 @@
+MODULE_LICENSE("GPL");
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
-@@ -333,6 +333,17 @@
+@@ -333,6 +333,17 @@ config IP_NF_MANGLE
To compile it as a module, choose M here. If unsure, say N.
@@ -729,7 +729,7 @@
depends on IP_NF_MANGLE
--- a/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
-@@ -58,6 +58,7 @@
+@@ -58,6 +58,7 @@ obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_i
obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o
obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o
@@ -811,7 +811,7 @@
+MODULE_LICENSE("GPL");
--- a/net/ipv6/netfilter/Kconfig
+++ b/net/ipv6/netfilter/Kconfig
-@@ -173,6 +173,15 @@
+@@ -173,6 +173,15 @@ config IP6_NF_MANGLE
To compile it as a module, choose M here. If unsure, say N.
@@ -839,7 +839,7 @@
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
-@@ -176,6 +176,11 @@
+@@ -176,6 +176,11 @@ static inline int qdisc_restart(struct n
return ret;
}
@@ -851,7 +851,7 @@
void __qdisc_run(struct net_device *dev)
{
unsigned long start_time = jiffies;
-@@ -650,3 +655,4 @@
+@@ -650,3 +655,4 @@ EXPORT_SYMBOL(qdisc_destroy);
EXPORT_SYMBOL(qdisc_reset);
EXPORT_SYMBOL(qdisc_lock_tree);
EXPORT_SYMBOL(qdisc_unlock_tree);
diff --git a/target/linux/generic-2.6/patches-2.6.24/170-netfilter_chaostables_0.8.patch b/target/linux/generic-2.6/patches-2.6.24/170-netfilter_chaostables_0.8.patch
index cab16af..70d0531 100644
--- a/target/linux/generic-2.6/patches-2.6.24/170-netfilter_chaostables_0.8.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/170-netfilter_chaostables_0.8.patch
@@ -1,6 +1,6 @@
--- a/include/linux/netfilter/Kbuild
+++ b/include/linux/netfilter/Kbuild
-@@ -3,6 +3,7 @@
+@@ -3,6 +3,7 @@ header-y += nf_conntrack_tuple_common.h
header-y += nfnetlink_conntrack.h
header-y += nfnetlink_log.h
header-y += nfnetlink_queue.h
@@ -105,7 +105,7 @@
+#define xt_request_find_match xt_request_find_match_lo
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
-@@ -265,6 +265,14 @@
+@@ -265,6 +265,14 @@ config NETFILTER_XTABLES
# alphabetically ordered list of targets
@@ -120,7 +120,7 @@
config NETFILTER_XT_TARGET_CLASSIFY
tristate '"CLASSIFY" target support'
depends on NETFILTER_XTABLES
-@@ -292,6 +300,14 @@
+@@ -292,6 +300,14 @@ config NETFILTER_XT_TARGET_CONNMARK
<file:Documentation/kbuild/modules.txt>. The module will be called
ipt_CONNMARK.ko. If unsure, say `N'.
@@ -135,7 +135,7 @@
config NETFILTER_XT_TARGET_DSCP
tristate '"DSCP" target support'
depends on NETFILTER_XTABLES
-@@ -556,6 +572,14 @@
+@@ -556,6 +572,14 @@ config NETFILTER_XT_MATCH_POLICY
To compile it as a module, choose M here. If unsure, say N.
@@ -152,7 +152,7 @@
depends on NETFILTER_XTABLES
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
-@@ -49,6 +49,8 @@
+@@ -49,6 +49,8 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK
obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK) += xt_SECMARK.o
obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o
obj-$(CONFIG_NETFILTER_XT_TARGET_TRACE) += xt_TRACE.o
@@ -161,7 +161,7 @@
# matches
obj-$(CONFIG_NETFILTER_XT_MATCH_COMMENT) += xt_comment.o
-@@ -79,3 +81,4 @@
+@@ -79,3 +81,4 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_STRING)
obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
obj-$(CONFIG_NETFILTER_XT_MATCH_TIME) += xt_time.o
obj-$(CONFIG_NETFILTER_XT_MATCH_U32) += xt_u32.o
@@ -843,7 +843,7 @@
+MODULE_ALIAS("ipt_portscan");
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
-@@ -1564,6 +1564,8 @@
+@@ -1564,6 +1564,8 @@ __u32 secure_tcp_sequence_number(__be32
return seq;
}
diff --git a/target/linux/generic-2.6/patches-2.6.24/171-netfilter_tarpit.patch b/target/linux/generic-2.6/patches-2.6.24/171-netfilter_tarpit.patch
index 2ebb669..4c0ecbf 100644
--- a/target/linux/generic-2.6/patches-2.6.24/171-netfilter_tarpit.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/171-netfilter_tarpit.patch
@@ -1,6 +1,6 @@
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
-@@ -401,6 +401,23 @@
+@@ -401,6 +401,23 @@ config NETFILTER_XT_TARGET_CONNSECMARK
To compile it as a module, choose M here. If unsure, say N.
@@ -26,7 +26,7 @@
depends on NETFILTER_XTABLES && (IPV6 || IPV6=n)
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
-@@ -47,6 +47,7 @@
+@@ -47,6 +47,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG)
obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE) += xt_NFQUEUE.o
obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK) += xt_NOTRACK.o
obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK) += xt_SECMARK.o
diff --git a/target/linux/generic-2.6/patches-2.6.24/180-netfilter_depends.patch b/target/linux/generic-2.6/patches-2.6.24/180-netfilter_depends.patch
index bb5de23..48afaea 100644
--- a/target/linux/generic-2.6/patches-2.6.24/180-netfilter_depends.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/180-netfilter_depends.patch
@@ -1,6 +1,6 @@
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
-@@ -143,7 +143,7 @@
+@@ -143,7 +143,7 @@ config NF_CONNTRACK_FTP
config NF_CONNTRACK_H323
tristate "H.323 protocol support (EXPERIMENTAL)"
@@ -9,7 +9,7 @@
help
H.323 is a VoIP signalling protocol from ITU-T. As one of the most
important VoIP protocols, it is widely used by voice hardware and
-@@ -420,7 +420,7 @@
+@@ -420,7 +420,7 @@ config NETFILTER_XT_TARGET_TARPIT
config NETFILTER_XT_TARGET_TCPMSS
tristate '"TCPMSS" target support'
diff --git a/target/linux/generic-2.6/patches-2.6.24/190-netfilter_rtsp.patch b/target/linux/generic-2.6/patches-2.6.24/190-netfilter_rtsp.patch
index 6e6abc7..f064e2e 100644
--- a/target/linux/generic-2.6/patches-2.6.24/190-netfilter_rtsp.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/190-netfilter_rtsp.patch
@@ -294,7 +294,7 @@
+#endif /* _NETFILTER_MIME_H */
--- a/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
-@@ -23,6 +23,7 @@
+@@ -23,6 +23,7 @@ obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_am
obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o
obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o
obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o
@@ -304,7 +304,7 @@
obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
-@@ -249,6 +249,16 @@
+@@ -249,6 +249,16 @@ config NF_CONNTRACK_TFTP
To compile it as a module, choose M here. If unsure, say N.
@@ -323,7 +323,7 @@
depends on EXPERIMENTAL && NF_CONNTRACK && NETFILTER_NETLINK
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
-@@ -33,6 +33,7 @@
+@@ -33,6 +33,7 @@ obj-$(CONFIG_NF_CONNTRACK_PPTP) += nf_co
obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o
obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o
@@ -333,7 +333,7 @@
obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
-@@ -296,6 +296,11 @@
+@@ -296,6 +296,11 @@ config NF_NAT_IRC
depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
default NF_NAT && NF_CONNTRACK_IRC
diff --git a/target/linux/generic-2.6/patches-2.6.24/200-sched_esfq.patch b/target/linux/generic-2.6/patches-2.6.24/200-sched_esfq.patch
index f9d16f3..0596539 100644
--- a/target/linux/generic-2.6/patches-2.6.24/200-sched_esfq.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/200-sched_esfq.patch
@@ -1,6 +1,6 @@
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
-@@ -155,8 +155,37 @@
+@@ -155,8 +155,37 @@ struct tc_sfq_qopt
*
* The only reason for this is efficiency, it is possible
* to change these parameters in compile time.
@@ -40,7 +40,7 @@
enum
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
-@@ -139,6 +139,37 @@
+@@ -139,6 +139,37 @@ config NET_SCH_SFQ
To compile this code as a module, choose M here: the
module will be called sch_sfq.
@@ -80,7 +80,7 @@
---help---
--- a/net/sched/Makefile
+++ b/net/sched/Makefile
-@@ -23,6 +23,7 @@
+@@ -23,6 +23,7 @@ obj-$(CONFIG_NET_SCH_GRED) += sch_gred.o
obj-$(CONFIG_NET_SCH_INGRESS) += sch_ingress.o
obj-$(CONFIG_NET_SCH_DSMARK) += sch_dsmark.o
obj-$(CONFIG_NET_SCH_SFQ) += sch_sfq.o
diff --git a/target/linux/generic-2.6/patches-2.6.24/202-mips-freestanding.patch b/target/linux/generic-2.6/patches-2.6.24/202-mips-freestanding.patch
index a141a66..e8da7e7 100644
--- a/target/linux/generic-2.6/patches-2.6.24/202-mips-freestanding.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/202-mips-freestanding.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
-@@ -576,6 +576,9 @@
+@@ -576,6 +576,9 @@ core-$(CONFIG_TOSHIBA_RBTX4938) += arch/
cflags-$(CONFIG_TOSHIBA_RBTX4938) += -Iinclude/asm-mips/mach-tx49xx
load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000
diff --git a/target/linux/generic-2.6/patches-2.6.24/204-jffs2_eofdetect.patch b/target/linux/generic-2.6/patches-2.6.24/204-jffs2_eofdetect.patch
index 5053401..eccdbe2 100644
--- a/target/linux/generic-2.6/patches-2.6.24/204-jffs2_eofdetect.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/204-jffs2_eofdetect.patch
@@ -1,6 +1,6 @@
--- a/fs/jffs2/build.c
+++ b/fs/jffs2/build.c
-@@ -105,6 +105,17 @@
+@@ -105,6 +105,17 @@ static int jffs2_build_filesystem(struct
dbg_fsbuild("scanned flash completely\n");
jffs2_dbg_dump_block_lists_nolock(c);
@@ -20,7 +20,7 @@
/* Now scan the directory tree, increasing nlink according to every dirent found. */
--- a/fs/jffs2/scan.c
+++ b/fs/jffs2/scan.c
-@@ -142,9 +142,12 @@
+@@ -142,9 +142,12 @@ int jffs2_scan_medium(struct jffs2_sb_in
/* reset summary info for next eraseblock scan */
jffs2_sum_reset_collected(s);
@@ -36,7 +36,7 @@
if (ret < 0)
goto out;
-@@ -545,6 +548,17 @@
+@@ -545,6 +548,17 @@ static int jffs2_scan_eraseblock (struct
return err;
}
diff --git a/target/linux/generic-2.6/patches-2.6.24/208-rtl8110sb_fix.patch b/target/linux/generic-2.6/patches-2.6.24/208-rtl8110sb_fix.patch
index 2339bd2..8f99a0e 100644
--- a/target/linux/generic-2.6/patches-2.6.24/208-rtl8110sb_fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/208-rtl8110sb_fix.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
-@@ -1537,7 +1537,7 @@
+@@ -1537,7 +1537,7 @@ static const struct rtl_cfg_info {
.hw_start = rtl_hw_start_8169,
.region = 1,
.align = 0,
@@ -9,7 +9,7 @@
RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
.napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
.msi = 0
-@@ -1546,7 +1546,7 @@
+@@ -1546,7 +1546,7 @@ static const struct rtl_cfg_info {
.hw_start = rtl_hw_start_8168,
.region = 2,
.align = 8,
@@ -18,7 +18,7 @@
TxErr | TxOK | RxOK | RxErr,
.napi_event = TxErr | TxOK | RxOK | RxOverflow,
.msi = RTL_FEATURE_MSI
-@@ -1555,7 +1555,7 @@
+@@ -1555,7 +1555,7 @@ static const struct rtl_cfg_info {
.hw_start = rtl_hw_start_8101,
.region = 2,
.align = 8,
@@ -27,7 +27,7 @@
RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
.napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
.msi = RTL_FEATURE_MSI
-@@ -2903,10 +2903,12 @@
+@@ -2903,10 +2903,12 @@ static irqreturn_t rtl8169_interrupt(int
break;
}
diff --git a/target/linux/generic-2.6/patches-2.6.24/209-mini_fo.patch b/target/linux/generic-2.6/patches-2.6.24/209-mini_fo.patch
index f316cbb..511f203 100644
--- a/target/linux/generic-2.6/patches-2.6.24/209-mini_fo.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/209-mini_fo.patch
@@ -1,6 +1,6 @@
--- a/fs/Kconfig
+++ b/fs/Kconfig
-@@ -468,6 +468,9 @@
+@@ -468,6 +468,9 @@ config OCFS2_DEBUG_FS
this option for debugging only as it is likely to decrease
performance of the filesystem.
@@ -12,7 +12,7 @@
help
--- a/fs/Makefile
+++ b/fs/Makefile
-@@ -76,6 +76,7 @@
+@@ -76,6 +76,7 @@ obj-$(CONFIG_SQUASHFS) += squashfs/
obj-y += ramfs/
obj-$(CONFIG_HUGETLBFS) += hugetlbfs/
obj-$(CONFIG_CODA_FS) += coda/
diff --git a/target/linux/generic-2.6/patches-2.6.24/213-kobject_uevent.patch b/target/linux/generic-2.6/patches-2.6.24/213-kobject_uevent.patch
index 6f9bbeb..7d4b232 100644
--- a/target/linux/generic-2.6/patches-2.6.24/213-kobject_uevent.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/213-kobject_uevent.patch
@@ -1,6 +1,6 @@
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
-@@ -27,7 +27,8 @@
+@@ -27,7 +27,8 @@ u64 uevent_seqnum;
char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH;
static DEFINE_SPINLOCK(sequence_lock);
#if defined(CONFIG_NET)
@@ -10,7 +10,7 @@
#endif
/* the strings here must match the enum in include/linux/kobject.h */
-@@ -40,6 +41,18 @@
+@@ -40,6 +41,18 @@ static const char *kobject_actions[] = {
[KOBJ_OFFLINE] = "offline",
};
@@ -29,7 +29,7 @@
/**
* kobject_action_type - translate action string to numeric type
*
-@@ -173,9 +186,7 @@
+@@ -173,9 +186,7 @@ int kobject_uevent_env(struct kobject *k
}
/* we will send an event, so request a new sequence number */
diff --git a/target/linux/generic-2.6/patches-2.6.24/220-sound_kconfig.patch b/target/linux/generic-2.6/patches-2.6.24/220-sound_kconfig.patch
index c052f2a..d215d12 100644
--- a/target/linux/generic-2.6/patches-2.6.24/220-sound_kconfig.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/220-sound_kconfig.patch
@@ -1,6 +1,6 @@
--- a/sound/core/Kconfig
+++ b/sound/core/Kconfig
-@@ -9,7 +9,7 @@
+@@ -9,7 +9,7 @@ config SND_PCM
depends on SND
config SND_HWDEP
diff --git a/target/linux/generic-2.6/patches-2.6.24/400-ledtrig_morse.patch b/target/linux/generic-2.6/patches-2.6.24/400-ledtrig_morse.patch
index 10b7677..6db1472 100644
--- a/target/linux/generic-2.6/patches-2.6.24/400-ledtrig_morse.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/400-ledtrig_morse.patch
@@ -1,6 +1,6 @@
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
-@@ -146,4 +146,8 @@
+@@ -146,4 +146,8 @@ config LEDS_TRIGGER_HEARTBEAT
load average.
If unsure, say Y.
@@ -11,7 +11,7 @@
endif # NEW_LEDS
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
-@@ -24,3 +24,4 @@
+@@ -24,3 +24,4 @@ obj-$(CONFIG_LEDS_CM_X270)
obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o
obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK) += ledtrig-ide-disk.o
obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += ledtrig-heartbeat.o
diff --git a/target/linux/generic-2.6/patches-2.6.24/401-led_alix.patch b/target/linux/generic-2.6/patches-2.6.24/401-led_alix.patch
index ff7713d..81afd81 100644
--- a/target/linux/generic-2.6/patches-2.6.24/401-led_alix.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/401-led_alix.patch
@@ -1,6 +1,6 @@
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
-@@ -81,6 +81,12 @@
+@@ -81,6 +81,12 @@ config LEDS_WRAP
help
This option enables support for the PCEngines WRAP programmable LEDs.
@@ -15,7 +15,7 @@
depends on LEDS_CLASS && ARCH_H1940
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
-@@ -14,6 +14,7 @@
+@@ -14,6 +14,7 @@ obj-$(CONFIG_LEDS_S3C24XX) += leds-s3c2
obj-$(CONFIG_LEDS_AMS_DELTA) += leds-ams-delta.o
obj-$(CONFIG_LEDS_NET48XX) += leds-net48xx.o
obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o
diff --git a/target/linux/generic-2.6/patches-2.6.24/402-ledtrig_default_on.patch b/target/linux/generic-2.6/patches-2.6.24/402-ledtrig_default_on.patch
index 2cc3fd6..0e1164c 100644
--- a/target/linux/generic-2.6/patches-2.6.24/402-ledtrig_default_on.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/402-ledtrig_default_on.patch
@@ -1,6 +1,6 @@
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
-@@ -156,4 +156,11 @@
+@@ -156,4 +156,11 @@ config LEDS_TRIGGER_MORSE
tristate "LED Morse Trigger"
depends on LEDS_TRIGGERS
@@ -14,7 +14,7 @@
endif # NEW_LEDS
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
-@@ -26,3 +26,4 @@
+@@ -26,3 +26,4 @@ obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledt
obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK) += ledtrig-ide-disk.o
obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += ledtrig-heartbeat.o
obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o
diff --git a/target/linux/generic-2.6/patches-2.6.24/410-gpio_buttons.patch b/target/linux/generic-2.6/patches-2.6.24/410-gpio_buttons.patch
index c7ede5d..31d40c9 100644
--- a/target/linux/generic-2.6/patches-2.6.24/410-gpio_buttons.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/410-gpio_buttons.patch
@@ -1,6 +1,6 @@
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
-@@ -183,4 +183,20 @@
+@@ -183,4 +183,20 @@ config HP_SDC_RTC
Say Y here if you want to support the built-in real time clock
of the HP SDC controller.
@@ -23,7 +23,7 @@
endif
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
-@@ -18,3 +18,4 @@
+@@ -18,3 +18,4 @@ obj-$(CONFIG_INPUT_POWERMATE) += powerm
obj-$(CONFIG_INPUT_YEALINK) += yealink.o
obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o
obj-$(CONFIG_INPUT_UINPUT) += uinput.o
diff --git a/target/linux/generic-2.6/patches-2.6.24/420-gpiodev.patch b/target/linux/generic-2.6/patches-2.6.24/420-gpiodev.patch
index 9818741..0b184a0 100644
--- a/target/linux/generic-2.6/patches-2.6.24/420-gpiodev.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/420-gpiodev.patch
@@ -1,6 +1,6 @@
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
-@@ -946,6 +946,13 @@
+@@ -946,6 +946,13 @@ config CS5535_GPIO
If compiled as a module, it will be called cs5535_gpio.
@@ -16,7 +16,7 @@
depends on CPU_VR41XX
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
-@@ -93,6 +93,7 @@
+@@ -93,6 +93,7 @@ obj-$(CONFIG_SCx200_GPIO) += scx200_gpio
obj-$(CONFIG_PC8736x_GPIO) += pc8736x_gpio.o
obj-$(CONFIG_NSC_GPIO) += nsc_gpio.o
obj-$(CONFIG_CS5535_GPIO) += cs5535_gpio.o
diff --git a/target/linux/generic-2.6/patches-2.6.24/510-yaffs_support.patch b/target/linux/generic-2.6/patches-2.6.24/510-yaffs_support.patch
index d344136..4553236 100644
--- a/target/linux/generic-2.6/patches-2.6.24/510-yaffs_support.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/510-yaffs_support.patch
@@ -1,6 +1,6 @@
--- a/fs/Kconfig
+++ b/fs/Kconfig
-@@ -420,6 +420,7 @@
+@@ -420,6 +420,7 @@ config FS_POSIX_ACL
source "fs/xfs/Kconfig"
source "fs/gfs2/Kconfig"
@@ -10,7 +10,7 @@
tristate "OCFS2 file system support"
--- a/fs/Makefile
+++ b/fs/Makefile
-@@ -120,3 +120,4 @@
+@@ -120,3 +120,4 @@ obj-$(CONFIG_HPPFS) += hppfs/
obj-$(CONFIG_DEBUG_FS) += debugfs/
obj-$(CONFIG_OCFS2_FS) += ocfs2/
obj-$(CONFIG_GFS2_FS) += gfs2/
diff --git a/target/linux/generic-2.6/patches-2.6.24/600-phy_extension.patch b/target/linux/generic-2.6/patches-2.6.24/600-phy_extension.patch
index 3150f58..ed37e1a 100644
--- a/target/linux/generic-2.6/patches-2.6.24/600-phy_extension.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/600-phy_extension.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
-@@ -345,6 +345,50 @@
+@@ -345,6 +345,50 @@ int phy_ethtool_gset(struct phy_device *
}
EXPORT_SYMBOL(phy_ethtool_gset);
@@ -53,7 +53,7 @@
* @phydev: the phy_device struct
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
-@@ -398,6 +398,7 @@
+@@ -398,6 +398,7 @@ void phy_start_machine(struct phy_device
void phy_stop_machine(struct phy_device *phydev);
int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
diff --git a/target/linux/generic-2.6/patches-2.6.24/601-br2684-routed-support.patch b/target/linux/generic-2.6/patches-2.6.24/601-br2684-routed-support.patch
index 0d68832..3bc2e26 100644
--- a/target/linux/generic-2.6/patches-2.6.24/601-br2684-routed-support.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/601-br2684-routed-support.patch
@@ -37,7 +37,7 @@
};
/*
-@@ -55,10 +65,10 @@
+@@ -55,10 +65,10 @@ struct atm_newif_br2684 {
#define BR2684_FIND_BYNUM (1)
#define BR2684_FIND_BYIFNAME (2)
struct br2684_if_spec {
@@ -51,7 +51,7 @@
} spec;
};
-@@ -68,16 +78,16 @@
+@@ -68,16 +78,16 @@ struct br2684_if_spec {
* is per-backend specific
*/
struct atm_backend_br2684 {
@@ -77,7 +77,7 @@
};
/*
-@@ -86,8 +96,8 @@
+@@ -86,8 +96,8 @@ struct atm_backend_br2684 {
* efficient per-if in/out filters, this support will be removed
*/
struct br2684_filter {
@@ -88,7 +88,7 @@
};
struct br2684_filter_set {
-@@ -95,7 +105,13 @@
+@@ -95,7 +105,13 @@ struct br2684_filter_set {
struct br2684_filter filter;
};
@@ -119,7 +119,7 @@
#include <linux/module.h>
#include <linux/init.h>
-@@ -39,21 +41,35 @@
+@@ -39,21 +41,35 @@ static void skb_debug(const struct sk_bu
#define skb_debug(skb) do {} while (0)
#endif
@@ -162,7 +162,7 @@
enum br2684_encaps encaps;
struct list_head brvccs;
#ifdef CONFIG_ATM_BR2684_IPFILTER
-@@ -66,9 +82,10 @@
+@@ -66,9 +82,10 @@ struct br2684_dev {
struct net_device *net_dev;
struct list_head br2684_devs;
int number;
@@ -174,7 +174,7 @@
};
/*
-@@ -84,7 +101,7 @@
+@@ -84,7 +101,7 @@ static LIST_HEAD(br2684_devs);
static inline struct br2684_dev *BRPRIV(const struct net_device *net_dev)
{
@@ -183,7 +183,7 @@
}
static inline struct net_device *list_entry_brdev(const struct list_head *le)
-@@ -94,7 +111,7 @@
+@@ -94,7 +111,7 @@ static inline struct net_device *list_en
static inline struct br2684_vcc *BR2684_VCC(const struct atm_vcc *atmvcc)
{
@@ -192,7 +192,7 @@
}
static inline struct br2684_vcc *list_entry_brvcc(const struct list_head *le)
-@@ -132,10 +149,11 @@
+@@ -132,10 +149,11 @@ static struct net_device *br2684_find_de
* otherwise false
*/
static int br2684_xmit_vcc(struct sk_buff *skb, struct br2684_dev *brdev,
@@ -205,7 +205,7 @@
if (skb_headroom(skb) < minheadroom) {
struct sk_buff *skb2 = skb_realloc_headroom(skb, minheadroom);
brvcc->copies_needed++;
-@@ -146,23 +164,48 @@
+@@ -146,23 +164,48 @@ static int br2684_xmit_vcc(struct sk_buf
}
skb = skb2;
}
@@ -264,7 +264,7 @@
atomic_add(skb->truesize, &sk_atm(atmvcc)->sk_wmem_alloc);
ATM_SKB(skb)->atm_options = atmvcc->atm_options;
brdev->stats.tx_packets++;
-@@ -172,10 +215,9 @@
+@@ -172,10 +215,9 @@ static int br2684_xmit_vcc(struct sk_buf
}
static inline struct br2684_vcc *pick_outgoing_vcc(struct sk_buff *skb,
@@ -277,7 +277,7 @@
}
static int br2684_start_xmit(struct sk_buff *skb, struct net_device *dev)
-@@ -199,11 +241,10 @@
+@@ -199,11 +241,10 @@ static int br2684_start_xmit(struct sk_b
/*
* We should probably use netif_*_queue() here, but that
* involves added complication. We need to walk before
@@ -292,7 +292,7 @@
brdev->stats.tx_errors++;
brdev->stats.tx_fifo_errors++;
}
-@@ -217,12 +258,11 @@
+@@ -217,12 +258,11 @@ static struct net_device_stats *br2684_g
return &BRPRIV(dev)->stats;
}
@@ -306,7 +306,7 @@
static int br2684_mac_addr(struct net_device *dev, void *p)
{
int err = my_eth_mac_addr(dev, p);
-@@ -233,7 +273,7 @@
+@@ -233,7 +273,7 @@ static int br2684_mac_addr(struct net_de
#ifdef CONFIG_ATM_BR2684_IPFILTER
/* this IOCTL is experimental. */
@@ -315,7 +315,7 @@
{
struct br2684_vcc *brvcc;
struct br2684_filter_set fs;
-@@ -243,13 +283,12 @@
+@@ -243,13 +283,12 @@ static int br2684_setfilt(struct atm_vcc
if (fs.ifspec.method != BR2684_FIND_BYNOTHING) {
/*
* This is really a per-vcc thing, but we can also search
@@ -331,7 +331,7 @@
brvcc = NULL;
else
brvcc = list_entry_brvcc(brdev->brvccs.next);
-@@ -267,15 +306,16 @@
+@@ -267,15 +306,16 @@ static inline int
packet_fails_filter(__be16 type, struct br2684_vcc *brvcc, struct sk_buff *skb)
{
if (brvcc->filter.netmask == 0)
@@ -352,7 +352,7 @@
*/
return 1; /* drop */
}
-@@ -299,7 +339,6 @@
+@@ -299,7 +339,6 @@ static void br2684_push(struct atm_vcc *
struct br2684_vcc *brvcc = BR2684_VCC(atmvcc);
struct net_device *net_dev = brvcc->device;
struct br2684_dev *brdev = BRPRIV(net_dev);
@@ -360,7 +360,7 @@
pr_debug("br2684_push\n");
-@@ -320,35 +359,58 @@
+@@ -320,35 +359,58 @@ static void br2684_push(struct atm_vcc *
atm_return(atmvcc, skb->truesize);
pr_debug("skb from brdev %p\n", brdev);
if (brvcc->encaps == e_llc) {
@@ -434,7 +434,7 @@
#ifdef CONFIG_ATM_BR2684_IPFILTER
if (unlikely(packet_fails_filter(skb->protocol, brvcc, skb))) {
brdev->stats.rx_dropped++;
-@@ -372,11 +434,12 @@
+@@ -372,11 +434,12 @@ static void br2684_push(struct atm_vcc *
netif_rx(skb);
}
@@ -451,7 +451,7 @@
int err;
struct br2684_vcc *brvcc;
struct sk_buff *skb;
-@@ -395,7 +458,7 @@
+@@ -395,7 +458,7 @@ Note: we do not have explicit unassign,
net_dev = br2684_find_dev(&be.ifspec);
if (net_dev == NULL) {
printk(KERN_ERR
@@ -460,7 +460,7 @@
err = -ENXIO;
goto error;
}
-@@ -411,13 +474,15 @@
+@@ -411,13 +474,15 @@ Note: we do not have explicit unassign,
}
if (be.fcs_in != BR2684_FCSIN_NO || be.fcs_out != BR2684_FCSOUT_NO ||
be.fcs_auto || be.has_vpiid || be.send_padding || (be.encaps !=
@@ -480,7 +480,7 @@
if (list_empty(&brdev->brvccs) && !brdev->mac_was_set) {
unsigned char *esi = atmvcc->dev->esi;
if (esi[0] | esi[1] | esi[2] | esi[3] | esi[4] | esi[5])
-@@ -430,7 +495,7 @@
+@@ -430,7 +495,7 @@ Note: we do not have explicit unassign,
brvcc->device = net_dev;
brvcc->atmvcc = atmvcc;
atmvcc->user_back = brvcc;
@@ -489,7 +489,7 @@
brvcc->old_push = atmvcc->push;
barrier();
atmvcc->push = br2684_push;
-@@ -461,7 +526,7 @@
+@@ -461,7 +526,7 @@ Note: we do not have explicit unassign,
}
__module_get(THIS_MODULE);
return 0;
@@ -498,7 +498,7 @@
write_unlock_irq(&devs_lock);
kfree(brvcc);
return err;
-@@ -482,25 +547,52 @@
+@@ -482,25 +547,52 @@ static void br2684_setup(struct net_devi
INIT_LIST_HEAD(&brdev->brvccs);
}
@@ -553,7 +553,7 @@
if (!netdev)
return -ENOMEM;
-@@ -516,6 +608,7 @@
+@@ -516,6 +608,7 @@ static int br2684_create(void __user *ar
}
write_lock_irq(&devs_lock);
@@ -561,7 +561,7 @@
brdev->number = list_empty(&br2684_devs) ? 1 :
BRPRIV(list_entry_brdev(br2684_devs.prev))->number + 1;
list_add_tail(&brdev->br2684_devs, &br2684_devs);
-@@ -528,16 +621,16 @@
+@@ -528,16 +621,16 @@ static int br2684_create(void __user *ar
* -ENOIOCTLCMD for any unrecognized ioctl
*/
static int br2684_ioctl(struct socket *sock, unsigned int cmd,
@@ -582,7 +582,7 @@
err = get_user(b, (atm_backend_t __user *) argp);
if (err)
return -EFAULT;
-@@ -549,7 +642,6 @@
+@@ -549,7 +642,6 @@ static int br2684_ioctl(struct socket *s
return br2684_regvcc(atmvcc, argp);
else
return br2684_create(argp);
@@ -590,7 +590,7 @@
#ifdef CONFIG_ATM_BR2684_IPFILTER
case BR2684_SETFILT:
if (atmvcc->push != br2684_push)
-@@ -557,6 +649,7 @@
+@@ -557,6 +649,7 @@ static int br2684_ioctl(struct socket *s
if (!capable(CAP_NET_ADMIN))
return -EPERM;
err = br2684_setfilt(atmvcc, argp);
@@ -598,7 +598,7 @@
return err;
#endif /* CONFIG_ATM_BR2684_IPFILTER */
}
-@@ -564,24 +657,25 @@
+@@ -564,24 +657,25 @@ static int br2684_ioctl(struct socket *s
}
static struct atm_ioctl br2684_ioctl_ops = {
@@ -629,7 +629,7 @@
{
read_unlock(&devs_lock);
}
-@@ -589,7 +683,7 @@
+@@ -589,7 +683,7 @@ static void br2684_seq_stop(struct seq_f
static int br2684_seq_show(struct seq_file *seq, void *v)
{
const struct br2684_dev *brdev = list_entry(v, struct br2684_dev,
@@ -638,7 +638,7 @@
const struct net_device *net_dev = brdev->net_dev;
const struct br2684_vcc *brvcc;
DECLARE_MAC_BUF(mac);
-@@ -601,21 +695,19 @@
+@@ -601,21 +695,19 @@ static int br2684_seq_show(struct seq_fi
brdev->mac_was_set ? "set" : "auto");
list_for_each_entry(brvcc, &brdev->brvccs, brvccs) {
@@ -670,7 +670,7 @@
#undef bs
#undef b1
#endif /* CONFIG_ATM_BR2684_IPFILTER */
-@@ -625,9 +717,9 @@
+@@ -625,9 +717,9 @@ static int br2684_seq_show(struct seq_fi
static const struct seq_operations br2684_seq_ops = {
.start = br2684_seq_start,
@@ -683,7 +683,7 @@
};
static int br2684_proc_open(struct inode *inode, struct file *file)
-@@ -636,26 +728,28 @@
+@@ -636,26 +728,28 @@ static int br2684_proc_open(struct inode
}
static const struct file_operations br2684_proc_ops = {
@@ -721,7 +721,7 @@
}
static void __exit br2684_exit(void)
-@@ -689,3 +783,4 @@
+@@ -689,3 +783,4 @@ module_exit(br2684_exit);
MODULE_AUTHOR("Marcell GAL");
MODULE_DESCRIPTION("RFC2684 bridged protocols over ATM/AAL5");
MODULE_LICENSE("GPL");
diff --git a/target/linux/generic-2.6/patches-2.6.24/700-powerpc_git.patch b/target/linux/generic-2.6/patches-2.6.24/700-powerpc_git.patch
index e31b814..7524eb3 100644
--- a/target/linux/generic-2.6/patches-2.6.24/700-powerpc_git.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/700-powerpc_git.patch
@@ -1,6 +1,6 @@
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
-@@ -686,6 +686,7 @@
+@@ -686,6 +686,7 @@ and is between 256 and 4096 characters.
See Documentation/isdn/README.HiSax.
hugepages= [HW,X86-32,IA-64] Maximal number of HugeTLB pages.
@@ -10,7 +10,7 @@
i8042.dumbkbd [HW] Pretend that controller can only read data from
--- a/Documentation/powerpc/00-INDEX
+++ b/Documentation/powerpc/00-INDEX
-@@ -28,3 +28,6 @@
+@@ -28,3 +28,6 @@ sound.txt
- info on sound support under Linux/PPC
zImage_layout.txt
- info on the kernel images for Linux/PPC
@@ -19,7 +19,7 @@
+ Engine and the code that parses and uploads the microcode therein.
--- a/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt
-@@ -52,7 +52,11 @@
+@@ -52,7 +52,11 @@ Table of Contents
i) Freescale QUICC Engine module (QE)
j) CFI or JEDEC memory-mapped NOR flash
k) Global Utilities Block
@@ -32,7 +32,7 @@
VII - Specifying interrupt information for devices
1) interrupts property
-@@ -671,10 +675,10 @@
+@@ -671,10 +675,10 @@ device or bus to be described by the dev
In general, the format of an address for a device is defined by the
parent bus type, based on the #address-cells and #size-cells
@@ -47,7 +47,7 @@
Those 2 properties define 'cells' for representing an address and a
size. A "cell" is a 32-bit number. For example, if both contain 2
-@@ -711,13 +715,14 @@
+@@ -711,13 +715,14 @@ define a bus type with a more complex ad
like address space bits, you'll have to add a bus translator to the
prom_parse.c file of the recent kernels for your bus type.
@@ -66,7 +66,7 @@
bus address, parent bus address, size
-@@ -735,6 +740,10 @@
+@@ -735,6 +740,10 @@ fit in a single 32-bit word. New 32-bi
1/1 format, unless the processor supports physical addresses greater
than 32-bits, in which case a 2/1 format is recommended.
@@ -77,7 +77,7 @@
2) Note about "compatible" properties
-------------------------------------
-@@ -1218,16 +1227,14 @@
+@@ -1218,16 +1227,14 @@ platforms are moved over to use the flat
Required properties:
- reg : Offset and length of the register set for the device
@@ -96,7 +96,7 @@
ethernet-phy@0 {
......
-@@ -1254,6 +1261,10 @@
+@@ -1254,6 +1261,10 @@ platforms are moved over to use the flat
services interrupts for this device.
- phy-handle : The phandle for the PHY connected to this ethernet
controller.
@@ -107,7 +107,7 @@
Recommended properties:
-@@ -1408,7 +1419,6 @@
+@@ -1408,7 +1419,6 @@ platforms are moved over to use the flat
Example multi port host USB controller device node :
usb@22000 {
@@ -115,7 +115,7 @@
compatible = "fsl-usb2-mph";
reg = <22000 1000>;
#address-cells = <1>;
-@@ -1422,7 +1432,6 @@
+@@ -1422,7 +1432,6 @@ platforms are moved over to use the flat
Example dual role USB controller device node :
usb@23000 {
@@ -123,7 +123,7 @@
compatible = "fsl-usb2-dr";
reg = <23000 1000>;
#address-cells = <1>;
-@@ -1586,7 +1595,6 @@
+@@ -1586,7 +1595,6 @@ platforms are moved over to use the flat
iii) USB (Universal Serial Bus Controller)
Required properties:
@@ -131,7 +131,7 @@
- compatible : could be "qe_udc" or "fhci-hcd".
- mode : the could be "host" or "slave".
- reg : Offset and length of the register set for the device
-@@ -1600,7 +1608,6 @@
+@@ -1600,7 +1608,6 @@ platforms are moved over to use the flat
Example(slave):
usb@6c0 {
@@ -139,7 +139,7 @@
compatible = "qe_udc";
reg = <6c0 40>;
interrupts = <8b 0>;
-@@ -1613,7 +1620,7 @@
+@@ -1613,7 +1620,7 @@ platforms are moved over to use the flat
Required properties:
- device_type : should be "network", "hldc", "uart", "transparent"
@@ -148,7 +148,7 @@
- compatible : could be "ucc_geth" or "fsl_atm" and so on.
- model : should be "UCC".
- device-id : the ucc number(1-8), corresponding to UCCx in UM.
-@@ -1626,6 +1633,26 @@
+@@ -1626,6 +1633,26 @@ platforms are moved over to use the flat
- interrupt-parent : the phandle for the interrupt controller that
services interrupts for this device.
- pio-handle : The phandle for the Parallel I/O port configuration.
@@ -175,7 +175,7 @@
- rx-clock : represents the UCC receive clock source.
0x00 : clock source is disabled;
0x1~0x10 : clock source is BRG1~BRG16 respectively;
-@@ -1772,6 +1799,32 @@
+@@ -1772,6 +1799,32 @@ platforms are moved over to use the flat
};
};
@@ -208,7 +208,7 @@
j) CFI or JEDEC memory-mapped NOR flash
Flash chips (Memory Technology Devices) are often used for solid state
-@@ -2075,8 +2128,7 @@
+@@ -2075,8 +2128,7 @@ platforms are moved over to use the flat
Example:
localbus@f0010100 {
@@ -218,7 +218,7 @@
"fsl,pq2-localbus";
#address-cells = <2>;
#size-cells = <1>;
-@@ -2254,7 +2306,7 @@
+@@ -2254,7 +2306,7 @@ platforms are moved over to use the flat
available.
For Axon: 0x0000012a
@@ -227,7 +227,7 @@
The Xilinx EDK toolchain ships with a set of IP cores (devices) for use
in Xilinx Spartan and Virtex FPGAs. The devices cover the whole range
-@@ -2276,7 +2328,7 @@
+@@ -2276,7 +2328,7 @@ platforms are moved over to use the flat
properties of the device node. In general, device nodes for IP-cores
will take the following form:
@@ -236,7 +236,7 @@
compatible = "xlnx,(ip-core-name)-(HW_VER)"
[, (list of compatible devices), ...];
reg = <(baseaddr) (size)>;
-@@ -2286,6 +2338,9 @@
+@@ -2286,6 +2338,9 @@ platforms are moved over to use the flat
xlnx,(parameter2) = <(int-value)>;
};
@@ -246,7 +246,7 @@
(ip-core-name): the name of the ip block (given after the BEGIN
directive in system.mhs). Should be in lowercase
and all underscores '_' converted to dashes '-'.
-@@ -2294,9 +2349,9 @@
+@@ -2294,9 +2349,9 @@ platforms are moved over to use the flat
dropped from the parameter name, the name is converted
to lowercase and all underscore '_' characters are
converted to dashes '-'.
@@ -258,7 +258,7 @@
Typically, the compatible list will include the exact IP core version
followed by an older IP core version which implements the same
-@@ -2326,11 +2381,11 @@
+@@ -2326,11 +2381,11 @@ platforms are moved over to use the flat
becomes the following device tree node:
@@ -272,7 +272,7 @@
interrupts = <1 0>; // got this from the opb_intc parameters
current-speed = <d#115200>; // standard serial device prop
clock-frequency = <d#50000000>; // standard serial device prop
-@@ -2339,16 +2394,19 @@
+@@ -2339,16 +2394,19 @@ platforms are moved over to use the flat
xlnx,use-parity = <0>;
};
@@ -302,7 +302,7 @@
BEGIN opb_ps2_dual_ref
PARAMETER INSTANCE = opb_ps2_dual_ref_0
-@@ -2370,21 +2428,24 @@
+@@ -2370,21 +2428,24 @@ platforms are moved over to use the flat
It would result in the following device tree nodes:
@@ -330,7 +330,7 @@
interrupts = <3 0>;
cell-index = <0>;
};
-@@ -2447,17 +2508,18 @@
+@@ -2447,17 +2508,18 @@ platforms are moved over to use the flat
Gives this device tree (some properties removed for clarity):
@@ -352,7 +352,7 @@
#address-cells = <1>;
#size-cells = <1>;
ranges = <20000000 20000000 20000000
-@@ -2465,11 +2527,11 @@
+@@ -2465,11 +2527,11 @@ platforms are moved over to use the flat
80000000 80000000 40000000
c0000000 c0000000 20000000>;
@@ -366,7 +366,7 @@
reg = <d1000fc0 20>;
};
};
-@@ -2514,6 +2576,46 @@
+@@ -2514,6 +2576,46 @@ platforms are moved over to use the flat
Requred properties:
- current-speed : Baud rate of uartlite
@@ -713,7 +713,7 @@
+distributed by Freescale can be found on http://opensource.freescale.com.
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
-@@ -140,6 +140,9 @@
+@@ -140,6 +140,9 @@ config DEFAULT_UIMAGE
Used to allow a board to specify it wants a uImage built by default
default n
@@ -723,7 +723,7 @@
config PPC64_SWSUSP
bool
depends on PPC64 && (BROKEN || (PPC_PMAC64 && EXPERIMENTAL))
-@@ -160,11 +163,13 @@
+@@ -160,11 +163,13 @@ config PPC_DCR
config PPC_OF_PLATFORM_PCI
bool
@@ -737,7 +737,7 @@
source "arch/powerpc/platforms/Kconfig"
menu "Kernel options"
-@@ -417,7 +422,7 @@
+@@ -417,7 +422,7 @@ endmenu
config ISA_DMA_API
bool
@@ -746,7 +746,7 @@
menu "Bus options"
-@@ -467,7 +472,7 @@
+@@ -467,7 +472,7 @@ config MCA
config PCI
bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \
|| PPC_MPC52xx || (EMBEDDED && (PPC_PSERIES || PPC_ISERIES)) \
@@ -757,7 +757,7 @@
default PCI_PERMEDIA if !4xx && !CPM2 && !8xx
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
-@@ -151,6 +151,13 @@
+@@ -151,6 +151,13 @@ config BOOTX_TEXT
config PPC_EARLY_DEBUG
bool "Early debugging (dangerous)"
@@ -771,7 +771,7 @@
choice
prompt "Early debugging console"
-@@ -218,7 +225,16 @@
+@@ -218,7 +225,16 @@ config PPC_EARLY_DEBUG_44x
depends on 44x
help
Select this to enable early debugging for IBM 44x chips via the
@@ -789,7 +789,7 @@
config PPC_EARLY_DEBUG_CPM
bool "Early serial debugging for Freescale CPM-based serial ports"
-@@ -235,12 +251,20 @@
+@@ -235,12 +251,20 @@ config PPC_EARLY_DEBUG_44x_PHYSLOW
hex "Low 32 bits of early debug UART physical address"
depends on PPC_EARLY_DEBUG_44x
default "0x40000200"
@@ -812,7 +812,7 @@
depends on PPC_EARLY_DEBUG_CPM
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
-@@ -167,6 +167,9 @@
+@@ -167,6 +167,9 @@ boot := arch/$(ARCH)/boot
$(BOOT_TARGETS): vmlinux
$(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)
@@ -843,7 +843,7 @@
if (bank_config & SDRAM_CONFIG_BANK_ENABLE)
memsize += SDRAM_CONFIG_BANK_SIZE(bank_config);
}
-@@ -39,6 +37,69 @@
+@@ -39,6 +37,69 @@ void ibm4xx_fixup_memsize(void)
dt_fixup_memory(0, memsize);
}
@@ -913,7 +913,7 @@
/* 4xx DDR1/2 Denali memory controller support */
/* DDR0 registers */
#define DDR0_02 2
-@@ -77,19 +138,13 @@
+@@ -77,19 +138,13 @@ void ibm4xx_fixup_memsize(void)
#define DDR_GET_VAL(val, mask, shift) (((val) >> (shift)) & (mask))
@@ -934,7 +934,7 @@
if (!DDR_GET_VAL(val, DDR_START, DDR_START_SHIFT))
fatal("DDR controller is not initialized\n");
-@@ -99,12 +154,12 @@
+@@ -99,12 +154,12 @@ void ibm4xx_denali_fixup_memsize(void)
max_row = DDR_GET_VAL(val, DDR_MAX_ROW_REG, DDR_MAX_ROW_REG_SHIFT);
/* get CS value */
@@ -949,7 +949,7 @@
cs++;
val = val >> 1;
}
-@@ -115,15 +170,15 @@
+@@ -115,15 +170,15 @@ void ibm4xx_denali_fixup_memsize(void)
fatal("DDR wrong CS configuration\n");
/* get data path bytes */
@@ -968,7 +968,7 @@
row = DDR_GET_VAL(val, DDR_APIN, DDR_APIN_SHIFT);
if (row > max_row)
-@@ -131,7 +186,7 @@
+@@ -131,7 +186,7 @@ void ibm4xx_denali_fixup_memsize(void)
row = max_row - row;
/* get collomn size and banks */
@@ -977,7 +977,7 @@
col = DDR_GET_VAL(val, DDR_COL_SZ, DDR_COL_SZ_SHIFT);
if (col > max_col)
-@@ -179,13 +234,17 @@
+@@ -179,13 +234,17 @@ void ibm40x_dbcr_reset(void)
#define EMAC_RESET 0x20000000
void ibm4xx_quiesce_eth(u32 *emac0, u32 *emac1)
{
@@ -996,7 +996,7 @@
}
/* Read 4xx EBC bus bridge registers to get mappings of the peripheral
-@@ -217,84 +276,335 @@
+@@ -217,84 +276,335 @@ void ibm4xx_fixup_ebc_ranges(const char
setprop(devp, "ranges", ranges, (p - ranges) * sizeof(u32));
}
@@ -1426,7 +1426,7 @@
#endif /* _POWERPC_BOOT_4XX_H_ */
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
-@@ -33,12 +33,15 @@
+@@ -33,12 +33,15 @@ ifeq ($(call cc-option-yn, -fstack-prote
BOOTCFLAGS += -fno-stack-protector
endif
@@ -1443,7 +1443,7 @@
zlib := inffast.c inflate.c inftrees.c
zlibheader := inffast.h inffixed.h inflate.h inftrees.h infutil.h
zliblinuxheader := zlib.h zconf.h zutil.h
-@@ -46,17 +49,21 @@
+@@ -46,17 +49,21 @@ zliblinuxheader := zlib.h zconf.h zutil.
$(addprefix $(obj)/,$(zlib) gunzip_util.o main.o): \
$(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader))
@@ -1468,7 +1468,7 @@
src-boot := $(src-wlib) $(src-plat) empty.c
src-boot := $(addprefix $(obj)/, $(src-boot))
-@@ -101,24 +108,61 @@
+@@ -101,24 +108,61 @@ quiet_cmd_bootar = BOOTAR $@
cmd_bootar = $(CROSS32AR) -cr $@.$$$$ $(filter-out FORCE,$^); mv $@.$$$$ $@
$(patsubst %.c,%.o, $(filter %.c, $(src-boot))): %.o: %.c FORCE
@@ -1532,7 +1532,7 @@
# Bits for building various flavours of zImage
ifneq ($(CROSS32_COMPILE),)
-@@ -150,15 +194,26 @@
+@@ -150,15 +194,26 @@ image-$(CONFIG_DEFAULT_UIMAGE) += uImag
ifneq ($(CONFIG_DEVICE_TREE),"")
image-$(CONFIG_PPC_8xx) += cuImage.8xx
image-$(CONFIG_PPC_EP88XC) += zImage.ep88xc
@@ -1559,7 +1559,7 @@
endif
# For 32-bit powermacs, build the COFF and miboot images
-@@ -243,3 +298,51 @@
+@@ -243,3 +298,51 @@ clean-kernel := vmlinux.strip vmlinux.bi
clean-kernel += $(addsuffix .gz,$(clean-kernel))
# If not absolute clean-files are relative to $(obj).
clean-files += $(addprefix $(objtree)/, $(clean-kernel))
@@ -1613,7 +1613,7 @@
+
--- a/arch/powerpc/boot/bamboo.c
+++ b/arch/powerpc/boot/bamboo.c
-@@ -30,8 +30,8 @@
+@@ -30,8 +30,8 @@ static void bamboo_fixups(void)
{
unsigned long sysclk = 33333333;
@@ -1624,7 +1624,7 @@
ibm4xx_quiesce_eth((u32 *)0xef600e00, (u32 *)0xef600f00);
dt_fixup_mac_addresses(bamboo_mac0, bamboo_mac1);
}
-@@ -42,6 +42,6 @@
+@@ -42,6 +42,6 @@ void bamboo_init(void *mac0, void *mac1)
platform_ops.exit = ibm44x_dbcr_reset;
bamboo_mac0 = mac0;
bamboo_mac1 = mac1;
@@ -1634,7 +1634,7 @@
}
--- a/arch/powerpc/boot/cuboot-52xx.c
+++ b/arch/powerpc/boot/cuboot-52xx.c
-@@ -53,7 +53,7 @@
+@@ -53,7 +53,7 @@ void platform_init(unsigned long r3, uns
unsigned long r6, unsigned long r7)
{
CUBOOT_INIT();
@@ -1701,7 +1701,7 @@
+}
--- a/arch/powerpc/boot/cuboot-83xx.c
+++ b/arch/powerpc/boot/cuboot-83xx.c
-@@ -24,7 +24,8 @@
+@@ -24,7 +24,8 @@ static void platform_fixups(void)
void *soc;
dt_fixup_memory(bd.bi_memstart, bd.bi_memsize);
@@ -1711,7 +1711,7 @@
dt_fixup_cpu_clocks(bd.bi_intfreq, bd.bi_busfreq / 4, bd.bi_busfreq);
/* Unfortunately, the specific model number is encoded in the
-@@ -52,7 +53,7 @@
+@@ -52,7 +53,7 @@ void platform_init(unsigned long r3, uns
unsigned long r6, unsigned long r7)
{
CUBOOT_INIT();
@@ -1722,7 +1722,7 @@
}
--- a/arch/powerpc/boot/cuboot-85xx.c
+++ b/arch/powerpc/boot/cuboot-85xx.c
-@@ -24,8 +24,9 @@
+@@ -24,8 +24,9 @@ static void platform_fixups(void)
void *soc;
dt_fixup_memory(bd.bi_memstart, bd.bi_memsize);
@@ -1734,7 +1734,7 @@
dt_fixup_cpu_clocks(bd.bi_intfreq, bd.bi_busfreq / 8, bd.bi_busfreq);
/* Unfortunately, the specific model number is encoded in the
-@@ -53,7 +54,7 @@
+@@ -53,7 +54,7 @@ void platform_init(unsigned long r3, uns
unsigned long r6, unsigned long r7)
{
CUBOOT_INIT();
@@ -1745,7 +1745,7 @@
}
--- a/arch/powerpc/boot/cuboot-8xx.c
+++ b/arch/powerpc/boot/cuboot-8xx.c
-@@ -41,7 +41,7 @@
+@@ -41,7 +41,7 @@ void platform_init(unsigned long r3, uns
unsigned long r6, unsigned long r7)
{
CUBOOT_INIT();
@@ -1756,7 +1756,7 @@
}
--- a/arch/powerpc/boot/cuboot-hpc2.c
+++ b/arch/powerpc/boot/cuboot-hpc2.c
-@@ -42,7 +42,7 @@
+@@ -42,7 +42,7 @@ void platform_init(unsigned long r3, uns
unsigned long r6, unsigned long r7)
{
CUBOOT_INIT();
@@ -1826,7 +1826,7 @@
+}
--- a/arch/powerpc/boot/cuboot-pq2.c
+++ b/arch/powerpc/boot/cuboot-pq2.c
-@@ -255,7 +255,7 @@
+@@ -255,7 +255,7 @@ void platform_init(unsigned long r3, uns
unsigned long r6, unsigned long r7)
{
CUBOOT_INIT();
@@ -1896,7 +1896,7 @@
+}
--- a/arch/powerpc/boot/cuboot-sequoia.c
+++ b/arch/powerpc/boot/cuboot-sequoia.c
-@@ -39,7 +39,7 @@
+@@ -39,7 +39,7 @@ static void sequoia_fixups(void)
{
unsigned long sysclk = 33333333;
@@ -1905,7 +1905,7 @@
ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
ibm4xx_denali_fixup_memsize();
dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr);
-@@ -51,6 +51,6 @@
+@@ -51,6 +51,6 @@ void platform_init(unsigned long r3, uns
CUBOOT_INIT();
platform_ops.fixups = sequoia_fixups;
platform_ops.exit = ibm44x_dbcr_reset;
@@ -2036,7 +2036,7 @@
#define SDRAM_CONFIG_BANK_ENABLE 0x00000001
#define SDRAM_CONFIG_SIZE_MASK 0x000e0000
-@@ -138,5 +146,54 @@
+@@ -138,5 +146,54 @@ static const unsigned long sdram_bxcr[]
#define DCRN_CPC0_PLLMR 0xb0
#define DCRN_405_CPC0_CR0 0xb1
#define DCRN_405_CPC0_CR1 0xb2
@@ -2093,7 +2093,7 @@
#endif /* _PPC_BOOT_DCR_H_ */
--- a/arch/powerpc/boot/devtree.c
+++ b/arch/powerpc/boot/devtree.c
-@@ -88,6 +88,20 @@
+@@ -88,6 +88,20 @@ void dt_fixup_clock(const char *path, u3
}
}
@@ -12571,7 +12571,7 @@
};
--- a/arch/powerpc/boot/dts/kuroboxHD.dts
+++ b/arch/powerpc/boot/dts/kuroboxHD.dts
-@@ -23,6 +23,12 @@
+@@ -23,6 +23,12 @@ XXXX add flash parts, rtc, ??
#address-cells = <1>;
#size-cells = <1>;
@@ -12584,7 +12584,7 @@
cpus {
#address-cells = <1>;
#size-cells = <0>;
-@@ -60,7 +66,7 @@
+@@ -60,7 +66,7 @@ XXXX add flash parts, rtc, ??
i2c@80003000 {
#address-cells = <1>;
#size-cells = <0>;
@@ -12593,7 +12593,7 @@
compatible = "fsl-i2c";
reg = <80003000 1000>;
interrupts = <5 2>;
-@@ -73,7 +79,8 @@
+@@ -73,7 +79,8 @@ XXXX add flash parts, rtc, ??
};
};
@@ -12603,7 +12603,7 @@
device_type = "serial";
compatible = "ns16550";
reg = <80004500 8>;
-@@ -83,7 +90,8 @@
+@@ -83,7 +90,8 @@ XXXX add flash parts, rtc, ??
interrupt-parent = <&mpic>;
};
@@ -12613,7 +12613,7 @@
device_type = "serial";
compatible = "ns16550";
reg = <80004600 8>;
-@@ -102,7 +110,7 @@
+@@ -102,7 +110,7 @@ XXXX add flash parts, rtc, ??
reg = <80040000 40000>;
};
@@ -12624,7 +12624,7 @@
#interrupt-cells = <1>;
--- a/arch/powerpc/boot/dts/kuroboxHG.dts
+++ b/arch/powerpc/boot/dts/kuroboxHG.dts
-@@ -23,6 +23,12 @@
+@@ -23,6 +23,12 @@ XXXX add flash parts, rtc, ??
#address-cells = <1>;
#size-cells = <1>;
@@ -12637,7 +12637,7 @@
cpus {
#address-cells = <1>;
#size-cells = <0>;
-@@ -60,7 +66,7 @@
+@@ -60,7 +66,7 @@ XXXX add flash parts, rtc, ??
i2c@80003000 {
#address-cells = <1>;
#size-cells = <0>;
@@ -12646,7 +12646,7 @@
compatible = "fsl-i2c";
reg = <80003000 1000>;
interrupts = <5 2>;
-@@ -73,7 +79,8 @@
+@@ -73,7 +79,8 @@ XXXX add flash parts, rtc, ??
};
};
@@ -12656,7 +12656,7 @@
device_type = "serial";
compatible = "ns16550";
reg = <80004500 8>;
-@@ -83,7 +90,8 @@
+@@ -83,7 +90,8 @@ XXXX add flash parts, rtc, ??
interrupt-parent = <&mpic>;
};
@@ -12666,7 +12666,7 @@
device_type = "serial";
compatible = "ns16550";
reg = <80004600 8>;
-@@ -102,7 +110,7 @@
+@@ -102,7 +110,7 @@ XXXX add flash parts, rtc, ??
reg = <80040000 40000>;
};
@@ -18705,7 +18705,7 @@
#define EBONY_FPGA_PATH "/plb/opb/ebc/fpga"
#define EBONY_FPGA_FLASH_SEL 0x01
#define EBONY_SMALL_FLASH_PATH "/plb/opb/ebc/small-flash"
-@@ -134,7 +74,7 @@
+@@ -134,7 +74,7 @@ static void ebony_fixups(void)
unsigned long sysclk = 33000000;
ibm440gp_fixup_clocks(sysclk, 6 * 1843200);
@@ -18714,7 +18714,7 @@
dt_fixup_mac_addresses(ebony_mac0, ebony_mac1);
ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
ebony_flashsel_fixup();
-@@ -146,6 +86,6 @@
+@@ -146,6 +86,6 @@ void ebony_init(void *mac0, void *mac1)
platform_ops.exit = ibm44x_dbcr_reset;
ebony_mac0 = mac0;
ebony_mac1 = mac1;
@@ -18859,7 +18859,7 @@
+}
--- a/arch/powerpc/boot/ep88xc.c
+++ b/arch/powerpc/boot/ep88xc.c
-@@ -45,7 +45,7 @@
+@@ -45,7 +45,7 @@ void platform_init(unsigned long r3, uns
mem_size *= 1024 * 1024;
simple_alloc_init(_end, mem_size - (unsigned long)_end, 32, 64);
@@ -20107,7 +20107,7 @@
-}
--- a/arch/powerpc/boot/holly.c
+++ b/arch/powerpc/boot/holly.c
-@@ -28,6 +28,6 @@
+@@ -28,6 +28,6 @@ void platform_init(unsigned long r3, uns
u32 heapsize = 0x8000000 - (u32)_end; /* 128M */
simple_alloc_init(_end, heapsize, 32, 64);
@@ -22932,7 +22932,7 @@
static struct gunzip_state gzstate;
--- a/arch/powerpc/boot/ops.h
+++ b/arch/powerpc/boot/ops.h
-@@ -79,7 +79,7 @@
+@@ -79,7 +79,7 @@ struct loader_info {
extern struct loader_info loader_info;
void start(void);
@@ -22941,7 +22941,7 @@
int serial_console_init(void);
int ns16550_console_init(void *devp, struct serial_console_data *scdp);
int mpsc_console_init(void *devp, struct serial_console_data *scdp);
-@@ -159,9 +159,23 @@
+@@ -159,9 +159,23 @@ static inline void *find_node_by_devtype
return find_node_by_prop_value_str(prev, "device_type", type);
}
@@ -22967,7 +22967,7 @@
#define dt_fixup_mac_addresses(...) \
--- a/arch/powerpc/boot/prpmc2800.c
+++ b/arch/powerpc/boot/prpmc2800.c
-@@ -547,8 +547,7 @@
+@@ -547,8 +547,7 @@ void platform_init(unsigned long r3, uns
if (!dtb)
exit();
memmove(dtb, _dtb_start, dt_size);
@@ -22979,7 +22979,7 @@
--- a/arch/powerpc/boot/ps3.c
+++ b/arch/powerpc/boot/ps3.c
-@@ -131,7 +131,7 @@
+@@ -131,7 +131,7 @@ void platform_init(void)
printf("\n-- PS3 bootwrapper --\n");
simple_alloc_init(_end, heapsize, 32, 64);
@@ -23110,7 +23110,7 @@
+#endif
--- a/arch/powerpc/boot/reg.h
+++ b/arch/powerpc/boot/reg.h
-@@ -16,6 +16,14 @@
+@@ -16,6 +16,14 @@ static inline u32 mfpvr(void)
return pvr;
}
@@ -23127,7 +23127,7 @@
--- a/arch/powerpc/boot/serial.c
+++ b/arch/powerpc/boot/serial.c
-@@ -128,7 +128,8 @@
+@@ -128,7 +128,8 @@ int serial_console_init(void)
rc = cpm_console_init(devp, &serial_cd);
else if (dt_is_compatible(devp, "mpc5200-psc-uart"))
rc = mpc5200_psc_console_init(devp, &serial_cd);
@@ -23195,7 +23195,7 @@
static void walnut_flashsel_fixup(void)
{
void *devp, *sram;
-@@ -112,7 +63,7 @@
+@@ -112,7 +63,7 @@ static void walnut_flashsel_fixup(void)
#define WALNUT_OPENBIOS_MAC_OFF 0xfffffe0b
static void walnut_fixups(void)
{
@@ -23204,7 +23204,7 @@
ibm405gp_fixup_clocks(33330000, 0xa8c000);
ibm4xx_quiesce_eth((u32 *)0xef600800, NULL);
ibm4xx_fixup_ebc_ranges("/plb/ebc");
-@@ -128,6 +79,6 @@
+@@ -128,6 +79,6 @@ void platform_init(void)
simple_alloc_init(_end, avail_ram, 32, 32);
platform_ops.fixups = walnut_fixups;
platform_ops.exit = ibm40x_dbcr_reset;
@@ -23214,7 +23214,7 @@
}
--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
-@@ -45,6 +45,7 @@
+@@ -45,6 +45,7 @@ CROSS=
# directory for object and other files used by this script
object=arch/powerpc/boot
@@ -23222,7 +23222,7 @@
# directory for working files
tmpdir=.
-@@ -95,6 +96,7 @@
+@@ -95,6 +96,7 @@ while [ "$#" -gt 0 ]; do
shift
[ "$#" -gt 0 ] || usage
object="$1"
@@ -23230,7 +23230,7 @@
;;
-W)
shift
-@@ -116,10 +118,13 @@
+@@ -116,10 +118,13 @@ while [ "$#" -gt 0 ]; do
done
if [ -n "$dts" ]; then
@@ -23245,7 +23245,7 @@
fi
if [ -z "$kernel" ]; then
-@@ -163,7 +168,7 @@
+@@ -163,7 +168,7 @@ ps3)
ksection=.kernel:vmlinux.bin
isection=.kernel:initrd
;;
@@ -23254,7 +23254,7 @@
platformo="$object/fixed-head.o $object/$platform.o"
binary=y
;;
-@@ -246,11 +251,11 @@
+@@ -246,11 +251,11 @@ fi
# post-processing needed for some platforms
case "$platform" in
pseries|chrp)
@@ -23268,7 +23268,7 @@
;;
cuboot*)
gzip -f -9 "$ofile"
-@@ -259,7 +264,7 @@
+@@ -259,7 +264,7 @@ cuboot*)
;;
treeboot*)
mv "$ofile" "$ofile.elf"
@@ -23277,7 +23277,7 @@
if [ -z "$cacheit" ]; then
rm -f "$ofile.elf"
fi
-@@ -287,8 +292,6 @@
+@@ -287,8 +292,6 @@ ps3)
overlay_dest="256"
overlay_size="256"
@@ -23286,7 +23286,7 @@
${CROSS}objcopy -O binary "$ofile" "$ofile.bin"
dd if="$ofile.bin" of="$ofile.bin" conv=notrunc \
-@@ -299,6 +302,8 @@
+@@ -299,6 +302,8 @@ ps3)
skip=$system_reset_overlay seek=$overlay_dest \
count=$overlay_size bs=1
@@ -24910,7 +24910,7 @@
#
# CONFIG_PPC64 is not set
-@@ -131,6 +131,7 @@
+@@ -131,6 +131,7 @@ CONFIG_DEFAULT_AS=y
# CONFIG_DEFAULT_CFQ is not set
# CONFIG_DEFAULT_NOOP is not set
CONFIG_DEFAULT_IOSCHED="anticipatory"
@@ -24918,7 +24918,7 @@
#
# Platform support
-@@ -143,6 +144,9 @@
+@@ -143,6 +144,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
CONFIG_BAMBOO=y
# CONFIG_EBONY is not set
# CONFIG_SEQUOIA is not set
@@ -24928,7 +24928,7 @@
CONFIG_440EP=y
CONFIG_IBM440EP_ERR42=y
# CONFIG_MPIC is not set
-@@ -372,9 +376,7 @@
+@@ -372,9 +376,7 @@ CONFIG_MISC_DEVICES=y
# CONFIG_FIREWIRE is not set
# CONFIG_IEEE1394 is not set
# CONFIG_I2O is not set
@@ -24939,7 +24939,7 @@
CONFIG_NETDEVICES=y
# CONFIG_NETDEVICES_MULTIQUEUE is not set
# CONFIG_DUMMY is not set
-@@ -736,19 +738,7 @@
+@@ -736,19 +738,7 @@ CONFIG_DEBUGGER=y
# CONFIG_KGDB is not set
# CONFIG_XMON is not set
# CONFIG_BDI_SWITCH is not set
@@ -24962,7 +24962,7 @@
# Security options
--- a/arch/powerpc/configs/celleb_defconfig
+++ b/arch/powerpc/configs/celleb_defconfig
-@@ -50,7 +50,8 @@
+@@ -50,7 +50,8 @@ CONFIG_AUDIT_ARCH=y
CONFIG_GENERIC_BUG=y
# CONFIG_DEFAULT_UIMAGE is not set
# CONFIG_PPC_DCR_NATIVE is not set
@@ -24972,7 +24972,7 @@
CONFIG_PPC_OF_PLATFORM_PCI=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-@@ -148,7 +149,7 @@
+@@ -148,7 +149,7 @@ CONFIG_PPC_MULTIPLATFORM=y
CONFIG_PPC_CELLEB=y
# CONFIG_PPC_PS3 is not set
CONFIG_PPC_CELL=y
@@ -24981,7 +24981,7 @@
# CONFIG_PPC_IBM_CELL_BLADE is not set
#
-@@ -157,13 +158,19 @@
+@@ -157,13 +158,19 @@ CONFIG_PPC_CELL=y
CONFIG_SPU_FS=y
CONFIG_SPU_FS_64K_LS=y
CONFIG_SPU_BASE=y
@@ -25003,7 +25003,7 @@
# CONFIG_MMIO_NVRAM is not set
# CONFIG_PPC_MPC106 is not set
# CONFIG_PPC_970_NAP is not set
-@@ -593,10 +600,11 @@
+@@ -593,10 +600,11 @@ CONFIG_MII=y
# CONFIG_NET_VENDOR_3COM is not set
# CONFIG_NET_TULIP is not set
# CONFIG_HP100 is not set
@@ -25019,7 +25019,7 @@
# CONFIG_NET_PCI is not set
# CONFIG_B44 is not set
CONFIG_NETDEV_1000=y
-@@ -741,6 +749,7 @@
+@@ -741,6 +749,7 @@ CONFIG_SERIAL_TXX9_CONSOLE=y
CONFIG_UNIX98_PTYS=y
# CONFIG_LEGACY_PTYS is not set
CONFIG_HVC_DRIVER=y
@@ -25027,7 +25027,7 @@
CONFIG_HVC_BEAT=y
# CONFIG_IPMI_HANDLER is not set
# CONFIG_HW_RANDOM is not set
-@@ -822,6 +831,7 @@
+@@ -822,6 +831,7 @@ CONFIG_WATCHDOG=y
# Watchdog Device Drivers
#
# CONFIG_SOFT_WATCHDOG is not set
@@ -25035,7 +25035,7 @@
#
# PCI-based Watchdog Cards
-@@ -1245,17 +1255,7 @@
+@@ -1245,17 +1255,7 @@ CONFIG_XMON_DISASSEMBLY=y
CONFIG_IRQSTACKS=y
# CONFIG_VIRQ_DEBUG is not set
# CONFIG_BOOTX_TEXT is not set
@@ -25066,7 +25066,7 @@
#
# CONFIG_PPC64 is not set
-@@ -130,6 +130,7 @@
+@@ -130,6 +130,7 @@ CONFIG_DEFAULT_AS=y
# CONFIG_DEFAULT_CFQ is not set
# CONFIG_DEFAULT_NOOP is not set
CONFIG_DEFAULT_IOSCHED="anticipatory"
@@ -25074,7 +25074,7 @@
#
# Platform support
-@@ -142,6 +143,9 @@
+@@ -142,6 +143,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
# CONFIG_BAMBOO is not set
CONFIG_EBONY=y
# CONFIG_SEQUOIA is not set
@@ -27668,7 +27668,7 @@
#
# CONFIG_PPC64 is not set
-@@ -40,7 +40,7 @@
+@@ -40,7 +40,7 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
CONFIG_PPC_OF=y
CONFIG_OF=y
@@ -27677,7 +27677,7 @@
# CONFIG_GENERIC_TBSYNC is not set
CONFIG_AUDIT_ARCH=y
CONFIG_GENERIC_BUG=y
-@@ -125,6 +125,7 @@
+@@ -125,6 +125,7 @@ CONFIG_DEFAULT_AS=y
# CONFIG_DEFAULT_CFQ is not set
# CONFIG_DEFAULT_NOOP is not set
CONFIG_DEFAULT_IOSCHED="anticipatory"
@@ -27685,7 +27685,7 @@
#
# Platform support
-@@ -134,9 +135,12 @@
+@@ -134,9 +135,12 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
# CONFIG_PPC_CELL is not set
# CONFIG_PPC_CELL_NATIVE is not set
# CONFIG_PQ2ADS is not set
@@ -27698,7 +27698,7 @@
# CONFIG_MPIC is not set
# CONFIG_MPIC_WEIRD is not set
# CONFIG_PPC_I8259 is not set
-@@ -199,11 +203,17 @@
+@@ -199,11 +203,17 @@ CONFIG_ISA_DMA_API=y
# Bus options
#
CONFIG_ZONE_DMA=y
@@ -27720,7 +27720,7 @@
#
# Advanced setup
-@@ -368,11 +378,13 @@
+@@ -368,11 +378,13 @@ CONFIG_MTD_CFI_UTIL=y
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
# CONFIG_MTD_PHYSMAP is not set
CONFIG_MTD_PHYSMAP_OF=y
@@ -27734,7 +27734,7 @@
# CONFIG_MTD_SLRAM is not set
# CONFIG_MTD_PHRAM is not set
# CONFIG_MTD_MTDRAM is not set
-@@ -395,9 +407,14 @@
+@@ -395,9 +407,14 @@ CONFIG_OF_DEVICE=y
# CONFIG_PARPORT is not set
CONFIG_BLK_DEV=y
# CONFIG_BLK_DEV_FD is not set
@@ -27749,7 +27749,7 @@
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=35000
-@@ -417,6 +434,14 @@
+@@ -417,6 +434,14 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
# CONFIG_SCSI_NETLINK is not set
# CONFIG_ATA is not set
# CONFIG_MD is not set
@@ -27764,7 +27764,7 @@
# CONFIG_MACINTOSH_DRIVERS is not set
CONFIG_NETDEVICES=y
# CONFIG_NETDEVICES_MULTIQUEUE is not set
-@@ -426,9 +451,33 @@
+@@ -426,9 +451,33 @@ CONFIG_NETDEVICES=y
# CONFIG_EQUALIZER is not set
# CONFIG_TUN is not set
# CONFIG_VETH is not set
@@ -27799,7 +27799,7 @@
#
# Wireless LAN
-@@ -436,6 +485,8 @@
+@@ -436,6 +485,8 @@ CONFIG_NETDEVICES=y
# CONFIG_WLAN_PRE80211 is not set
# CONFIG_WLAN_80211 is not set
# CONFIG_WAN is not set
@@ -27808,7 +27808,7 @@
# CONFIG_PPP is not set
# CONFIG_SLIP is not set
# CONFIG_SHAPER is not set
-@@ -467,6 +518,7 @@
+@@ -467,6 +518,7 @@ CONFIG_NETDEVICES=y
#
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
@@ -27816,7 +27816,7 @@
CONFIG_SERIAL_8250_NR_UARTS=4
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
CONFIG_SERIAL_8250_EXTENDED=y
-@@ -481,6 +533,7 @@
+@@ -481,6 +533,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
# CONFIG_SERIAL_UARTLITE is not set
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
@@ -27824,7 +27824,7 @@
CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_UNIX98_PTYS=y
CONFIG_LEGACY_PTYS=y
-@@ -490,8 +543,10 @@
+@@ -490,8 +543,10 @@ CONFIG_LEGACY_PTY_COUNT=256
# CONFIG_NVRAM is not set
# CONFIG_GEN_RTC is not set
# CONFIG_R3964 is not set
@@ -27835,7 +27835,7 @@
# CONFIG_I2C is not set
#
-@@ -525,6 +580,8 @@
+@@ -525,6 +580,8 @@ CONFIG_SSB_POSSIBLE=y
#
# Graphics support
#
@@ -27844,7 +27844,7 @@
# CONFIG_VGASTATE is not set
# CONFIG_VIDEO_OUTPUT_CONTROL is not set
# CONFIG_FB is not set
-@@ -542,6 +599,7 @@
+@@ -542,6 +599,7 @@ CONFIG_SSB_POSSIBLE=y
# CONFIG_USB_SUPPORT is not set
# CONFIG_MMC is not set
# CONFIG_NEW_LEDS is not set
@@ -30818,7 +30818,7 @@
#
# CONFIG_PPC64 is not set
-@@ -144,6 +144,7 @@
+@@ -144,6 +144,7 @@ CONFIG_MPC8313_RDB=y
# CONFIG_MPC834x_MDS is not set
# CONFIG_MPC834x_ITX is not set
# CONFIG_MPC836x_MDS is not set
@@ -30826,7 +30826,7 @@
CONFIG_PPC_MPC831x=y
# CONFIG_MPIC is not set
# CONFIG_MPIC_WEIRD is not set
-@@ -336,15 +337,16 @@
+@@ -336,15 +337,16 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_MTD=y
# CONFIG_MTD_DEBUG is not set
# CONFIG_MTD_CONCAT is not set
@@ -30847,7 +30847,7 @@
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
# CONFIG_INFTL is not set
-@@ -381,11 +383,8 @@
+@@ -381,11 +383,8 @@ CONFIG_MTD_CFI_UTIL=y
# Mapping drivers for chip access
#
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
@@ -30861,7 +30861,7 @@
# CONFIG_MTD_INTEL_VR_NOR is not set
# CONFIG_MTD_PLATRAM is not set
-@@ -406,7 +405,16 @@
+@@ -406,7 +405,16 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
# CONFIG_MTD_DOC2000 is not set
# CONFIG_MTD_DOC2001 is not set
# CONFIG_MTD_DOC2001PLUS is not set
@@ -30879,7 +30879,7 @@
# CONFIG_MTD_ONENAND is not set
#
-@@ -1178,7 +1186,17 @@
+@@ -1178,7 +1186,17 @@ CONFIG_TMPFS=y
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
@@ -30898,7 +30898,7 @@
# CONFIG_CRAMFS is not set
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
-@@ -1242,6 +1260,8 @@
+@@ -1242,6 +1260,8 @@ CONFIG_BITREVERSE=y
CONFIG_CRC32=y
# CONFIG_CRC7 is not set
# CONFIG_LIBCRC32C is not set
@@ -30909,7 +30909,7 @@
CONFIG_HAS_IOPORT=y
--- a/arch/powerpc/configs/mpc834x_itx_defconfig
+++ b/arch/powerpc/configs/mpc834x_itx_defconfig
-@@ -570,7 +570,8 @@
+@@ -570,7 +570,8 @@ CONFIG_SATA_SIL=y
# CONFIG_PATA_SIS is not set
# CONFIG_PATA_VIA is not set
# CONFIG_PATA_WINBOND is not set
@@ -31802,7 +31802,7 @@
+CONFIG_CRYPTO_HW=y
--- a/arch/powerpc/configs/mpc8610_hpcd_defconfig
+++ b/arch/powerpc/configs/mpc8610_hpcd_defconfig
-@@ -696,7 +696,7 @@
+@@ -696,7 +696,7 @@ CONFIG_SERIAL_8250_RSA=y
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_JSM is not set
@@ -31811,7 +31811,7 @@
CONFIG_UNIX98_PTYS=y
# CONFIG_LEGACY_PTYS is not set
# CONFIG_IPMI_HANDLER is not set
-@@ -708,7 +708,60 @@
+@@ -708,7 +708,60 @@ CONFIG_UNIX98_PTYS=y
# CONFIG_RAW_DRIVER is not set
# CONFIG_TCG_TPM is not set
CONFIG_DEVPORT=y
@@ -31873,7 +31873,7 @@
#
# SPI support
-@@ -763,7 +816,119 @@
+@@ -763,7 +816,119 @@ CONFIG_DUMMY_CONSOLE=y
#
# Sound
#
@@ -32006,7 +32006,7 @@
#
CONFIG_PPC64=y
-@@ -152,7 +152,6 @@
+@@ -152,7 +152,6 @@ CONFIG_PPC_PASEMI=y
CONFIG_PPC_PASEMI_IOMMU=y
# CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set
CONFIG_PPC_PASEMI_MDIO=y
@@ -32014,7 +32014,7 @@
# CONFIG_PPC_CELLEB is not set
# CONFIG_PPC_PS3 is not set
# CONFIG_PPC_CELL is not set
-@@ -256,7 +255,7 @@
+@@ -256,7 +255,7 @@ CONFIG_PCI_DOMAINS=y
CONFIG_PCI_SYSCALL=y
# CONFIG_PCIEPORTBUS is not set
CONFIG_ARCH_SUPPORTS_MSI=y
@@ -32023,7 +32023,7 @@
CONFIG_PCI_LEGACY=y
# CONFIG_PCI_DEBUG is not set
CONFIG_PCCARD=y
-@@ -663,7 +662,26 @@
+@@ -663,7 +662,26 @@ CONFIG_PATA_PCMCIA=y
# CONFIG_PATA_VIA is not set
# CONFIG_PATA_WINBOND is not set
CONFIG_PATA_PLATFORM=y
@@ -32051,7 +32051,7 @@
# CONFIG_FUSION is not set
#
-@@ -1686,6 +1704,10 @@
+@@ -1686,6 +1704,10 @@ CONFIG_XMON_DISASSEMBLY=y
# CONFIG_KEYS is not set
# CONFIG_SECURITY is not set
# CONFIG_SECURITY_FILE_CAPABILITIES is not set
@@ -32073,7 +32073,7 @@
#
CONFIG_PPC64=y
-@@ -211,7 +211,7 @@
+@@ -211,7 +211,7 @@ CONFIG_MMIO_NVRAM=y
CONFIG_MPIC_U3_HT_IRQS=y
CONFIG_MPIC_BROKEN_REGREAD=y
CONFIG_IBMVIO=y
@@ -32082,7 +32082,7 @@
# CONFIG_PPC_MPC106 is not set
CONFIG_PPC_970_NAP=y
CONFIG_PPC_INDIRECT_IO=y
-@@ -375,7 +375,7 @@
+@@ -375,7 +375,7 @@ CONFIG_INET_TUNNEL=y
CONFIG_INET_XFRM_MODE_TRANSPORT=y
CONFIG_INET_XFRM_MODE_TUNNEL=y
CONFIG_INET_XFRM_MODE_BEET=y
@@ -32091,7 +32091,7 @@
CONFIG_INET_DIAG=y
CONFIG_INET_TCP_DIAG=y
# CONFIG_TCP_CONG_ADVANCED is not set
-@@ -929,6 +929,7 @@
+@@ -929,6 +929,7 @@ CONFIG_SPIDER_NET=m
CONFIG_NETDEV_10000=y
# CONFIG_CHELSIO_T1 is not set
# CONFIG_CHELSIO_T3 is not set
@@ -32099,7 +32099,7 @@
# CONFIG_IXGBE is not set
CONFIG_IXGB=m
# CONFIG_IXGB_NAPI is not set
-@@ -1558,6 +1559,7 @@
+@@ -1558,6 +1559,7 @@ CONFIG_INFINIBAND_ADDR_TRANS=y
CONFIG_INFINIBAND_MTHCA=m
CONFIG_INFINIBAND_MTHCA_DEBUG=y
# CONFIG_INFINIBAND_IPATH is not set
@@ -32119,7 +32119,7 @@
#
CONFIG_PPC64=y
-@@ -103,6 +103,7 @@
+@@ -103,6 +103,7 @@ CONFIG_VM_EVENT_COUNTERS=y
CONFIG_SLAB=y
# CONFIG_SLUB is not set
# CONFIG_SLOB is not set
@@ -32127,7 +32127,7 @@
CONFIG_RT_MUTEXES=y
# CONFIG_TINY_SHMEM is not set
CONFIG_BASE_SMALL=0
-@@ -154,7 +155,6 @@
+@@ -154,7 +155,6 @@ CONFIG_PPC_PS3=y
# CONFIG_PS3_ADVANCED is not set
CONFIG_PS3_HTAB_SIZE=20
# CONFIG_PS3_DYNAMIC_DMA is not set
@@ -32135,7 +32135,7 @@
CONFIG_PS3_VUART=y
CONFIG_PS3_PS3AV=y
CONFIG_PS3_SYS_MANAGER=y
-@@ -162,6 +162,7 @@
+@@ -162,6 +162,7 @@ CONFIG_PS3_STORAGE=y
CONFIG_PS3_DISK=y
CONFIG_PS3_ROM=y
CONFIG_PS3_FLASH=y
@@ -32143,7 +32143,7 @@
CONFIG_PPC_CELL=y
# CONFIG_PPC_CELL_NATIVE is not set
# CONFIG_PPC_IBM_CELL_BLADE is not set
-@@ -225,7 +226,7 @@
+@@ -225,7 +226,7 @@ CONFIG_HAVE_MEMORY_PRESENT=y
# CONFIG_SPARSEMEM_STATIC is not set
CONFIG_SPARSEMEM_EXTREME=y
CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
@@ -32152,7 +32152,7 @@
CONFIG_MEMORY_HOTPLUG=y
CONFIG_MEMORY_HOTPLUG_SPARSE=y
CONFIG_SPLIT_PTLOCK_CPUS=4
-@@ -338,7 +339,26 @@
+@@ -338,7 +339,26 @@ CONFIG_IPV6_SIT=y
# CONFIG_NET_PKTGEN is not set
# CONFIG_HAMRADIO is not set
# CONFIG_IRDA is not set
@@ -32180,7 +32180,7 @@
# CONFIG_AF_RXRPC is not set
#
-@@ -666,14 +686,14 @@
+@@ -666,14 +686,14 @@ CONFIG_LOGO_LINUX_CLUT224=y
#
# Sound
#
@@ -32199,7 +32199,7 @@
# CONFIG_SND_SEQUENCER is not set
# CONFIG_SND_MIXER_OSS is not set
# CONFIG_SND_PCM_OSS is not set
-@@ -702,7 +722,7 @@
+@@ -702,7 +722,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
#
# ALSA PowerPC devices
#
@@ -32208,7 +32208,7 @@
CONFIG_SND_PS3_DEFAULT_START_DELAY=2000
#
-@@ -747,7 +767,7 @@
+@@ -747,7 +767,7 @@ CONFIG_USB_SUPPORT=y
CONFIG_USB_ARCH_HAS_HCD=y
CONFIG_USB_ARCH_HAS_OHCI=y
CONFIG_USB_ARCH_HAS_EHCI=y
@@ -32217,7 +32217,7 @@
# CONFIG_USB_DEBUG is not set
#
-@@ -761,13 +781,13 @@
+@@ -761,13 +781,13 @@ CONFIG_USB_DEVICEFS=y
#
# USB Host Controller Drivers
#
@@ -32233,7 +32233,7 @@
# CONFIG_USB_OHCI_HCD_PPC_OF is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
-@@ -1033,7 +1053,8 @@
+@@ -1033,7 +1053,8 @@ CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
CONFIG_INSTRUMENTATION=y
@@ -33131,7 +33131,7 @@
#
# CONFIG_PPC64 is not set
-@@ -129,6 +129,7 @@
+@@ -129,6 +129,7 @@ CONFIG_DEFAULT_AS=y
# CONFIG_DEFAULT_CFQ is not set
# CONFIG_DEFAULT_NOOP is not set
CONFIG_DEFAULT_IOSCHED="anticipatory"
@@ -33139,7 +33139,7 @@
#
# Platform support
-@@ -141,8 +142,10 @@
+@@ -141,8 +142,10 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
# CONFIG_BAMBOO is not set
# CONFIG_EBONY is not set
CONFIG_SEQUOIA=y
@@ -33151,7 +33151,7 @@
# CONFIG_MPIC is not set
# CONFIG_MPIC_WEIRD is not set
# CONFIG_PPC_I8259 is not set
-@@ -446,9 +449,7 @@
+@@ -446,9 +449,7 @@ CONFIG_MISC_DEVICES=y
# CONFIG_FIREWIRE is not set
# CONFIG_IEEE1394 is not set
# CONFIG_I2O is not set
@@ -33162,7 +33162,7 @@
CONFIG_NETDEVICES=y
# CONFIG_NETDEVICES_MULTIQUEUE is not set
# CONFIG_DUMMY is not set
-@@ -459,10 +460,28 @@
+@@ -459,10 +460,28 @@ CONFIG_NETDEVICES=y
# CONFIG_VETH is not set
# CONFIG_IP1000 is not set
# CONFIG_ARCNET is not set
@@ -33192,7 +33192,7 @@
CONFIG_NETDEV_1000=y
# CONFIG_ACENIC is not set
# CONFIG_DL2K is not set
-@@ -811,6 +830,7 @@
+@@ -811,6 +830,7 @@ CONFIG_PPC_EARLY_DEBUG=y
# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
CONFIG_PPC_EARLY_DEBUG_44x=y
@@ -35182,7 +35182,7 @@
#
# CONFIG_PPC64 is not set
-@@ -40,7 +40,7 @@
+@@ -40,7 +40,7 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
CONFIG_PPC_OF=y
CONFIG_OF=y
@@ -35191,7 +35191,7 @@
# CONFIG_GENERIC_TBSYNC is not set
CONFIG_AUDIT_ARCH=y
CONFIG_GENERIC_BUG=y
-@@ -127,6 +127,7 @@
+@@ -127,6 +127,7 @@ CONFIG_DEFAULT_AS=y
# CONFIG_DEFAULT_CFQ is not set
# CONFIG_DEFAULT_NOOP is not set
CONFIG_DEFAULT_IOSCHED="anticipatory"
@@ -35199,7 +35199,7 @@
#
# Platform support
-@@ -136,7 +137,9 @@
+@@ -136,7 +137,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
# CONFIG_PPC_CELL is not set
# CONFIG_PPC_CELL_NATIVE is not set
# CONFIG_PQ2ADS is not set
@@ -35209,7 +35209,7 @@
CONFIG_WALNUT=y
# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
CONFIG_405GP=y
-@@ -204,11 +207,17 @@
+@@ -204,11 +207,17 @@ CONFIG_ISA_DMA_API=y
# Bus options
#
CONFIG_ZONE_DMA=y
@@ -35231,7 +35231,7 @@
#
# Advanced setup
-@@ -373,11 +382,13 @@
+@@ -373,11 +382,13 @@ CONFIG_MTD_CFI_UTIL=y
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
# CONFIG_MTD_PHYSMAP is not set
CONFIG_MTD_PHYSMAP_OF=y
@@ -35245,7 +35245,7 @@
# CONFIG_MTD_SLRAM is not set
# CONFIG_MTD_PHRAM is not set
# CONFIG_MTD_MTDRAM is not set
-@@ -400,9 +411,14 @@
+@@ -400,9 +411,14 @@ CONFIG_OF_DEVICE=y
# CONFIG_PARPORT is not set
CONFIG_BLK_DEV=y
# CONFIG_BLK_DEV_FD is not set
@@ -35260,7 +35260,7 @@
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=35000
-@@ -411,7 +427,10 @@
+@@ -411,7 +427,10 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
# CONFIG_ATA_OVER_ETH is not set
# CONFIG_XILINX_SYSACE is not set
CONFIG_MISC_DEVICES=y
@@ -35271,7 +35271,7 @@
# CONFIG_IDE is not set
#
-@@ -423,6 +442,14 @@
+@@ -423,6 +442,14 @@ CONFIG_MISC_DEVICES=y
# CONFIG_SCSI_NETLINK is not set
# CONFIG_ATA is not set
# CONFIG_MD is not set
@@ -35286,7 +35286,7 @@
# CONFIG_MACINTOSH_DRIVERS is not set
CONFIG_NETDEVICES=y
# CONFIG_NETDEVICES_MULTIQUEUE is not set
-@@ -432,9 +459,17 @@
+@@ -432,9 +459,17 @@ CONFIG_NETDEVICES=y
# CONFIG_EQUALIZER is not set
# CONFIG_TUN is not set
# CONFIG_VETH is not set
@@ -35304,7 +35304,7 @@
CONFIG_IBM_NEW_EMAC=y
CONFIG_IBM_NEW_EMAC_RXB=128
CONFIG_IBM_NEW_EMAC_TXB=64
-@@ -446,9 +481,38 @@
+@@ -446,9 +481,38 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
# CONFIG_IBM_NEW_EMAC_RGMII is not set
# CONFIG_IBM_NEW_EMAC_TAH is not set
# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
@@ -35343,7 +35343,7 @@
#
# Wireless LAN
-@@ -456,6 +520,8 @@
+@@ -456,6 +520,8 @@ CONFIG_NETDEV_10000=y
# CONFIG_WLAN_PRE80211 is not set
# CONFIG_WLAN_80211 is not set
# CONFIG_WAN is not set
@@ -35352,7 +35352,7 @@
# CONFIG_PPP is not set
# CONFIG_SLIP is not set
# CONFIG_SHAPER is not set
-@@ -487,6 +553,7 @@
+@@ -487,6 +553,7 @@ CONFIG_NETDEV_10000=y
#
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
@@ -35360,7 +35360,7 @@
CONFIG_SERIAL_8250_NR_UARTS=4
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
CONFIG_SERIAL_8250_EXTENDED=y
-@@ -501,6 +568,7 @@
+@@ -501,6 +568,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
# CONFIG_SERIAL_UARTLITE is not set
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
@@ -35368,7 +35368,7 @@
CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_UNIX98_PTYS=y
CONFIG_LEGACY_PTYS=y
-@@ -510,8 +578,10 @@
+@@ -510,8 +578,10 @@ CONFIG_LEGACY_PTY_COUNT=256
# CONFIG_NVRAM is not set
# CONFIG_GEN_RTC is not set
# CONFIG_R3964 is not set
@@ -35379,7 +35379,7 @@
# CONFIG_I2C is not set
#
-@@ -545,6 +615,8 @@
+@@ -545,6 +615,8 @@ CONFIG_SSB_POSSIBLE=y
#
# Graphics support
#
@@ -35388,7 +35388,7 @@
# CONFIG_VGASTATE is not set
CONFIG_VIDEO_OUTPUT_CONTROL=m
# CONFIG_FB is not set
-@@ -560,9 +632,10 @@
+@@ -560,9 +632,10 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
#
# CONFIG_SOUND is not set
CONFIG_USB_SUPPORT=y
@@ -35402,7 +35402,7 @@
#
# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-@@ -574,6 +647,7 @@
+@@ -574,6 +647,7 @@ CONFIG_USB_SUPPORT=y
# CONFIG_USB_GADGET is not set
# CONFIG_MMC is not set
# CONFIG_NEW_LEDS is not set
@@ -36481,7 +36481,7 @@
endif
ifeq ($(CONFIG_PPC32),y)
CFLAGS_prom_init.o += -fPIC
-@@ -70,6 +70,7 @@
+@@ -70,6 +70,7 @@ pci64-$(CONFIG_PPC64) += pci_dn.o isa-b
obj-$(CONFIG_PCI) += pci_$(CONFIG_WORD_SIZE).o $(pci64-y) \
pci-common.o
obj-$(CONFIG_PCI_MSI) += msi.o
@@ -36489,7 +36489,7 @@
obj-$(CONFIG_KEXEC) += machine_kexec.o crash.o \
machine_kexec_$(CONFIG_WORD_SIZE).o
obj-$(CONFIG_AUDIT) += audit.o
-@@ -91,3 +92,13 @@
+@@ -91,3 +92,13 @@ obj-$(CONFIG_PPC64) += $(obj64-y)
extra-$(CONFIG_PPC_FPU) += fpu.o
extra-$(CONFIG_PPC64) += entry_64.o
@@ -36505,7 +36505,7 @@
+ $(call cmd,systbl_chk)
--- a/arch/powerpc/kernel/btext.c
+++ b/arch/powerpc/kernel/btext.c
-@@ -236,7 +236,7 @@
+@@ -236,7 +236,7 @@ int __init btext_find_display(int allow_
if (rc == 0 || !allow_nonstdout)
return rc;
@@ -36516,7 +36516,7 @@
rc = btext_initialize(np);
--- a/arch/powerpc/kernel/cpu_setup_44x.S
+++ b/arch/powerpc/kernel/cpu_setup_44x.S
-@@ -23,11 +23,24 @@
+@@ -23,11 +23,24 @@ _GLOBAL(__setup_cpu_440epx)
mflr r4
bl __init_fpu_44x
bl __plb_disable_wrp
@@ -36544,7 +36544,7 @@
_GLOBAL(__init_fpu_44x)
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
-@@ -33,7 +33,9 @@
+@@ -33,7 +33,9 @@ EXPORT_SYMBOL(cur_cpu_spec);
#ifdef CONFIG_PPC32
extern void __setup_cpu_440ep(unsigned long offset, struct cpu_spec* spec);
extern void __setup_cpu_440epx(unsigned long offset, struct cpu_spec* spec);
@@ -36554,7 +36554,7 @@
extern void __setup_cpu_603(unsigned long offset, struct cpu_spec* spec);
extern void __setup_cpu_604(unsigned long offset, struct cpu_spec* spec);
extern void __setup_cpu_750(unsigned long offset, struct cpu_spec* spec);
-@@ -85,6 +87,7 @@
+@@ -85,6 +87,7 @@ static struct cpu_spec __initdata cpu_sp
.pmc_type = PPC_PMC_IBM,
.oprofile_cpu_type = "ppc64/power3",
.oprofile_type = PPC_OPROFILE_RS64,
@@ -36562,7 +36562,7 @@
.platform = "power3",
},
{ /* Power3+ */
-@@ -99,6 +102,7 @@
+@@ -99,6 +102,7 @@ static struct cpu_spec __initdata cpu_sp
.pmc_type = PPC_PMC_IBM,
.oprofile_cpu_type = "ppc64/power3",
.oprofile_type = PPC_OPROFILE_RS64,
@@ -36570,7 +36570,7 @@
.platform = "power3",
},
{ /* Northstar */
-@@ -113,6 +117,7 @@
+@@ -113,6 +117,7 @@ static struct cpu_spec __initdata cpu_sp
.pmc_type = PPC_PMC_IBM,
.oprofile_cpu_type = "ppc64/rs64",
.oprofile_type = PPC_OPROFILE_RS64,
@@ -36578,7 +36578,7 @@
.platform = "rs64",
},
{ /* Pulsar */
-@@ -127,6 +132,7 @@
+@@ -127,6 +132,7 @@ static struct cpu_spec __initdata cpu_sp
.pmc_type = PPC_PMC_IBM,
.oprofile_cpu_type = "ppc64/rs64",
.oprofile_type = PPC_OPROFILE_RS64,
@@ -36586,7 +36586,7 @@
.platform = "rs64",
},
{ /* I-star */
-@@ -141,6 +147,7 @@
+@@ -141,6 +147,7 @@ static struct cpu_spec __initdata cpu_sp
.pmc_type = PPC_PMC_IBM,
.oprofile_cpu_type = "ppc64/rs64",
.oprofile_type = PPC_OPROFILE_RS64,
@@ -36594,7 +36594,7 @@
.platform = "rs64",
},
{ /* S-star */
-@@ -155,6 +162,7 @@
+@@ -155,6 +162,7 @@ static struct cpu_spec __initdata cpu_sp
.pmc_type = PPC_PMC_IBM,
.oprofile_cpu_type = "ppc64/rs64",
.oprofile_type = PPC_OPROFILE_RS64,
@@ -36602,7 +36602,7 @@
.platform = "rs64",
},
{ /* Power4 */
-@@ -169,6 +177,7 @@
+@@ -169,6 +177,7 @@ static struct cpu_spec __initdata cpu_sp
.pmc_type = PPC_PMC_IBM,
.oprofile_cpu_type = "ppc64/power4",
.oprofile_type = PPC_OPROFILE_POWER4,
@@ -36610,7 +36610,7 @@
.platform = "power4",
},
{ /* Power4+ */
-@@ -183,6 +192,7 @@
+@@ -183,6 +192,7 @@ static struct cpu_spec __initdata cpu_sp
.pmc_type = PPC_PMC_IBM,
.oprofile_cpu_type = "ppc64/power4",
.oprofile_type = PPC_OPROFILE_POWER4,
@@ -36618,7 +36618,7 @@
.platform = "power4",
},
{ /* PPC970 */
-@@ -200,6 +210,7 @@
+@@ -200,6 +210,7 @@ static struct cpu_spec __initdata cpu_sp
.cpu_restore = __restore_cpu_ppc970,
.oprofile_cpu_type = "ppc64/970",
.oprofile_type = PPC_OPROFILE_POWER4,
@@ -36626,7 +36626,7 @@
.platform = "ppc970",
},
{ /* PPC970FX */
-@@ -217,6 +228,7 @@
+@@ -217,6 +228,7 @@ static struct cpu_spec __initdata cpu_sp
.cpu_restore = __restore_cpu_ppc970,
.oprofile_cpu_type = "ppc64/970",
.oprofile_type = PPC_OPROFILE_POWER4,
@@ -36634,7 +36634,7 @@
.platform = "ppc970",
},
{ /* PPC970MP DD1.0 - no DEEPNAP, use regular 970 init */
-@@ -234,6 +246,7 @@
+@@ -234,6 +246,7 @@ static struct cpu_spec __initdata cpu_sp
.cpu_restore = __restore_cpu_ppc970,
.oprofile_cpu_type = "ppc64/970MP",
.oprofile_type = PPC_OPROFILE_POWER4,
@@ -36642,7 +36642,7 @@
.platform = "ppc970",
},
{ /* PPC970MP */
-@@ -251,6 +264,7 @@
+@@ -251,6 +264,7 @@ static struct cpu_spec __initdata cpu_sp
.cpu_restore = __restore_cpu_ppc970,
.oprofile_cpu_type = "ppc64/970MP",
.oprofile_type = PPC_OPROFILE_POWER4,
@@ -36650,7 +36650,7 @@
.platform = "ppc970",
},
{ /* PPC970GX */
-@@ -267,6 +281,7 @@
+@@ -267,6 +281,7 @@ static struct cpu_spec __initdata cpu_sp
.cpu_setup = __setup_cpu_ppc970,
.oprofile_cpu_type = "ppc64/970",
.oprofile_type = PPC_OPROFILE_POWER4,
@@ -36658,7 +36658,7 @@
.platform = "ppc970",
},
{ /* Power5 GR */
-@@ -286,6 +301,7 @@
+@@ -286,6 +301,7 @@ static struct cpu_spec __initdata cpu_sp
*/
.oprofile_mmcra_sihv = MMCRA_SIHV,
.oprofile_mmcra_sipr = MMCRA_SIPR,
@@ -36666,7 +36666,7 @@
.platform = "power5",
},
{ /* Power5++ */
-@@ -301,6 +317,7 @@
+@@ -301,6 +317,7 @@ static struct cpu_spec __initdata cpu_sp
.oprofile_type = PPC_OPROFILE_POWER4,
.oprofile_mmcra_sihv = MMCRA_SIHV,
.oprofile_mmcra_sipr = MMCRA_SIPR,
@@ -36674,7 +36674,7 @@
.platform = "power5+",
},
{ /* Power5 GS */
-@@ -317,6 +334,7 @@
+@@ -317,6 +334,7 @@ static struct cpu_spec __initdata cpu_sp
.oprofile_type = PPC_OPROFILE_POWER4,
.oprofile_mmcra_sihv = MMCRA_SIHV,
.oprofile_mmcra_sipr = MMCRA_SIPR,
@@ -36682,7 +36682,7 @@
.platform = "power5+",
},
{ /* POWER6 in P5+ mode; 2.04-compliant processor */
-@@ -327,6 +345,7 @@
+@@ -327,6 +345,7 @@ static struct cpu_spec __initdata cpu_sp
.cpu_user_features = COMMON_USER_POWER5_PLUS,
.icache_bsize = 128,
.dcache_bsize = 128,
@@ -36690,7 +36690,7 @@
.platform = "power5+",
},
{ /* Power6 */
-@@ -346,6 +365,7 @@
+@@ -346,6 +365,7 @@ static struct cpu_spec __initdata cpu_sp
.oprofile_mmcra_sipr = POWER6_MMCRA_SIPR,
.oprofile_mmcra_clear = POWER6_MMCRA_THRM |
POWER6_MMCRA_OTHER,
@@ -36698,7 +36698,7 @@
.platform = "power6x",
},
{ /* 2.05-compliant processor, i.e. Power6 "architected" mode */
-@@ -356,6 +376,7 @@
+@@ -356,6 +376,7 @@ static struct cpu_spec __initdata cpu_sp
.cpu_user_features = COMMON_USER_POWER6,
.icache_bsize = 128,
.dcache_bsize = 128,
@@ -36706,7 +36706,7 @@
.platform = "power6",
},
{ /* Cell Broadband Engine */
-@@ -372,6 +393,7 @@
+@@ -372,6 +393,7 @@ static struct cpu_spec __initdata cpu_sp
.pmc_type = PPC_PMC_IBM,
.oprofile_cpu_type = "ppc64/cell-be",
.oprofile_type = PPC_OPROFILE_CELL,
@@ -36714,7 +36714,7 @@
.platform = "ppc-cell-be",
},
{ /* PA Semi PA6T */
-@@ -388,6 +410,7 @@
+@@ -388,6 +410,7 @@ static struct cpu_spec __initdata cpu_sp
.cpu_restore = __restore_cpu_pa6t,
.oprofile_cpu_type = "ppc64/pa6t",
.oprofile_type = PPC_OPROFILE_PA6T,
@@ -36722,7 +36722,7 @@
.platform = "pa6t",
},
{ /* default match */
-@@ -400,6 +423,7 @@
+@@ -400,6 +423,7 @@ static struct cpu_spec __initdata cpu_sp
.dcache_bsize = 128,
.num_pmcs = 6,
.pmc_type = PPC_PMC_IBM,
@@ -36730,7 +36730,7 @@
.platform = "power4",
}
#endif /* CONFIG_PPC64 */
-@@ -414,6 +438,7 @@
+@@ -414,6 +438,7 @@ static struct cpu_spec __initdata cpu_sp
PPC_FEATURE_UNIFIED_CACHE | PPC_FEATURE_NO_TB,
.icache_bsize = 32,
.dcache_bsize = 32,
@@ -36738,7 +36738,7 @@
.platform = "ppc601",
},
{ /* 603 */
-@@ -425,6 +450,7 @@
+@@ -425,6 +450,7 @@ static struct cpu_spec __initdata cpu_sp
.icache_bsize = 32,
.dcache_bsize = 32,
.cpu_setup = __setup_cpu_603,
@@ -36746,7 +36746,7 @@
.platform = "ppc603",
},
{ /* 603e */
-@@ -436,6 +462,7 @@
+@@ -436,6 +462,7 @@ static struct cpu_spec __initdata cpu_sp
.icache_bsize = 32,
.dcache_bsize = 32,
.cpu_setup = __setup_cpu_603,
@@ -36754,7 +36754,7 @@
.platform = "ppc603",
},
{ /* 603ev */
-@@ -447,6 +474,7 @@
+@@ -447,6 +474,7 @@ static struct cpu_spec __initdata cpu_sp
.icache_bsize = 32,
.dcache_bsize = 32,
.cpu_setup = __setup_cpu_603,
@@ -36762,7 +36762,7 @@
.platform = "ppc603",
},
{ /* 604 */
-@@ -459,6 +487,7 @@
+@@ -459,6 +487,7 @@ static struct cpu_spec __initdata cpu_sp
.dcache_bsize = 32,
.num_pmcs = 2,
.cpu_setup = __setup_cpu_604,
@@ -36770,7 +36770,7 @@
.platform = "ppc604",
},
{ /* 604e */
-@@ -471,6 +500,7 @@
+@@ -471,6 +500,7 @@ static struct cpu_spec __initdata cpu_sp
.dcache_bsize = 32,
.num_pmcs = 4,
.cpu_setup = __setup_cpu_604,
@@ -36778,7 +36778,7 @@
.platform = "ppc604",
},
{ /* 604r */
-@@ -483,6 +513,7 @@
+@@ -483,6 +513,7 @@ static struct cpu_spec __initdata cpu_sp
.dcache_bsize = 32,
.num_pmcs = 4,
.cpu_setup = __setup_cpu_604,
@@ -36786,7 +36786,7 @@
.platform = "ppc604",
},
{ /* 604ev */
-@@ -495,6 +526,7 @@
+@@ -495,6 +526,7 @@ static struct cpu_spec __initdata cpu_sp
.dcache_bsize = 32,
.num_pmcs = 4,
.cpu_setup = __setup_cpu_604,
@@ -36794,7 +36794,7 @@
.platform = "ppc604",
},
{ /* 740/750 (0x4202, don't support TAU ?) */
-@@ -507,6 +539,7 @@
+@@ -507,6 +539,7 @@ static struct cpu_spec __initdata cpu_sp
.dcache_bsize = 32,
.num_pmcs = 4,
.cpu_setup = __setup_cpu_750,
@@ -36802,7 +36802,7 @@
.platform = "ppc750",
},
{ /* 750CX (80100 and 8010x?) */
-@@ -519,6 +552,7 @@
+@@ -519,6 +552,7 @@ static struct cpu_spec __initdata cpu_sp
.dcache_bsize = 32,
.num_pmcs = 4,
.cpu_setup = __setup_cpu_750cx,
@@ -36810,7 +36810,7 @@
.platform = "ppc750",
},
{ /* 750CX (82201 and 82202) */
-@@ -531,6 +565,7 @@
+@@ -531,6 +565,7 @@ static struct cpu_spec __initdata cpu_sp
.dcache_bsize = 32,
.num_pmcs = 4,
.cpu_setup = __setup_cpu_750cx,
@@ -36818,7 +36818,7 @@
.platform = "ppc750",
},
{ /* 750CXe (82214) */
-@@ -543,6 +578,7 @@
+@@ -543,6 +578,7 @@ static struct cpu_spec __initdata cpu_sp
.dcache_bsize = 32,
.num_pmcs = 4,
.cpu_setup = __setup_cpu_750cx,
@@ -36826,7 +36826,7 @@
.platform = "ppc750",
},
{ /* 750CXe "Gekko" (83214) */
-@@ -555,6 +591,7 @@
+@@ -555,6 +591,7 @@ static struct cpu_spec __initdata cpu_sp
.dcache_bsize = 32,
.num_pmcs = 4,
.cpu_setup = __setup_cpu_750cx,
@@ -36834,7 +36834,7 @@
.platform = "ppc750",
},
{ /* 750CL */
-@@ -567,6 +604,7 @@
+@@ -567,6 +604,7 @@ static struct cpu_spec __initdata cpu_sp
.dcache_bsize = 32,
.num_pmcs = 4,
.cpu_setup = __setup_cpu_750,
@@ -36842,7 +36842,7 @@
.platform = "ppc750",
},
{ /* 745/755 */
-@@ -579,6 +617,7 @@
+@@ -579,6 +617,7 @@ static struct cpu_spec __initdata cpu_sp
.dcache_bsize = 32,
.num_pmcs = 4,
.cpu_setup = __setup_cpu_750,
@@ -36850,7 +36850,7 @@
.platform = "ppc750",
},
{ /* 750FX rev 1.x */
-@@ -591,6 +630,7 @@
+@@ -591,6 +630,7 @@ static struct cpu_spec __initdata cpu_sp
.dcache_bsize = 32,
.num_pmcs = 4,
.cpu_setup = __setup_cpu_750,
@@ -36858,7 +36858,7 @@
.platform = "ppc750",
},
{ /* 750FX rev 2.0 must disable HID0[DPM] */
-@@ -603,6 +643,7 @@
+@@ -603,6 +643,7 @@ static struct cpu_spec __initdata cpu_sp
.dcache_bsize = 32,
.num_pmcs = 4,
.cpu_setup = __setup_cpu_750,
@@ -36866,7 +36866,7 @@
.platform = "ppc750",
},
{ /* 750FX (All revs except 2.0) */
-@@ -615,6 +656,7 @@
+@@ -615,6 +656,7 @@ static struct cpu_spec __initdata cpu_sp
.dcache_bsize = 32,
.num_pmcs = 4,
.cpu_setup = __setup_cpu_750fx,
@@ -36874,7 +36874,7 @@
.platform = "ppc750",
},
{ /* 750GX */
-@@ -627,6 +669,7 @@
+@@ -627,6 +669,7 @@ static struct cpu_spec __initdata cpu_sp
.dcache_bsize = 32,
.num_pmcs = 4,
.cpu_setup = __setup_cpu_750fx,
@@ -36882,7 +36882,7 @@
.platform = "ppc750",
},
{ /* 740/750 (L2CR bit need fixup for 740) */
-@@ -639,6 +682,7 @@
+@@ -639,6 +682,7 @@ static struct cpu_spec __initdata cpu_sp
.dcache_bsize = 32,
.num_pmcs = 4,
.cpu_setup = __setup_cpu_750,
@@ -36890,7 +36890,7 @@
.platform = "ppc750",
},
{ /* 7400 rev 1.1 ? (no TAU) */
-@@ -652,6 +696,7 @@
+@@ -652,6 +696,7 @@ static struct cpu_spec __initdata cpu_sp
.dcache_bsize = 32,
.num_pmcs = 4,
.cpu_setup = __setup_cpu_7400,
@@ -36898,7 +36898,7 @@
.platform = "ppc7400",
},
{ /* 7400 */
-@@ -665,6 +710,7 @@
+@@ -665,6 +710,7 @@ static struct cpu_spec __initdata cpu_sp
.dcache_bsize = 32,
.num_pmcs = 4,
.cpu_setup = __setup_cpu_7400,
@@ -36906,7 +36906,7 @@
.platform = "ppc7400",
},
{ /* 7410 */
-@@ -678,6 +724,7 @@
+@@ -678,6 +724,7 @@ static struct cpu_spec __initdata cpu_sp
.dcache_bsize = 32,
.num_pmcs = 4,
.cpu_setup = __setup_cpu_7410,
@@ -36914,7 +36914,7 @@
.platform = "ppc7400",
},
{ /* 7450 2.0 - no doze/nap */
-@@ -693,6 +740,7 @@
+@@ -693,6 +740,7 @@ static struct cpu_spec __initdata cpu_sp
.cpu_setup = __setup_cpu_745x,
.oprofile_cpu_type = "ppc/7450",
.oprofile_type = PPC_OPROFILE_G4,
@@ -36922,7 +36922,7 @@
.platform = "ppc7450",
},
{ /* 7450 2.1 */
-@@ -708,6 +756,7 @@
+@@ -708,6 +756,7 @@ static struct cpu_spec __initdata cpu_sp
.cpu_setup = __setup_cpu_745x,
.oprofile_cpu_type = "ppc/7450",
.oprofile_type = PPC_OPROFILE_G4,
@@ -36930,7 +36930,7 @@
.platform = "ppc7450",
},
{ /* 7450 2.3 and newer */
-@@ -723,6 +772,7 @@
+@@ -723,6 +772,7 @@ static struct cpu_spec __initdata cpu_sp
.cpu_setup = __setup_cpu_745x,
.oprofile_cpu_type = "ppc/7450",
.oprofile_type = PPC_OPROFILE_G4,
@@ -36938,7 +36938,7 @@
.platform = "ppc7450",
},
{ /* 7455 rev 1.x */
-@@ -738,6 +788,7 @@
+@@ -738,6 +788,7 @@ static struct cpu_spec __initdata cpu_sp
.cpu_setup = __setup_cpu_745x,
.oprofile_cpu_type = "ppc/7450",
.oprofile_type = PPC_OPROFILE_G4,
@@ -36946,7 +36946,7 @@
.platform = "ppc7450",
},
{ /* 7455 rev 2.0 */
-@@ -753,6 +804,7 @@
+@@ -753,6 +804,7 @@ static struct cpu_spec __initdata cpu_sp
.cpu_setup = __setup_cpu_745x,
.oprofile_cpu_type = "ppc/7450",
.oprofile_type = PPC_OPROFILE_G4,
@@ -36954,7 +36954,7 @@
.platform = "ppc7450",
},
{ /* 7455 others */
-@@ -768,6 +820,7 @@
+@@ -768,6 +820,7 @@ static struct cpu_spec __initdata cpu_sp
.cpu_setup = __setup_cpu_745x,
.oprofile_cpu_type = "ppc/7450",
.oprofile_type = PPC_OPROFILE_G4,
@@ -36962,7 +36962,7 @@
.platform = "ppc7450",
},
{ /* 7447/7457 Rev 1.0 */
-@@ -783,6 +836,7 @@
+@@ -783,6 +836,7 @@ static struct cpu_spec __initdata cpu_sp
.cpu_setup = __setup_cpu_745x,
.oprofile_cpu_type = "ppc/7450",
.oprofile_type = PPC_OPROFILE_G4,
@@ -36970,7 +36970,7 @@
.platform = "ppc7450",
},
{ /* 7447/7457 Rev 1.1 */
-@@ -798,6 +852,7 @@
+@@ -798,6 +852,7 @@ static struct cpu_spec __initdata cpu_sp
.cpu_setup = __setup_cpu_745x,
.oprofile_cpu_type = "ppc/7450",
.oprofile_type = PPC_OPROFILE_G4,
@@ -36978,7 +36978,7 @@
.platform = "ppc7450",
},
{ /* 7447/7457 Rev 1.2 and later */
-@@ -812,6 +867,7 @@
+@@ -812,6 +867,7 @@ static struct cpu_spec __initdata cpu_sp
.cpu_setup = __setup_cpu_745x,
.oprofile_cpu_type = "ppc/7450",
.oprofile_type = PPC_OPROFILE_G4,
@@ -36986,7 +36986,7 @@
.platform = "ppc7450",
},
{ /* 7447A */
-@@ -827,6 +883,7 @@
+@@ -827,6 +883,7 @@ static struct cpu_spec __initdata cpu_sp
.cpu_setup = __setup_cpu_745x,
.oprofile_cpu_type = "ppc/7450",
.oprofile_type = PPC_OPROFILE_G4,
@@ -36994,7 +36994,7 @@
.platform = "ppc7450",
},
{ /* 7448 */
-@@ -842,6 +899,7 @@
+@@ -842,6 +899,7 @@ static struct cpu_spec __initdata cpu_sp
.cpu_setup = __setup_cpu_745x,
.oprofile_cpu_type = "ppc/7450",
.oprofile_type = PPC_OPROFILE_G4,
@@ -37002,7 +37002,7 @@
.platform = "ppc7450",
},
{ /* 82xx (8240, 8245, 8260 are all 603e cores) */
-@@ -853,6 +911,7 @@
+@@ -853,6 +911,7 @@ static struct cpu_spec __initdata cpu_sp
.icache_bsize = 32,
.dcache_bsize = 32,
.cpu_setup = __setup_cpu_603,
@@ -37010,7 +37010,7 @@
.platform = "ppc603",
},
{ /* All G2_LE (603e core, plus some) have the same pvr */
-@@ -864,6 +923,7 @@
+@@ -864,6 +923,7 @@ static struct cpu_spec __initdata cpu_sp
.icache_bsize = 32,
.dcache_bsize = 32,
.cpu_setup = __setup_cpu_603,
@@ -37018,7 +37018,7 @@
.platform = "ppc603",
},
{ /* e300c1 (a 603e core, plus some) on 83xx */
-@@ -875,6 +935,7 @@
+@@ -875,6 +935,7 @@ static struct cpu_spec __initdata cpu_sp
.icache_bsize = 32,
.dcache_bsize = 32,
.cpu_setup = __setup_cpu_603,
@@ -37026,7 +37026,7 @@
.platform = "ppc603",
},
{ /* e300c2 (an e300c1 core, plus some, minus FPU) on 83xx */
-@@ -886,9 +947,10 @@
+@@ -886,9 +947,10 @@ static struct cpu_spec __initdata cpu_sp
.icache_bsize = 32,
.dcache_bsize = 32,
.cpu_setup = __setup_cpu_603,
@@ -37038,7 +37038,7 @@
.pvr_mask = 0x7fff0000,
.pvr_value = 0x00850000,
.cpu_name = "e300c3",
-@@ -899,6 +961,18 @@
+@@ -899,6 +961,18 @@ static struct cpu_spec __initdata cpu_sp
.cpu_setup = __setup_cpu_603,
.platform = "ppc603",
},
@@ -37057,7 +37057,7 @@
{ /* default match, we assume split I/D cache & TB (non-601)... */
.pvr_mask = 0x00000000,
.pvr_value = 0x00000000,
-@@ -907,6 +981,7 @@
+@@ -907,6 +981,7 @@ static struct cpu_spec __initdata cpu_sp
.cpu_user_features = COMMON_USER,
.icache_bsize = 32,
.dcache_bsize = 32,
@@ -37065,7 +37065,7 @@
.platform = "ppc603",
},
#endif /* CLASSIC_PPC */
-@@ -933,6 +1008,7 @@
+@@ -933,6 +1008,7 @@ static struct cpu_spec __initdata cpu_sp
.cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU,
.icache_bsize = 16,
.dcache_bsize = 16,
@@ -37073,7 +37073,7 @@
.platform = "ppc403",
},
{ /* 403GCX */
-@@ -944,6 +1020,7 @@
+@@ -944,6 +1020,7 @@ static struct cpu_spec __initdata cpu_sp
PPC_FEATURE_HAS_MMU | PPC_FEATURE_NO_TB,
.icache_bsize = 16,
.dcache_bsize = 16,
@@ -37081,7 +37081,7 @@
.platform = "ppc403",
},
{ /* 403G ?? */
-@@ -954,6 +1031,7 @@
+@@ -954,6 +1031,7 @@ static struct cpu_spec __initdata cpu_sp
.cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU,
.icache_bsize = 16,
.dcache_bsize = 16,
@@ -37089,7 +37089,7 @@
.platform = "ppc403",
},
{ /* 405GP */
-@@ -965,6 +1043,7 @@
+@@ -965,6 +1043,7 @@ static struct cpu_spec __initdata cpu_sp
PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
.icache_bsize = 32,
.dcache_bsize = 32,
@@ -37097,7 +37097,7 @@
.platform = "ppc405",
},
{ /* STB 03xxx */
-@@ -976,6 +1055,7 @@
+@@ -976,6 +1055,7 @@ static struct cpu_spec __initdata cpu_sp
PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
.icache_bsize = 32,
.dcache_bsize = 32,
@@ -37105,7 +37105,7 @@
.platform = "ppc405",
},
{ /* STB 04xxx */
-@@ -987,6 +1067,7 @@
+@@ -987,6 +1067,7 @@ static struct cpu_spec __initdata cpu_sp
PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
.icache_bsize = 32,
.dcache_bsize = 32,
@@ -37113,7 +37113,7 @@
.platform = "ppc405",
},
{ /* NP405L */
-@@ -998,6 +1079,7 @@
+@@ -998,6 +1079,7 @@ static struct cpu_spec __initdata cpu_sp
PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
.icache_bsize = 32,
.dcache_bsize = 32,
@@ -37121,7 +37121,7 @@
.platform = "ppc405",
},
{ /* NP4GS3 */
-@@ -1009,6 +1091,7 @@
+@@ -1009,6 +1091,7 @@ static struct cpu_spec __initdata cpu_sp
PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
.icache_bsize = 32,
.dcache_bsize = 32,
@@ -37129,7 +37129,7 @@
.platform = "ppc405",
},
{ /* NP405H */
-@@ -1020,6 +1103,7 @@
+@@ -1020,6 +1103,7 @@ static struct cpu_spec __initdata cpu_sp
PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
.icache_bsize = 32,
.dcache_bsize = 32,
@@ -37137,7 +37137,7 @@
.platform = "ppc405",
},
{ /* 405GPr */
-@@ -1031,6 +1115,7 @@
+@@ -1031,6 +1115,7 @@ static struct cpu_spec __initdata cpu_sp
PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
.icache_bsize = 32,
.dcache_bsize = 32,
@@ -37145,7 +37145,7 @@
.platform = "ppc405",
},
{ /* STBx25xx */
-@@ -1042,6 +1127,7 @@
+@@ -1042,6 +1127,7 @@ static struct cpu_spec __initdata cpu_sp
PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
.icache_bsize = 32,
.dcache_bsize = 32,
@@ -37153,7 +37153,7 @@
.platform = "ppc405",
},
{ /* 405LP */
-@@ -1052,6 +1138,7 @@
+@@ -1052,6 +1138,7 @@ static struct cpu_spec __initdata cpu_sp
.cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU,
.icache_bsize = 32,
.dcache_bsize = 32,
@@ -37161,7 +37161,7 @@
.platform = "ppc405",
},
{ /* Xilinx Virtex-II Pro */
-@@ -1063,6 +1150,7 @@
+@@ -1063,6 +1150,7 @@ static struct cpu_spec __initdata cpu_sp
PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
.icache_bsize = 32,
.dcache_bsize = 32,
@@ -37169,7 +37169,7 @@
.platform = "ppc405",
},
{ /* Xilinx Virtex-4 FX */
-@@ -1074,6 +1162,7 @@
+@@ -1074,6 +1162,7 @@ static struct cpu_spec __initdata cpu_sp
PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
.icache_bsize = 32,
.dcache_bsize = 32,
@@ -37177,7 +37177,7 @@
.platform = "ppc405",
},
{ /* 405EP */
-@@ -1085,17 +1174,31 @@
+@@ -1085,17 +1174,31 @@ static struct cpu_spec __initdata cpu_sp
PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
.icache_bsize = 32,
.dcache_bsize = 32,
@@ -37211,7 +37211,7 @@
.platform = "ppc405",
},
-@@ -1109,6 +1212,7 @@
+@@ -1109,6 +1212,7 @@ static struct cpu_spec __initdata cpu_sp
.cpu_user_features = COMMON_USER_BOOKE,
.icache_bsize = 32,
.dcache_bsize = 32,
@@ -37219,7 +37219,7 @@
.platform = "ppc440",
},
{ /* Use logical PVR for 440EP (logical pvr = pvr | 0x8) */
-@@ -1120,6 +1224,7 @@
+@@ -1120,6 +1224,7 @@ static struct cpu_spec __initdata cpu_sp
.icache_bsize = 32,
.dcache_bsize = 32,
.cpu_setup = __setup_cpu_440ep,
@@ -37227,7 +37227,7 @@
.platform = "ppc440",
},
{
-@@ -1130,6 +1235,19 @@
+@@ -1130,6 +1235,19 @@ static struct cpu_spec __initdata cpu_sp
.cpu_user_features = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU,
.icache_bsize = 32,
.dcache_bsize = 32,
@@ -37247,7 +37247,7 @@
.platform = "ppc440",
},
{ /* Use logical PVR for 440EP (logical pvr = pvr | 0x8) */
-@@ -1141,6 +1259,7 @@
+@@ -1141,6 +1259,7 @@ static struct cpu_spec __initdata cpu_sp
.icache_bsize = 32,
.dcache_bsize = 32,
.cpu_setup = __setup_cpu_440ep,
@@ -37255,7 +37255,7 @@
.platform = "ppc440",
},
{ /* 440GRX */
-@@ -1152,6 +1271,7 @@
+@@ -1152,6 +1271,7 @@ static struct cpu_spec __initdata cpu_sp
.icache_bsize = 32,
.dcache_bsize = 32,
.cpu_setup = __setup_cpu_440grx,
@@ -37263,7 +37263,7 @@
.platform = "ppc440",
},
{ /* Use logical PVR for 440EPx (logical pvr = pvr | 0x8) */
-@@ -1163,6 +1283,7 @@
+@@ -1163,6 +1283,7 @@ static struct cpu_spec __initdata cpu_sp
.icache_bsize = 32,
.dcache_bsize = 32,
.cpu_setup = __setup_cpu_440epx,
@@ -37271,7 +37271,7 @@
.platform = "ppc440",
},
{ /* 440GP Rev. B */
-@@ -1173,6 +1294,7 @@
+@@ -1173,6 +1294,7 @@ static struct cpu_spec __initdata cpu_sp
.cpu_user_features = COMMON_USER_BOOKE,
.icache_bsize = 32,
.dcache_bsize = 32,
@@ -37279,7 +37279,7 @@
.platform = "ppc440gp",
},
{ /* 440GP Rev. C */
-@@ -1183,6 +1305,7 @@
+@@ -1183,6 +1305,7 @@ static struct cpu_spec __initdata cpu_sp
.cpu_user_features = COMMON_USER_BOOKE,
.icache_bsize = 32,
.dcache_bsize = 32,
@@ -37287,7 +37287,7 @@
.platform = "ppc440gp",
},
{ /* 440GX Rev. A */
-@@ -1193,6 +1316,8 @@
+@@ -1193,6 +1316,8 @@ static struct cpu_spec __initdata cpu_sp
.cpu_user_features = COMMON_USER_BOOKE,
.icache_bsize = 32,
.dcache_bsize = 32,
@@ -37296,7 +37296,7 @@
.platform = "ppc440",
},
{ /* 440GX Rev. B */
-@@ -1203,6 +1328,8 @@
+@@ -1203,6 +1328,8 @@ static struct cpu_spec __initdata cpu_sp
.cpu_user_features = COMMON_USER_BOOKE,
.icache_bsize = 32,
.dcache_bsize = 32,
@@ -37305,7 +37305,7 @@
.platform = "ppc440",
},
{ /* 440GX Rev. C */
-@@ -1213,6 +1340,8 @@
+@@ -1213,6 +1340,8 @@ static struct cpu_spec __initdata cpu_sp
.cpu_user_features = COMMON_USER_BOOKE,
.icache_bsize = 32,
.dcache_bsize = 32,
@@ -37314,7 +37314,7 @@
.platform = "ppc440",
},
{ /* 440GX Rev. F */
-@@ -1223,6 +1352,8 @@
+@@ -1223,6 +1352,8 @@ static struct cpu_spec __initdata cpu_sp
.cpu_user_features = COMMON_USER_BOOKE,
.icache_bsize = 32,
.dcache_bsize = 32,
@@ -37323,7 +37323,7 @@
.platform = "ppc440",
},
{ /* 440SP Rev. A */
-@@ -1233,6 +1364,7 @@
+@@ -1233,6 +1364,7 @@ static struct cpu_spec __initdata cpu_sp
.cpu_user_features = COMMON_USER_BOOKE,
.icache_bsize = 32,
.dcache_bsize = 32,
@@ -37331,7 +37331,7 @@
.platform = "ppc440",
},
{ /* 440SPe Rev. A */
-@@ -1243,6 +1375,8 @@
+@@ -1243,6 +1375,8 @@ static struct cpu_spec __initdata cpu_sp
.cpu_user_features = COMMON_USER_BOOKE,
.icache_bsize = 32,
.dcache_bsize = 32,
@@ -37340,7 +37340,7 @@
.platform = "ppc440",
},
{ /* 440SPe Rev. B */
-@@ -1253,10 +1387,13 @@
+@@ -1253,10 +1387,13 @@ static struct cpu_spec __initdata cpu_sp
.cpu_user_features = COMMON_USER_BOOKE,
.icache_bsize = 32,
.dcache_bsize = 32,
@@ -37354,7 +37354,7 @@
{ /* e200z5 */
.pvr_mask = 0xfff00000,
.pvr_value = 0x81000000,
-@@ -1267,6 +1404,7 @@
+@@ -1267,6 +1404,7 @@ static struct cpu_spec __initdata cpu_sp
PPC_FEATURE_HAS_EFP_SINGLE |
PPC_FEATURE_UNIFIED_CACHE,
.dcache_bsize = 32,
@@ -37362,7 +37362,7 @@
.platform = "ppc5554",
},
{ /* e200z6 */
-@@ -1280,8 +1418,10 @@
+@@ -1280,8 +1418,10 @@ static struct cpu_spec __initdata cpu_sp
PPC_FEATURE_HAS_EFP_SINGLE_COMP |
PPC_FEATURE_UNIFIED_CACHE,
.dcache_bsize = 32,
@@ -37373,7 +37373,7 @@
{ /* e500 */
.pvr_mask = 0xffff0000,
.pvr_value = 0x80200000,
-@@ -1296,6 +1436,7 @@
+@@ -1296,6 +1436,7 @@ static struct cpu_spec __initdata cpu_sp
.num_pmcs = 4,
.oprofile_cpu_type = "ppc/e500",
.oprofile_type = PPC_OPROFILE_BOOKE,
@@ -37381,7 +37381,7 @@
.platform = "ppc8540",
},
{ /* e500v2 */
-@@ -1313,9 +1454,11 @@
+@@ -1313,9 +1454,11 @@ static struct cpu_spec __initdata cpu_sp
.num_pmcs = 4,
.oprofile_cpu_type = "ppc/e500",
.oprofile_type = PPC_OPROFILE_BOOKE,
@@ -37404,7 +37404,7 @@
#ifdef DEBUG
#include <asm/udbg.h>
-@@ -45,6 +47,11 @@
+@@ -45,6 +47,11 @@ int crashing_cpu = -1;
static cpumask_t cpus_in_crash = CPU_MASK_NONE;
cpumask_t cpus_in_sr = CPU_MASK_NONE;
@@ -37416,7 +37416,7 @@
#ifdef CONFIG_SMP
static atomic_t enter_on_soft_reset = ATOMIC_INIT(0);
-@@ -285,9 +292,72 @@
+@@ -285,9 +292,72 @@ static inline void crash_kexec_stop_spus
}
#endif /* CONFIG_SPU_BASE */
@@ -37490,7 +37490,7 @@
/*
* This function is only called after the system
-@@ -301,15 +371,36 @@
+@@ -301,15 +371,36 @@ void default_machine_crash_shutdown(stru
*/
hard_irq_disable();
@@ -37533,7 +37533,7 @@
* Make a note of crashing cpu. Will be used in machine_kexec
--- a/arch/powerpc/kernel/dma_64.c
+++ b/arch/powerpc/kernel/dma_64.c
-@@ -112,10 +112,16 @@
+@@ -112,10 +112,16 @@ EXPORT_SYMBOL(dma_iommu_ops);
/*
* Generic direct DMA implementation
*
@@ -37553,7 +37553,7 @@
static void *dma_direct_alloc_coherent(struct device *dev, size_t size,
dma_addr_t *dma_handle, gfp_t flag)
-@@ -124,13 +130,12 @@
+@@ -124,13 +130,12 @@ static void *dma_direct_alloc_coherent(s
void *ret;
int node = dev->archdata.numa_node;
@@ -37568,7 +37568,7 @@
return ret;
}
-@@ -145,7 +150,7 @@
+@@ -145,7 +150,7 @@ static dma_addr_t dma_direct_map_single(
size_t size,
enum dma_data_direction direction)
{
@@ -37577,7 +37577,7 @@
}
static void dma_direct_unmap_single(struct device *dev, dma_addr_t dma_addr,
-@@ -161,7 +166,7 @@
+@@ -161,7 +166,7 @@ static int dma_direct_map_sg(struct devi
int i;
for_each_sg(sgl, sg, nents, i) {
@@ -37588,7 +37588,7 @@
--- a/arch/powerpc/kernel/head_44x.S
+++ b/arch/powerpc/kernel/head_44x.S
-@@ -289,11 +289,8 @@
+@@ -289,11 +289,8 @@ interrupt_base:
CRITICAL_EXCEPTION(0x0100, CriticalInput, unknown_exception)
/* Machine Check Interrupt */
@@ -37601,7 +37601,7 @@
/* Data Storage Interrupt */
START_EXCEPTION(DataStorage)
-@@ -674,6 +671,15 @@
+@@ -674,6 +671,15 @@ finish_tlb_load:
*/
/*
@@ -37619,7 +37619,7 @@
* The 44x core does not have an AltiVec unit.
--- a/arch/powerpc/kernel/head_booke.h
+++ b/arch/powerpc/kernel/head_booke.h
-@@ -166,7 +166,7 @@
+@@ -166,7 +166,7 @@ label:
mfspr r5,SPRN_ESR; \
stw r5,_ESR(r11); \
addi r3,r1,STACK_FRAME_OVERHEAD; \
@@ -37630,7 +37630,7 @@
--- a/arch/powerpc/kernel/head_fsl_booke.S
+++ b/arch/powerpc/kernel/head_fsl_booke.S
-@@ -73,8 +73,8 @@
+@@ -73,8 +73,8 @@ _ENTRY(_start);
/* We try to not make any assumptions about how the boot loader
* setup or used the TLBs. We invalidate all mappings from the
* boot loader and load a single entry in TLB1[0] to map the
@@ -37641,7 +37641,7 @@
*
* Requirement on bootloader:
* - The page we're executing in needs to reside in TLB1 and
-@@ -167,7 +167,7 @@
+@@ -167,7 +167,7 @@ skpinv: addi r6,r6,1 /* Increment */
mtspr SPRN_MAS0,r7
tlbre
@@ -37650,7 +37650,7 @@
lis r7,0x1000 /* Set MAS0(TLBSEL) = 1 */
rlwimi r7,r5,16,4,15 /* Setup MAS0 = TLBSEL | ESEL(r5) */
mtspr SPRN_MAS0,r7
-@@ -177,9 +177,12 @@
+@@ -177,9 +177,12 @@ skpinv: addi r6,r6,1 /* Increment */
ori r6,r6,(MAS1_TSIZE(BOOKE_PAGESZ_4K))@l
mtspr SPRN_MAS1,r6
mfspr r6,SPRN_MAS2
@@ -37664,7 +37664,7 @@
tlbwe
xori r6,r4,1
-@@ -222,11 +225,11 @@
+@@ -222,11 +225,11 @@ skpinv: addi r6,r6,1 /* Increment */
lis r6,0x1000 /* Set MAS0(TLBSEL) = TLB1(1), ESEL = 0 */
mtspr SPRN_MAS0,r6
lis r6,(MAS1_VALID|MAS1_IPROT)@h
@@ -37679,7 +37679,7 @@
rlwimi r6,r7,0,20,31
mtspr SPRN_MAS2,r6
li r7,(MAS3_SX|MAS3_SW|MAS3_SR)
-@@ -234,6 +237,9 @@
+@@ -234,6 +237,9 @@ skpinv: addi r6,r6,1 /* Increment */
tlbwe
/* 7. Jump to KERNELBASE mapping */
@@ -37699,7 +37699,7 @@
#include <linux/of_platform.h>
#include <asm/ibmebus.h>
#include <asm/abs_addr.h>
-@@ -52,7 +53,7 @@
+@@ -52,7 +53,7 @@ static struct device ibmebus_bus_device
struct bus_type ibmebus_bus_type;
/* These devices will automatically be added to the bus during init */
@@ -37708,7 +37708,7 @@
{ .compatible = "IBM,lhca" },
{ .compatible = "IBM,lhea" },
{},
-@@ -171,7 +172,7 @@
+@@ -171,7 +172,7 @@ static int ibmebus_create_devices(const
root = of_find_node_by_path("/");
@@ -37717,7 +37717,7 @@
if (!of_match_node(matches, child))
continue;
-@@ -197,16 +198,13 @@
+@@ -197,16 +198,13 @@ int ibmebus_register_driver(struct of_pl
/* If the driver uses devices that ibmebus doesn't know, add them */
ibmebus_create_devices(drv->match_table);
@@ -37738,7 +37738,7 @@
--- a/arch/powerpc/kernel/iommu.c
+++ b/arch/powerpc/kernel/iommu.c
-@@ -532,16 +532,14 @@
+@@ -532,16 +532,14 @@ struct iommu_table *iommu_init_table(str
return tbl;
}
@@ -37757,7 +37757,7 @@
return;
}
-@@ -550,7 +548,7 @@
+@@ -550,7 +548,7 @@ void iommu_free_table(struct device_node
for (i = 0; i < (tbl->it_size/64); i++) {
if (tbl->it_map[i] != 0) {
printk(KERN_WARNING "%s: Unexpected TCEs for %s\n",
@@ -37768,7 +37768,7 @@
}
--- a/arch/powerpc/kernel/isa-bridge.c
+++ b/arch/powerpc/kernel/isa-bridge.c
-@@ -108,7 +108,7 @@
+@@ -108,7 +108,7 @@ static void __devinit pci_process_ISA_OF
if (size > 0x10000)
size = 0x10000;
@@ -37777,7 +37777,7 @@
"mapping 64k\n");
__ioremap_at(phb_io_base_phys, (void *)ISA_IO_BASE,
-@@ -116,7 +116,7 @@
+@@ -116,7 +116,7 @@ static void __devinit pci_process_ISA_OF
return;
inval_range:
@@ -37786,7 +37786,7 @@
"mapping 64k\n");
__ioremap_at(phb_io_base_phys, (void *)ISA_IO_BASE,
0x10000, _PAGE_NO_CACHE|_PAGE_GUARDED);
-@@ -145,7 +145,7 @@
+@@ -145,7 +145,7 @@ void __init isa_bridge_find_early(struct
for_each_node_by_type(np, "isa") {
/* Look for our hose being a parent */
for (parent = of_get_parent(np); parent;) {
@@ -37797,7 +37797,7 @@
}
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
-@@ -307,7 +307,7 @@
+@@ -307,7 +307,7 @@ void __init find_legacy_serial_ports(voi
}
/* First fill our array with SOC ports */
@@ -37806,7 +37806,7 @@
struct device_node *soc = of_get_parent(np);
if (soc && !strcmp(soc->type, "soc")) {
index = add_legacy_soc_port(np, np);
-@@ -318,7 +318,7 @@
+@@ -318,7 +318,7 @@ void __init find_legacy_serial_ports(voi
}
/* First fill our array with ISA ports */
@@ -37815,7 +37815,7 @@
struct device_node *isa = of_get_parent(np);
if (isa && !strcmp(isa->name, "isa")) {
index = add_legacy_isa_port(np, isa);
-@@ -329,7 +329,7 @@
+@@ -329,7 +329,7 @@ void __init find_legacy_serial_ports(voi
}
/* First fill our array with tsi-bridge ports */
@@ -37824,7 +37824,7 @@
struct device_node *tsi = of_get_parent(np);
if (tsi && !strcmp(tsi->type, "tsi-bridge")) {
index = add_legacy_soc_port(np, np);
-@@ -340,7 +340,7 @@
+@@ -340,7 +340,7 @@ void __init find_legacy_serial_ports(voi
}
/* First fill our array with opb bus ports */
@@ -37833,7 +37833,7 @@
struct device_node *opb = of_get_parent(np);
if (opb && (!strcmp(opb->type, "opb") ||
of_device_is_compatible(opb, "ibm,opb"))) {
-@@ -474,7 +474,7 @@
+@@ -474,7 +474,7 @@ static int __init serial_dev_init(void)
/*
* Before we register the platfrom serial devices, we need
@@ -37852,7 +37852,7 @@
/*
* Track sum of all purrs across all processors. This is used to further
-@@ -595,13 +594,6 @@
+@@ -595,13 +594,6 @@ int __init lparcfg_init(void)
ent = create_proc_entry("ppc64/lparcfg", mode, NULL);
if (ent) {
ent->proc_fops = &lparcfg_fops;
@@ -37866,7 +37866,7 @@
} else {
printk(KERN_ERR "Failed to create ppc64/lparcfg\n");
return -EIO;
-@@ -613,10 +605,8 @@
+@@ -613,10 +605,8 @@ int __init lparcfg_init(void)
void __exit lparcfg_cleanup(void)
{
@@ -37898,7 +37898,7 @@
.text
-@@ -43,3 +48,71 @@
+@@ -43,3 +48,71 @@ _GLOBAL(add_reloc_offset)
add r3,r3,r5
mtlr r0
blr
@@ -37972,7 +37972,7 @@
+ blr
--- a/arch/powerpc/kernel/misc_32.S
+++ b/arch/powerpc/kernel/misc_32.S
-@@ -206,6 +206,45 @@
+@@ -206,6 +206,45 @@ _GLOBAL(_nmask_and_or_msr)
isync
blr /* Done */
@@ -38018,7 +38018,7 @@
/*
* Flush MMU TLB
-@@ -793,13 +832,6 @@
+@@ -793,13 +832,6 @@ _GLOBAL(kernel_thread)
addi r1,r1,16
blr
@@ -38034,7 +38034,7 @@
*/
--- a/arch/powerpc/kernel/misc_64.S
+++ b/arch/powerpc/kernel/misc_64.S
-@@ -518,13 +518,6 @@
+@@ -518,13 +518,6 @@ _GLOBAL(giveup_altivec)
#endif /* CONFIG_ALTIVEC */
@@ -38058,7 +38058,7 @@
#include "setup.h"
-@@ -54,22 +55,60 @@
+@@ -54,22 +55,60 @@ void module_free(struct module *mod, voi
addend) */
static unsigned int count_relocs(const Elf32_Rela *rela, unsigned int num)
{
@@ -38132,7 +38132,7 @@
}
/* Get the potential trampolines size required of the init and
-@@ -100,6 +139,16 @@
+@@ -100,6 +139,16 @@ static unsigned long get_plt_size(const
DEBUGP("Ptr: %p. Number: %u\n",
(void *)hdr + sechdrs[i].sh_offset,
sechdrs[i].sh_size / sizeof(Elf32_Rela));
@@ -38159,7 +38159,7 @@
#include "setup.h"
-@@ -81,25 +82,23 @@
+@@ -81,25 +82,23 @@ static struct ppc64_stub_entry ppc64_stu
different addend) */
static unsigned int count_relocs(const Elf64_Rela *rela, unsigned int num)
{
@@ -38198,7 +38198,7 @@
}
void *module_alloc(unsigned long size)
-@@ -118,6 +117,44 @@
+@@ -118,6 +117,44 @@ void module_free(struct module *mod, voi
table entries. */
}
@@ -38243,7 +38243,7 @@
/* Get size of potential trampolines required. */
static unsigned long get_stubs_size(const Elf64_Ehdr *hdr,
const Elf64_Shdr *sechdrs)
-@@ -133,6 +170,16 @@
+@@ -133,6 +170,16 @@ static unsigned long get_stubs_size(cons
DEBUGP("Ptr: %p. Number: %lu\n",
(void *)sechdrs[i].sh_addr,
sechdrs[i].sh_size / sizeof(Elf64_Rela));
@@ -38260,7 +38260,7 @@
relocs += count_relocs((void *)sechdrs[i].sh_addr,
sechdrs[i].sh_size
/ sizeof(Elf64_Rela));
-@@ -343,7 +390,7 @@
+@@ -343,7 +390,7 @@ int apply_relocate_add(Elf64_Shdr *sechd
/* Simply set it */
*(u32 *)location = value;
break;
@@ -38269,7 +38269,7 @@
case R_PPC64_ADDR64:
/* Simply set it */
*(unsigned long *)location = value;
-@@ -399,7 +446,7 @@
+@@ -399,7 +446,7 @@ int apply_relocate_add(Elf64_Shdr *sechd
}
/* Only replace bits 2 through 26 */
@@ -38311,7 +38311,7 @@
{ .type = "soc", },
{ .compatible = "soc", },
{ .type = "spider", },
-@@ -64,26 +65,6 @@
+@@ -64,26 +65,6 @@ static int __init of_bus_driver_init(voi
postcore_initcall(of_bus_driver_init);
@@ -38338,7 +38338,7 @@
struct of_device* of_platform_device_create(struct device_node *np,
const char *bus_id,
struct device *parent)
-@@ -120,15 +101,15 @@
+@@ -120,15 +101,15 @@ EXPORT_SYMBOL(of_platform_device_create)
* @matches: match table, NULL to use the default, OF_NO_DEEP_PROBE to
* disallow recursive creation of child busses
*/
@@ -38357,7 +38357,7 @@
pr_debug(" create child: %s\n", child->full_name);
dev = of_platform_device_create(child, NULL, parent);
if (dev == NULL)
-@@ -157,7 +138,7 @@
+@@ -157,7 +138,7 @@ static int of_platform_bus_create(struct
*/
int of_platform_bus_probe(struct device_node *root,
@@ -38366,7 +38366,7 @@
struct device *parent)
{
struct device_node *child;
-@@ -190,7 +171,7 @@
+@@ -190,7 +171,7 @@ int of_platform_bus_probe(struct device_
rc = of_platform_bus_create(root, matches, &dev->dev);
goto bail;
}
@@ -38422,7 +38422,7 @@
phb->is_dynamic = mem_init_done;
#ifdef CONFIG_PPC64
if (dev) {
-@@ -126,15 +120,10 @@
+@@ -126,15 +120,10 @@ int pcibios_vaddr_is_ioport(void __iomem
*/
int pci_domain_nr(struct pci_bus *bus)
{
@@ -38440,7 +38440,7 @@
EXPORT_SYMBOL(pci_domain_nr);
#ifdef CONFIG_PPC_OF
-@@ -153,7 +142,7 @@
+@@ -153,7 +142,7 @@ struct pci_controller* pci_find_hose_for
while(node) {
struct pci_controller *hose, *tmp;
list_for_each_entry_safe(hose, tmp, &hose_list, list_node)
@@ -38449,7 +38449,7 @@
return hose;
node = node->parent;
}
-@@ -201,6 +190,20 @@
+@@ -201,6 +190,20 @@ int pci_read_irq_line(struct pci_dev *pc
struct of_irq oirq;
unsigned int virq;
@@ -38470,7 +38470,7 @@
DBG("Try to map irq for %s...\n", pci_name(pci_dev));
#ifdef DEBUG
-@@ -222,10 +225,11 @@
+@@ -222,10 +225,11 @@ int pci_read_irq_line(struct pci_dev *pc
if (pin == 0)
return -1;
if (pci_read_config_byte(pci_dev, PCI_INTERRUPT_LINE, &line) ||
@@ -38484,7 +38484,7 @@
virq = irq_create_mapping(NULL, line);
if (virq != NO_IRQ)
-@@ -475,3 +479,717 @@
+@@ -475,3 +479,717 @@ void pci_resource_to_user(const struct p
*start = rsrc->start - offset;
*end = rsrc->end - offset;
}
@@ -39232,7 +39232,7 @@
static void fixup_cpc710_pci64(struct pci_dev* dev);
#ifdef CONFIG_PPC_OF
static u8* pci_to_OF_bus_map;
-@@ -53,7 +47,7 @@
+@@ -53,7 +47,7 @@ static u8* pci_to_OF_bus_map;
/* By default, we don't re-assign bus numbers. We do this only on
* some pmacs
*/
@@ -39241,7 +39241,7 @@
LIST_HEAD(hose_list);
-@@ -100,505 +94,6 @@
+@@ -100,505 +94,6 @@ fixup_cpc710_pci64(struct pci_dev* dev)
}
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CPC710_PCI64, fixup_cpc710_pci64);
@@ -39747,7 +39747,7 @@
#ifdef CONFIG_PPC_OF
/*
* Functions below are used on OpenFirmware machines.
-@@ -619,7 +114,7 @@
+@@ -619,7 +114,7 @@ make_one_node_map(struct device_node* no
} else
pci_to_OF_bus_map[pci_bus] = bus_range[0];
@@ -39756,7 +39756,7 @@
struct pci_dev* dev;
const unsigned int *class_code, *reg;
-@@ -662,8 +157,8 @@
+@@ -662,8 +157,8 @@ pcibios_make_OF_bus_map(void)
/* For each hose, we begin searching bridges */
list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
@@ -39767,7 +39767,7 @@
if (!node)
continue;
make_one_node_map(node, hose->first_busno);
-@@ -688,15 +183,18 @@
+@@ -688,15 +183,18 @@ pcibios_make_OF_bus_map(void)
typedef int (*pci_OF_scan_iterator)(struct device_node* node, void* data);
static struct device_node*
@@ -39789,7 +39789,7 @@
/* For PCI<->PCI bridges or CardBus bridges, we go down
* Note: some OFs create a parent node "multifunc-device" as
-@@ -708,9 +206,11 @@
+@@ -708,9 +206,11 @@ scan_OF_pci_childs(struct device_node* n
(*class_code >> 8) != PCI_CLASS_BRIDGE_CARDBUS)) &&
strcmp(node->name, "multifunc-device"))
continue;
@@ -39803,7 +39803,7 @@
}
return NULL;
}
-@@ -718,11 +218,11 @@
+@@ -718,11 +218,11 @@ scan_OF_pci_childs(struct device_node* n
static struct device_node *scan_OF_for_pci_dev(struct device_node *parent,
unsigned int devfn)
{
@@ -39817,7 +39817,7 @@
reg = of_get_property(np, "reg", &psize);
if (reg == NULL || psize < 4)
continue;
-@@ -742,7 +242,7 @@
+@@ -742,7 +242,7 @@ static struct device_node *scan_OF_for_p
struct pci_controller *hose = pci_bus_to_host(bus);
if (hose == NULL)
return NULL;
@@ -39826,7 +39826,7 @@
}
/* not a root bus, we need to get our parent */
-@@ -812,9 +312,9 @@
+@@ -812,9 +312,9 @@ pci_device_from_OF_node(struct device_no
return -ENODEV;
/* Make sure it's really a PCI device */
hose = pci_find_hose_for_OF_device(node);
@@ -39838,7 +39838,7 @@
find_OF_pci_device_filter, (void *)node))
return -ENODEV;
reg = of_get_property(node, "reg", NULL);
-@@ -843,120 +343,6 @@
+@@ -843,120 +343,6 @@ pci_device_from_OF_node(struct device_no
}
EXPORT_SYMBOL(pci_device_from_OF_node);
@@ -39959,7 +39959,7 @@
/* We create the "pci-OF-bus-map" property now so it appears in the
* /proc device tree
*/
-@@ -986,219 +372,7 @@
+@@ -986,219 +372,7 @@ void pcibios_make_OF_bus_map(void)
}
#endif /* CONFIG_PPC_OF */
@@ -40180,7 +40180,7 @@
{
struct pci_controller *hose, *tmp;
struct pci_bus *bus;
-@@ -1206,6 +380,9 @@
+@@ -1206,6 +380,9 @@ pcibios_init(void)
printk(KERN_INFO "PCI: Probing PCI hardware\n");
@@ -40190,7 +40190,7 @@
/* Scan all of the recorded PCI controllers. */
list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
if (pci_assign_all_buses)
-@@ -1213,9 +390,10 @@
+@@ -1213,9 +390,10 @@ pcibios_init(void)
hose->last_busno = 0xff;
bus = pci_scan_bus_parented(hose->parent, hose->first_busno,
hose->ops, hose);
@@ -40203,7 +40203,7 @@
if (pci_assign_all_buses || next_busno <= hose->last_busno)
next_busno = hose->last_busno + pcibios_assign_bus_offset;
}
-@@ -1228,18 +406,8 @@
+@@ -1228,18 +406,8 @@ pcibios_init(void)
if (pci_assign_all_buses && have_of)
pcibios_make_OF_bus_map();
@@ -40224,7 +40224,7 @@
/* Call machine dependent post-init code */
if (ppc_md.pcibios_after_init)
-@@ -1250,14 +418,14 @@
+@@ -1250,14 +418,14 @@ pcibios_init(void)
subsys_initcall(pcibios_init);
@@ -40241,7 +40241,7 @@
io_offset = (unsigned long)hose->io_base_virt - isa_io_base;
if (bus->parent == NULL) {
/* This is a host bridge - fill in its resources */
-@@ -1272,8 +440,8 @@
+@@ -1272,8 +440,8 @@ void pcibios_fixup_bus(struct pci_bus *b
res->end = IO_SPACE_LIMIT;
res->flags = IORESOURCE_IO;
}
@@ -40252,7 +40252,7 @@
for (i = 0; i < 3; ++i) {
res = &hose->mem_resources[i];
-@@ -1288,35 +456,6 @@
+@@ -1288,35 +456,6 @@ void pcibios_fixup_bus(struct pci_bus *b
}
bus->resource[i+1] = res;
}
@@ -40288,7 +40288,7 @@
}
}
-@@ -1328,37 +467,6 @@
+@@ -1328,37 +467,6 @@ pcibios_update_irq(struct pci_dev *dev,
/* XXX FIXME - update OF device tree node interrupt property */
}
@@ -40326,7 +40326,7 @@
static struct pci_controller*
pci_bus_to_hose(int bus)
{
-@@ -1381,17 +489,6 @@
+@@ -1381,17 +489,6 @@ long sys_pciconfig_iobase(long which, un
struct pci_controller* hose;
long result = -EOPNOTSUPP;
@@ -40365,7 +40365,7 @@
/* pci_io_base -- the base address from which io bars are offsets.
* This is the lowest I/O base address (so bar values are always positive),
-@@ -70,139 +65,31 @@
+@@ -70,139 +65,31 @@ struct dma_mapping_ops *get_pci_dma_ops(
}
EXPORT_SYMBOL(get_pci_dma_ops);
@@ -40517,7 +40517,7 @@
static u32 get_int_prop(struct device_node *np, const char *name, u32 def)
{
-@@ -270,7 +157,6 @@
+@@ -270,7 +157,6 @@ static void pci_parse_of_addrs(struct de
res->end = base + size - 1;
res->flags = flags;
res->name = pci_name(dev);
@@ -40525,7 +40525,7 @@
}
}
-@@ -339,16 +225,17 @@
+@@ -339,16 +225,17 @@ struct pci_dev *of_create_pci_dev(struct
EXPORT_SYMBOL(of_create_pci_dev);
void __devinit of_scan_bus(struct device_node *node,
@@ -40546,7 +40546,7 @@
DBG(" * %s\n", child->full_name);
reg = of_get_property(child, "reg", &reglen);
if (reg == NULL || reglen < 20)
-@@ -359,19 +246,26 @@
+@@ -359,19 +246,26 @@ void __devinit of_scan_bus(struct device
dev = of_create_pci_dev(child, bus, devfn);
if (!dev)
continue;
@@ -40579,7 +40579,7 @@
{
struct pci_bus *bus;
const u32 *busrange, *ranges;
-@@ -441,7 +335,6 @@
+@@ -441,7 +335,6 @@ void __devinit of_scan_pci_bridge(struct
res->start = of_read_number(&ranges[1], 2);
res->end = res->start + size - 1;
res->flags = flags;
@@ -40587,7 +40587,7 @@
}
sprintf(bus->name, "PCI Bus %04x:%02x", pci_domain_nr(bus),
bus->number);
-@@ -462,12 +355,12 @@
+@@ -462,12 +355,12 @@ EXPORT_SYMBOL(of_scan_pci_bridge);
void __devinit scan_phb(struct pci_controller *hose)
{
struct pci_bus *bus;
@@ -40603,7 +40603,7 @@
bus = pci_create_bus(hose->parent, hose->first_busno, hose->ops, node);
if (bus == NULL) {
printk(KERN_ERR "Failed to create bus for PCI domain %04x\n",
-@@ -477,27 +370,27 @@
+@@ -477,27 +370,27 @@ void __devinit scan_phb(struct pci_contr
bus->secondary = hose->first_busno;
hose->bus = bus;
@@ -40648,7 +40648,7 @@
if (node && ppc_md.pci_probe_mode)
mode = ppc_md.pci_probe_mode(bus);
DBG(" probe mode: %d\n", mode);
-@@ -514,15 +407,15 @@
+@@ -514,15 +407,15 @@ static int __init pcibios_init(void)
{
struct pci_controller *hose, *tmp;
@@ -40668,7 +40668,7 @@
/* Scan all of the recorded PCI controllers. */
list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
-@@ -530,19 +423,8 @@
+@@ -530,19 +423,8 @@ static int __init pcibios_init(void)
pci_bus_add_devices(hose->bus);
}
@@ -40690,7 +40690,7 @@
printk(KERN_DEBUG "PCI: Probing PCI hardware done\n");
-@@ -551,141 +433,6 @@
+@@ -551,141 +433,6 @@ static int __init pcibios_init(void)
subsys_initcall(pcibios_init);
@@ -40832,7 +40832,7 @@
#ifdef CONFIG_HOTPLUG
int pcibios_unmap_io_space(struct pci_bus *bus)
-@@ -719,8 +466,7 @@
+@@ -719,8 +466,7 @@ int pcibios_unmap_io_space(struct pci_bu
if (hose->io_base_alloc == 0)
return 0;
@@ -40842,7 +40842,7 @@
DBG(" alloc=0x%p\n", hose->io_base_alloc);
/* This is a PHB, we fully unmap the IO area */
-@@ -779,8 +525,7 @@
+@@ -779,8 +525,7 @@ int __devinit pcibios_map_io_space(struc
hose->io_base_virt = (void __iomem *)(area->addr +
hose->io_base_phys - phys_page);
@@ -40852,7 +40852,7 @@
DBG(" phys=0x%016lx, virt=0x%p (alloc=0x%p)\n",
hose->io_base_phys, hose->io_base_virt, hose->io_base_alloc);
DBG(" size=0x%016lx (alloc=0x%016lx)\n",
-@@ -803,51 +548,13 @@
+@@ -803,51 +548,13 @@ int __devinit pcibios_map_io_space(struc
}
EXPORT_SYMBOL_GPL(pcibios_map_io_space);
@@ -40905,7 +40905,7 @@
sd->of_node ? sd->of_node->full_name : "<none>");
sd->dma_ops = pci_dma_ops;
-@@ -861,7 +568,7 @@
+@@ -861,7 +568,7 @@ void __devinit pcibios_setup_new_device(
}
EXPORT_SYMBOL(pcibios_setup_new_device);
@@ -40914,7 +40914,7 @@
{
struct pci_dev *dev;
-@@ -870,42 +577,7 @@
+@@ -870,42 +577,7 @@ static void __devinit do_bus_setup(struc
list_for_each_entry(dev, &bus->devices, bus_list)
pcibios_setup_new_device(dev);
@@ -40959,7 +40959,7 @@
{
--- a/arch/powerpc/kernel/pci_dn.c
+++ b/arch/powerpc/kernel/pci_dn.c
-@@ -56,11 +56,6 @@
+@@ -56,11 +56,6 @@ static void * __devinit update_dn_pci_in
pdn->busno = (regs[0] >> 16) & 0xff;
pdn->devfn = (regs[0] >> 8) & 0xff;
}
@@ -40971,7 +40971,7 @@
pdn->pci_ext_config_space = (type && *type == 1);
return NULL;
-@@ -133,7 +128,7 @@
+@@ -133,7 +128,7 @@ void *traverse_pci_devices(struct device
*/
void __devinit pci_devs_phb_init_dynamic(struct pci_controller *phb)
{
@@ -40982,7 +40982,7 @@
/* PHB nodes themselves must not match */
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
-@@ -59,6 +59,7 @@
+@@ -59,6 +59,7 @@ extern void single_step_exception(struct
extern int sys_sigreturn(struct pt_regs *regs);
EXPORT_SYMBOL(clear_pages);
@@ -40992,7 +40992,7 @@
EXPORT_SYMBOL(DMA_MODE_WRITE);
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
-@@ -583,6 +583,20 @@
+@@ -583,6 +583,20 @@ static void __init check_cpu_pa_features
ibm_pa_features, ARRAY_SIZE(ibm_pa_features));
}
@@ -41013,7 +41013,7 @@
static struct feature_property {
const char *name;
u32 min_value;
-@@ -600,6 +614,29 @@
+@@ -600,6 +614,29 @@ static struct feature_property {
#endif /* CONFIG_PPC64 */
};
@@ -41043,7 +41043,7 @@
static void __init check_cpu_feature_properties(unsigned long node)
{
unsigned long i;
-@@ -697,22 +734,13 @@
+@@ -697,22 +734,13 @@ static int __init early_init_dt_scan_cpu
prop = of_get_flat_dt_prop(node, "cpu-version", NULL);
if (prop && (*prop & 0xff000000) == 0x0f000000)
identify_cpu(0, *prop);
@@ -41071,7 +41071,7 @@
if (nthreads > 1)
--- a/arch/powerpc/kernel/prom_parse.c
+++ b/arch/powerpc/kernel/prom_parse.c
-@@ -273,7 +273,7 @@
+@@ -273,7 +273,7 @@ int of_irq_map_pci(struct pci_dev *pdev,
#else
struct pci_controller *host;
host = pci_bus_to_host(pdev->bus);
@@ -41080,7 +41080,7 @@
#endif
/* No node for host bridge ? give up */
if (ppnode == NULL)
-@@ -419,7 +419,7 @@
+@@ -419,7 +419,7 @@ static struct of_bus *of_match_bus(struc
static int of_translate_one(struct device_node *parent, struct of_bus *bus,
struct of_bus *pbus, u32 *addr,
@@ -41089,7 +41089,7 @@
{
const u32 *ranges;
unsigned int rlen;
-@@ -438,7 +438,7 @@
+@@ -438,7 +438,7 @@ static int of_translate_one(struct devic
* to translate addresses that aren't supposed to be translated in
* the first place. --BenH.
*/
@@ -41098,7 +41098,7 @@
if (ranges == NULL || rlen == 0) {
offset = of_read_number(addr, na);
memset(addr, 0, pna * 4);
-@@ -481,7 +481,8 @@
+@@ -481,7 +481,8 @@ static int of_translate_one(struct devic
* that can be mapped to a cpu physical address). This is not really specified
* that way, but this is traditionally the way IBM at least do things
*/
@@ -41108,7 +41108,7 @@
{
struct device_node *parent = NULL;
struct of_bus *bus, *pbus;
-@@ -540,7 +541,7 @@
+@@ -540,7 +541,7 @@ u64 of_translate_address(struct device_n
pbus->name, pna, pns, parent->full_name);
/* Apply bus translation */
@@ -41117,7 +41117,7 @@
break;
/* Complete the move up one level */
-@@ -556,8 +557,19 @@
+@@ -556,8 +557,19 @@ u64 of_translate_address(struct device_n
return result;
}
@@ -41194,7 +41194,7 @@
+subsys_initcall(ppc_rio_init);
--- a/arch/powerpc/kernel/rtas_pci.c
+++ b/arch/powerpc/kernel/rtas_pci.c
-@@ -260,7 +260,7 @@
+@@ -260,7 +260,7 @@ static int phb_set_bus_ranges(struct dev
int __devinit rtas_setup_phb(struct pci_controller *phb)
{
@@ -41203,7 +41203,7 @@
if (is_python(dev))
python_countermeasures(dev);
-@@ -280,10 +280,7 @@
+@@ -280,10 +280,7 @@ void __init find_and_init_phbs(void)
struct pci_controller *phb;
struct device_node *root = of_find_node_by_path("/");
@@ -41215,7 +41215,7 @@
if (node->type == NULL || (strcmp(node->type, "pci") != 0 &&
strcmp(node->type, "pciex") != 0))
continue;
-@@ -311,10 +308,12 @@
+@@ -311,10 +308,12 @@ void __init find_and_init_phbs(void)
if (prop)
pci_probe_only = *prop;
@@ -41248,7 +41248,7 @@
#include "setup.h"
-@@ -327,6 +329,31 @@
+@@ -327,6 +329,31 @@ void __init check_for_initrd(void)
#ifdef CONFIG_SMP
@@ -41280,7 +41280,7 @@
/**
* setup_cpu_maps - initialize the following cpu maps:
* cpu_possible_map
-@@ -350,22 +377,32 @@
+@@ -350,22 +377,32 @@ void __init smp_setup_cpu_maps(void)
{
struct device_node *dn = NULL;
int cpu = 0;
@@ -41316,7 +41316,7 @@
cpu_set(cpu, cpu_present_map);
set_hard_smp_processor_id(cpu, intserv[j]);
cpu_set(cpu, cpu_possible_map);
-@@ -373,6 +410,12 @@
+@@ -373,6 +410,12 @@ void __init smp_setup_cpu_maps(void)
}
}
@@ -41329,7 +41329,7 @@
#ifdef CONFIG_PPC64
/*
* On pSeries LPAR, we need to know how many cpus
-@@ -395,7 +438,7 @@
+@@ -395,7 +438,7 @@ void __init smp_setup_cpu_maps(void)
/* Double maxcpus for processors which have SMT capability */
if (cpu_has_feature(CPU_FTR_SMT))
@@ -41338,7 +41338,7 @@
if (maxcpus > NR_CPUS) {
printk(KERN_WARNING
-@@ -412,9 +455,16 @@
+@@ -412,9 +455,16 @@ void __init smp_setup_cpu_maps(void)
out:
of_node_put(dn);
}
@@ -41356,7 +41356,7 @@
}
/*
-@@ -424,17 +474,19 @@
+@@ -424,17 +474,19 @@ void __init smp_setup_cpu_maps(void)
*/
void __init smp_setup_cpu_sibling_map(void)
{
@@ -41403,7 +41403,7 @@
#include <linux/tty.h>
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
-@@ -76,6 +76,8 @@
+@@ -76,6 +76,8 @@ void smp_call_function_interrupt(void);
int smt_enabled_at_boot = 1;
@@ -41412,7 +41412,7 @@
static void (*crash_ipi_function_ptr)(struct pt_regs *) = NULL;
#ifdef CONFIG_PPC64
-@@ -181,12 +183,13 @@
+@@ -181,12 +183,13 @@ static struct call_data_struct {
* <wait> If true, wait (atomically) until function has completed on other CPUs.
* [RETURNS] 0 on success, else a negative status code. Does not return until
* remote CPUs are nearly ready to execute <<func>> or are or have executed.
@@ -41428,7 +41428,7 @@
{
struct call_data_struct data;
int ret = -1, num_cpus;
-@@ -203,8 +206,6 @@
+@@ -203,8 +206,6 @@ int smp_call_function_map(void (*func) (
if (wait)
atomic_set(&data.finished, 0);
@@ -41437,7 +41437,7 @@
/* remove 'self' from the map */
if (cpu_isset(smp_processor_id(), map))
cpu_clear(smp_processor_id(), map);
-@@ -231,7 +232,8 @@
+@@ -231,7 +232,8 @@ int smp_call_function_map(void (*func) (
printk("smp_call_function on cpu %d: other cpus not "
"responding (%d)\n", smp_processor_id(),
atomic_read(&data.started));
@@ -41447,7 +41447,7 @@
goto out;
}
}
-@@ -258,14 +260,18 @@
+@@ -258,14 +260,18 @@ int smp_call_function_map(void (*func) (
out:
call_data = NULL;
HMT_medium();
@@ -41468,7 +41468,7 @@
}
int smp_call_function(void (*func) (void *info), void *info, int nonatomic,
-@@ -278,8 +284,8 @@
+@@ -278,8 +284,8 @@ int smp_call_function(void (*func) (void
}
EXPORT_SYMBOL(smp_call_function);
@@ -41479,7 +41479,7 @@
{
cpumask_t map = CPU_MASK_NONE;
int ret = 0;
-@@ -291,9 +297,11 @@
+@@ -291,9 +297,11 @@ int smp_call_function_single(int cpu, vo
return -EINVAL;
cpu_set(cpu, map);
@@ -41494,7 +41494,7 @@
local_irq_disable();
func(info);
local_irq_enable();
-@@ -305,7 +313,22 @@
+@@ -305,7 +313,22 @@ EXPORT_SYMBOL(smp_call_function_single);
void smp_send_stop(void)
{
@@ -41617,7 +41617,7 @@
+ }' "$1"
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
-@@ -116,9 +116,12 @@
+@@ -116,9 +116,12 @@ static struct clock_event_device decreme
.features = CLOCK_EVT_FEAT_ONESHOT,
};
@@ -41633,7 +41633,7 @@
#ifdef CONFIG_PPC_ISERIES
static unsigned long __initdata iSeries_recal_titan;
-@@ -216,7 +219,11 @@
+@@ -216,7 +219,11 @@ static u64 read_purr(void)
*/
static u64 read_spurr(u64 purr)
{
@@ -41646,7 +41646,7 @@
return mfspr(SPRN_SPURR);
return purr;
}
-@@ -227,29 +234,30 @@
+@@ -227,29 +234,30 @@ static u64 read_spurr(u64 purr)
*/
void account_system_vtime(struct task_struct *tsk)
{
@@ -41684,7 +41684,7 @@
get_paca()->spurrdelta = deltascaled;
local_irq_restore(flags);
}
-@@ -326,11 +334,9 @@
+@@ -326,11 +334,9 @@ void calculate_steal_time(void)
s64 stolen;
struct cpu_purr_data *pme;
@@ -41698,7 +41698,7 @@
tb = mftb();
purr = mfspr(SPRN_PURR);
stolen = (tb - pme->tb) - (purr - pme->purr);
-@@ -353,7 +359,7 @@
+@@ -353,7 +359,7 @@ static void snapshot_purr(void)
if (!cpu_has_feature(CPU_FTR_PURR))
return;
local_irq_save(flags);
@@ -41707,7 +41707,7 @@
pme->tb = mftb();
pme->purr = mfspr(SPRN_PURR);
pme->initialized = 1;
-@@ -556,8 +562,8 @@
+@@ -556,8 +562,8 @@ void __init iSeries_time_init_early(void
void timer_interrupt(struct pt_regs * regs)
{
struct pt_regs *old_regs;
@@ -41718,7 +41718,7 @@
u64 now;
/* Ensure a positive value is written to the decrementer, or else
-@@ -570,9 +576,9 @@
+@@ -570,9 +576,9 @@ void timer_interrupt(struct pt_regs * re
#endif
now = get_tb_or_rtc();
@@ -41730,7 +41730,7 @@
if (now <= DECREMENTER_MAX)
set_dec((int)now);
return;
-@@ -623,6 +629,45 @@
+@@ -623,6 +629,45 @@ void wakeup_decrementer(void)
set_dec(ticks);
}
@@ -41776,7 +41776,7 @@
#ifdef CONFIG_SMP
void __init smp_space_timers(unsigned int max_cpus)
{
-@@ -811,7 +856,7 @@
+@@ -811,7 +856,7 @@ void __init clocksource_init(void)
static int decrementer_set_next_event(unsigned long evt,
struct clock_event_device *dev)
{
@@ -41785,7 +41785,7 @@
set_dec(evt);
return 0;
}
-@@ -825,7 +870,7 @@
+@@ -825,7 +870,7 @@ static void decrementer_set_mode(enum cl
static void register_decrementer_clockevent(int cpu)
{
@@ -41794,7 +41794,7 @@
*dec = decrementer_clockevent;
dec->cpumask = cpumask_of_cpu(cpu);
-@@ -836,7 +881,7 @@
+@@ -836,7 +881,7 @@ static void register_decrementer_clockev
clockevents_register_device(dec);
}
@@ -41805,7 +41805,7 @@
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
-@@ -334,18 +334,25 @@
+@@ -334,18 +334,25 @@ static inline int check_io_access(struct
#define clear_single_step(regs) ((regs)->msr &= ~MSR_SE)
#endif
@@ -41834,7 +41834,7 @@
printk("Machine check in kernel mode.\n");
if (reason & ESR_IMCP){
printk("Instruction Synchronous Machine Check exception\n");
-@@ -375,7 +382,13 @@
+@@ -375,7 +382,13 @@ static int generic_machine_check_excepti
/* Clear MCSR */
mtspr(SPRN_MCSR, mcsr);
}
@@ -41849,7 +41849,7 @@
printk("Machine check in kernel mode.\n");
printk("Caused by (from MCSR=%lx): ", reason);
-@@ -403,7 +416,14 @@
+@@ -403,7 +416,14 @@ static int generic_machine_check_excepti
printk("Bus - Instruction Parity Error\n");
if (reason & MCSR_BUS_RPERR)
printk("Bus - Read Parity Error\n");
@@ -41865,7 +41865,7 @@
printk("Machine check in kernel mode.\n");
printk("Caused by (from MCSR=%lx): ", reason);
-@@ -421,7 +441,14 @@
+@@ -421,7 +441,14 @@ static int generic_machine_check_excepti
printk("Bus - Read Bus Error on data load\n");
if (reason & MCSR_BUS_WRERR)
printk("Bus - Write Bus Error on buffered store or cache line push\n");
@@ -41881,7 +41881,7 @@
printk("Machine check in kernel mode.\n");
printk("Caused by (from SRR1=%lx): ", reason);
switch (reason & 0x601F0000) {
-@@ -451,22 +478,26 @@
+@@ -451,22 +478,26 @@ static int generic_machine_check_excepti
default:
printk("Unknown values in msr\n");
}
@@ -41914,7 +41914,7 @@
return;
if (user_mode(regs)) {
-@@ -476,7 +507,12 @@
+@@ -476,7 +507,12 @@ void machine_check_exception(struct pt_r
}
#if defined(CONFIG_8xx) && defined(CONFIG_PCI)
@@ -41928,7 +41928,7 @@
bad_page_fault(regs, regs->dar, SIGBUS);
return;
#endif
-@@ -622,6 +658,9 @@
+@@ -622,6 +658,9 @@ static void parse_fpe(struct pt_regs *re
#define INST_POPCNTB 0x7c0000f4
#define INST_POPCNTB_MASK 0xfc0007fe
@@ -41938,7 +41938,7 @@
static int emulate_string_inst(struct pt_regs *regs, u32 instword)
{
u8 rT = (instword >> 21) & 0x1f;
-@@ -707,6 +746,23 @@
+@@ -707,6 +746,23 @@ static int emulate_popcntb_inst(struct p
return 0;
}
@@ -41962,7 +41962,7 @@
static int emulate_instruction(struct pt_regs *regs)
{
u32 instword;
-@@ -749,6 +805,11 @@
+@@ -749,6 +805,11 @@ static int emulate_instruction(struct pt
return emulate_popcntb_inst(regs, instword);
}
@@ -41976,7 +41976,7 @@
--- a/arch/powerpc/kernel/udbg.c
+++ b/arch/powerpc/kernel/udbg.c
-@@ -54,9 +54,16 @@
+@@ -54,9 +54,16 @@ void __init udbg_early_init(void)
#elif defined(CONFIG_PPC_EARLY_DEBUG_44x)
/* PPC44x debug */
udbg_init_44x_as1();
@@ -41995,7 +41995,7 @@
/* udbg library, used by xmon et al */
--- a/arch/powerpc/kernel/udbg_16550.c
+++ b/arch/powerpc/kernel/udbg_16550.c
-@@ -46,7 +46,7 @@
+@@ -46,7 +46,7 @@ struct NS16550 {
#define LCR_DLAB 0x80
@@ -42004,7 +42004,7 @@
static void udbg_550_putc(char c)
{
-@@ -117,7 +117,7 @@
+@@ -117,7 +117,7 @@ unsigned int udbg_probe_uart_speed(void
{
unsigned int dll, dlm, divisor, prescaler, speed;
u8 old_lcr;
@@ -42013,7 +42013,7 @@
old_lcr = in_8(&port->lcr);
-@@ -162,7 +162,7 @@
+@@ -162,7 +162,7 @@ void udbg_maple_real_putc(char c)
void __init udbg_init_maple_realmode(void)
{
@@ -42022,7 +42022,7 @@
udbg_putc = udbg_maple_real_putc;
udbg_getc = NULL;
-@@ -184,7 +184,7 @@
+@@ -184,7 +184,7 @@ void udbg_pas_real_putc(char c)
void udbg_init_pas_realmode(void)
{
@@ -42031,7 +42031,7 @@
udbg_putc = udbg_pas_real_putc;
udbg_getc = NULL;
-@@ -219,9 +219,42 @@
+@@ -219,9 +219,42 @@ static int udbg_44x_as1_getc(void)
void __init udbg_init_44x_as1(void)
{
udbg_comport =
@@ -42129,7 +42129,7 @@
#ifndef __FP_FRAC_ADDI_4
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
-@@ -167,10 +167,8 @@
+@@ -167,10 +167,8 @@ int __kprobes do_page_fault(struct pt_re
if (notify_page_fault(regs))
return 0;
@@ -42142,7 +42142,7 @@
/* On a kernel SLB miss we can only check for a valid exception entry */
if (!user_mode(regs) && (address >= TASK_SIZE))
-@@ -189,7 +187,7 @@
+@@ -189,7 +187,7 @@ int __kprobes do_page_fault(struct pt_re
return SIGSEGV;
/* in_atomic() in user mode is really bad,
as is current->mm == NULL. */
@@ -42153,7 +42153,7 @@
regs->nip, regs->msr);
--- a/arch/powerpc/mm/fsl_booke_mmu.c
+++ b/arch/powerpc/mm/fsl_booke_mmu.c
-@@ -165,15 +165,15 @@
+@@ -165,15 +165,15 @@ void invalidate_tlbcam_entry(int index)
void __init cam_mapin_ram(unsigned long cam0, unsigned long cam1,
unsigned long cam2)
{
@@ -42174,7 +42174,7 @@
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
-@@ -96,6 +96,7 @@
+@@ -96,6 +96,7 @@ int mmu_vmalloc_psize = MMU_PAGE_4K;
int mmu_io_psize = MMU_PAGE_4K;
int mmu_kernel_ssize = MMU_SEGSIZE_256M;
int mmu_highuser_ssize = MMU_SEGSIZE_256M;
@@ -42182,7 +42182,7 @@
#ifdef CONFIG_HUGETLB_PAGE
int mmu_huge_psize = MMU_PAGE_16M;
unsigned int HPAGE_SHIFT;
-@@ -368,18 +369,11 @@
+@@ -368,18 +369,11 @@ static void __init htab_init_page_sizes(
* on what is available
*/
if (mmu_psize_defs[MMU_PAGE_16M].shift)
@@ -42231,7 +42231,7 @@
#define HUGEPD_SIZE (1UL << HUGEPD_SHIFT)
#define HUGEPD_MASK (~(HUGEPD_SIZE-1))
-@@ -82,11 +81,35 @@
+@@ -82,11 +81,35 @@ static int __hugepte_alloc(struct mm_str
return 0;
}
@@ -42267,7 +42267,7 @@
BUG_ON(get_slice_psize(mm, addr) != mmu_huge_psize);
-@@ -96,14 +119,9 @@
+@@ -96,14 +119,9 @@ pte_t *huge_pte_offset(struct mm_struct
if (!pgd_none(*pg)) {
pu = pud_offset(pg, addr);
if (!pud_none(*pu)) {
@@ -42283,7 +42283,7 @@
}
}
-@@ -114,6 +132,7 @@
+@@ -114,6 +132,7 @@ pte_t *huge_pte_alloc(struct mm_struct *
{
pgd_t *pg;
pud_t *pu;
@@ -42291,7 +42291,7 @@
hugepd_t *hpdp = NULL;
BUG_ON(get_slice_psize(mm, addr) != mmu_huge_psize);
-@@ -124,14 +143,9 @@
+@@ -124,14 +143,9 @@ pte_t *huge_pte_alloc(struct mm_struct *
pu = pud_alloc(mm, pg, addr);
if (pu) {
@@ -42307,7 +42307,7 @@
}
if (! hpdp)
-@@ -158,7 +172,6 @@
+@@ -158,7 +172,6 @@ static void free_hugepte_range(struct mm
PGF_CACHENUM_MASK));
}
@@ -42315,7 +42315,7 @@
static void hugetlb_free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
unsigned long addr, unsigned long end,
unsigned long floor, unsigned long ceiling)
-@@ -191,7 +204,6 @@
+@@ -191,7 +204,6 @@ static void hugetlb_free_pmd_range(struc
pud_clear(pud);
pmd_free_tlb(tlb, pmd);
}
@@ -42323,7 +42323,7 @@
static void hugetlb_free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
unsigned long addr, unsigned long end,
-@@ -210,9 +222,15 @@
+@@ -210,9 +222,15 @@ static void hugetlb_free_pud_range(struc
continue;
hugetlb_free_pmd_range(tlb, pud, addr, next, floor, ceiling);
#else
@@ -42342,7 +42342,7 @@
#endif
} while (pud++, addr = next, addr != end);
-@@ -526,6 +544,57 @@
+@@ -526,6 +544,57 @@ repeat:
return err;
}
@@ -42402,7 +42402,7 @@
memset(addr, 0, kmem_cache_size(cache));
--- a/arch/powerpc/mm/lmb.c
+++ b/arch/powerpc/mm/lmb.c
-@@ -342,3 +342,16 @@
+@@ -342,3 +342,16 @@ void __init lmb_enforce_memory_limit(uns
}
}
}
@@ -42421,7 +42421,7 @@
+}
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
-@@ -213,15 +213,30 @@
+@@ -213,15 +213,30 @@ void __init do_init_bootmem(void)
*/
#ifdef CONFIG_HIGHMEM
free_bootmem_with_active_regions(0, total_lowmem >> PAGE_SHIFT);
@@ -42453,7 +42453,7 @@
/* XXX need to clip this if using highmem? */
sparse_memory_present_with_active_regions(0);
-@@ -334,11 +349,13 @@
+@@ -334,11 +349,13 @@ void __init mem_init(void)
highmem_mapnr = total_lowmem >> PAGE_SHIFT;
for (pfn = highmem_mapnr; pfn < max_mapnr; ++pfn) {
struct page *page = pfn_to_page(pfn);
@@ -42470,7 +42470,7 @@
printk(KERN_DEBUG "High memory: %luk\n",
--- a/arch/powerpc/mm/slb.c
+++ b/arch/powerpc/mm/slb.c
-@@ -256,6 +256,7 @@
+@@ -256,6 +256,7 @@ void slb_initialize(void)
static int slb_encoding_inited;
extern unsigned int *slb_miss_kernel_load_linear;
extern unsigned int *slb_miss_kernel_load_io;
@@ -42478,7 +42478,7 @@
/* Prepare our SLB miss handler based on our page size */
linear_llp = mmu_psize_defs[mmu_linear_psize].sllp;
-@@ -269,6 +270,8 @@
+@@ -269,6 +270,8 @@ void slb_initialize(void)
SLB_VSID_KERNEL | linear_llp);
patch_slb_encoding(slb_miss_kernel_load_io,
SLB_VSID_KERNEL | io_llp);
@@ -42489,7 +42489,7 @@
DBG("SLB: io LLP = %04x\n", io_llp);
--- a/arch/powerpc/mm/slb_low.S
+++ b/arch/powerpc/mm/slb_low.S
-@@ -227,8 +227,9 @@
+@@ -227,8 +227,9 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISER
7: ld r10,PACASTABRR(r13)
addi r10,r10,1
@@ -42503,7 +42503,7 @@
li r10,SLB_NUM_BOLTED
--- a/arch/powerpc/oprofile/op_model_cell.c
+++ b/arch/powerpc/oprofile/op_model_cell.c
-@@ -61,7 +61,7 @@
+@@ -61,7 +61,7 @@ static unsigned int spu_cycle_reset;
#define NUM_THREADS 2 /* number of physical threads in
* physical processor
*/
@@ -42512,7 +42512,7 @@
#define NUM_INPUT_BUS_WORDS 2
#define MAX_SPU_COUNT 0xFFFFFF /* maximum 24 bit LFSR value */
-@@ -169,7 +169,6 @@
+@@ -169,7 +169,6 @@ static DEFINE_SPINLOCK(virt_cntr_lock);
static u32 ctr_enabled;
@@ -42520,7 +42520,7 @@
static unsigned char input_bus[NUM_INPUT_BUS_WORDS];
/*
-@@ -298,7 +297,7 @@
+@@ -298,7 +297,7 @@ static void set_pm_event(u32 ctr, int ev
p->signal_group = event / 100;
p->bus_word = bus_word;
@@ -42529,7 +42529,7 @@
pm_regs.pm07_cntrl[ctr] = 0;
pm_regs.pm07_cntrl[ctr] |= PM07_CTR_COUNT_CYCLES(count_cycles);
-@@ -334,16 +333,16 @@
+@@ -334,16 +333,16 @@ static void set_pm_event(u32 ctr, int ev
p->bit = signal_bit;
}
@@ -42549,7 +42549,7 @@
break;
}
-@@ -450,6 +449,12 @@
+@@ -450,6 +449,12 @@ static void cell_virtual_cntr(unsigned l
hdw_thread = 1 ^ hdw_thread;
next_hdw_thread = hdw_thread;
@@ -42562,7 +42562,7 @@
/*
* There are some per thread events. Must do the
* set event, for the thread that is being started
-@@ -619,9 +624,6 @@
+@@ -619,9 +624,6 @@ static int cell_reg_setup(struct op_coun
pmc_cntrl[1][i].vcntr = i;
}
@@ -42623,7 +42623,7 @@
#config REDWOOD_5
# bool "Redwood-5"
# depends on 40x
-@@ -65,6 +71,7 @@
+@@ -65,6 +71,7 @@ config WALNUT
depends on 40x
default y
select 405GP
@@ -42631,7 +42631,7 @@
help
This option enables support for the IBM PPC405GP evaluation board.
-@@ -105,6 +112,11 @@
+@@ -105,6 +112,11 @@ config 405GP
config 405EP
bool
@@ -42790,7 +42790,7 @@
{ .compatible = "ibm,plb4", },
{ .compatible = "ibm,opb", },
{ .compatible = "ibm,ebc", },
-@@ -29,14 +30,11 @@
+@@ -29,14 +30,11 @@ static struct of_device_id kilauea_of_bu
static int __init kilauea_device_probe(void)
{
@@ -42806,7 +42806,7 @@
static int __init kilauea_probe(void)
{
-@@ -45,6 +43,8 @@
+@@ -45,6 +43,8 @@ static int __init kilauea_probe(void)
if (!of_flat_dt_is_compatible(root, "amcc,kilauea"))
return 0;
@@ -42920,7 +42920,7 @@
{ .compatible = "ibm,plb3", },
{ .compatible = "ibm,opb", },
{ .compatible = "ibm,ebc", },
-@@ -34,15 +35,12 @@
+@@ -34,15 +35,12 @@ static struct of_device_id walnut_of_bus
static int __init walnut_device_probe(void)
{
@@ -42938,7 +42938,7 @@
static int __init walnut_probe(void)
{
-@@ -51,6 +49,8 @@
+@@ -51,6 +49,8 @@ static int __init walnut_probe(void)
if (!of_flat_dt_is_compatible(root, "ibm,walnut"))
return 0;
@@ -42949,7 +42949,7 @@
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
-@@ -3,6 +3,7 @@
+@@ -3,6 +3,7 @@ config BAMBOO
depends on 44x
default n
select 440EP
@@ -42957,7 +42957,7 @@
help
This option enables support for the IBM PPC440EP evaluation board.
-@@ -11,6 +12,8 @@
+@@ -11,6 +12,8 @@ config EBONY
depends on 44x
default y
select 440GP
@@ -42966,7 +42966,7 @@
help
This option enables support for the IBM PPC440GP evaluation board.
-@@ -22,6 +25,48 @@
+@@ -22,6 +25,48 @@ config SEQUOIA
help
This option enables support for the AMCC PPC440EPX evaluation board.
@@ -43015,7 +43015,7 @@
#config LUAN
# bool "Luan"
# depends on 44x
-@@ -44,6 +89,7 @@
+@@ -44,6 +89,7 @@ config 440EP
select PPC_FPU
select IBM440EP_ERR42
select IBM_NEW_EMAC_ZMII
@@ -43023,7 +43023,7 @@
config 440EPX
bool
-@@ -52,20 +98,29 @@
+@@ -52,20 +98,29 @@ config 440EPX
select IBM_NEW_EMAC_RGMII
select IBM_NEW_EMAC_ZMII
@@ -43084,7 +43084,7 @@
{ .compatible = "ibm,plb4", },
{ .compatible = "ibm,opb", },
{ .compatible = "ibm,ebc", },
-@@ -32,14 +34,11 @@
+@@ -32,14 +34,11 @@ static struct of_device_id bamboo_of_bus
static int __init bamboo_device_probe(void)
{
@@ -43100,7 +43100,7 @@
static int __init bamboo_probe(void)
{
-@@ -48,6 +47,8 @@
+@@ -48,6 +47,8 @@ static int __init bamboo_probe(void)
if (!of_flat_dt_is_compatible(root, "amcc,bamboo"))
return 0;
@@ -43131,7 +43131,7 @@
{ .compatible = "ibm,plb4", },
{ .compatible = "ibm,opb", },
{ .compatible = "ibm,ebc", },
-@@ -36,14 +38,12 @@
+@@ -36,14 +38,12 @@ static struct of_device_id ebony_of_bus[
static int __init ebony_device_probe(void)
{
@@ -43148,7 +43148,7 @@
/*
* Called very early, MMU is off, device-tree isn't unflattened
-@@ -55,6 +55,8 @@
+@@ -55,6 +55,8 @@ static int __init ebony_probe(void)
if (!of_flat_dt_is_compatible(root, "ibm,ebony"))
return 0;
@@ -43303,7 +43303,7 @@
{ .compatible = "ibm,plb4", },
{ .compatible = "ibm,opb", },
{ .compatible = "ibm,ebc", },
-@@ -32,14 +34,11 @@
+@@ -32,14 +34,11 @@ static struct of_device_id sequoia_of_bu
static int __init sequoia_device_probe(void)
{
@@ -43319,7 +43319,7 @@
static int __init sequoia_probe(void)
{
-@@ -48,6 +47,8 @@
+@@ -48,6 +47,8 @@ static int __init sequoia_probe(void)
if (!of_flat_dt_is_compatible(root, "amcc,sequoia"))
return 0;
@@ -43670,7 +43670,7 @@
+#endif
--- a/arch/powerpc/platforms/52xx/Kconfig
+++ b/arch/powerpc/platforms/52xx/Kconfig
-@@ -19,6 +19,28 @@
+@@ -19,6 +19,28 @@ config PPC_MPC5200_BUGFIX
It is safe to say 'Y' here
@@ -43699,7 +43699,7 @@
config PPC_EFIKA
bool "bPlan Efika 5k2. MPC5200B based computer"
depends on PPC_MULTIPLATFORM && PPC32
-@@ -31,8 +53,7 @@
+@@ -31,8 +53,7 @@ config PPC_EFIKA
config PPC_LITE5200
bool "Freescale Lite5200 Eval Board"
depends on PPC_MULTIPLATFORM && PPC32
@@ -43712,7 +43712,7 @@
-
--- a/arch/powerpc/platforms/52xx/Makefile
+++ b/arch/powerpc/platforms/52xx/Makefile
-@@ -6,6 +6,7 @@
+@@ -6,6 +6,7 @@ obj-y += mpc52xx_pic.o mpc52xx_common
obj-$(CONFIG_PCI) += mpc52xx_pci.o
endif
@@ -43737,7 +43737,7 @@
if (!cdm) {
printk(KERN_ERR "%s() failed; expect abnormal behaviour\n",
__FUNCTION__);
-@@ -74,10 +77,13 @@
+@@ -74,10 +77,13 @@ lite5200_fix_clock_config(void)
static void __init
lite5200_fix_port_config(void)
{
@@ -43752,7 +43752,7 @@
if (!gpio) {
printk(KERN_ERR "%s() failed. expect abnormal behavior\n",
__FUNCTION__);
-@@ -131,10 +137,6 @@
+@@ -131,10 +137,6 @@ static void lite5200_resume_finish(void
static void __init lite5200_setup_arch(void)
{
@@ -43763,7 +43763,7 @@
if (ppc_md.progress)
ppc_md.progress("lite5200_setup_arch()", 0);
-@@ -154,13 +156,7 @@
+@@ -154,13 +156,7 @@ static void __init lite5200_setup_arch(v
lite5200_pm_init();
#endif
@@ -43780,7 +43780,7 @@
/*
--- a/arch/powerpc/platforms/52xx/lite5200_pm.c
+++ b/arch/powerpc/platforms/52xx/lite5200_pm.c
-@@ -42,6 +42,8 @@
+@@ -42,6 +42,8 @@ static int lite5200_pm_set_target(suspen
static int lite5200_pm_prepare(void)
{
@@ -43789,7 +43789,7 @@
/* deep sleep? let mpc52xx code handle that */
if (lite5200_pm_target_state == PM_SUSPEND_STANDBY)
return mpc52xx_pm_prepare();
-@@ -50,7 +52,9 @@
+@@ -50,7 +52,9 @@ static int lite5200_pm_prepare(void)
return -EINVAL;
/* map registers */
@@ -43936,7 +43936,7 @@
/**
* mpc52xx_find_ipb_freq - Find the IPB bus frequency for a device
* @node: device node
-@@ -101,9 +62,12 @@
+@@ -101,9 +62,12 @@ EXPORT_SYMBOL(mpc52xx_find_ipb_freq);
void __init
mpc5200_setup_xlb_arbiter(void)
{
@@ -43950,7 +43950,7 @@
if (!xlb) {
printk(KERN_ERR __FILE__ ": "
"Error mapping XLB in mpc52xx_setup_cpu(). "
-@@ -124,11 +88,21 @@
+@@ -124,11 +88,21 @@ mpc5200_setup_xlb_arbiter(void)
iounmap(xlb);
}
@@ -43973,7 +43973,7 @@
printk(KERN_ERR __FILE__ ": "
"Error while probing of_platform bus\n");
}
-@@ -146,16 +120,19 @@
+@@ -146,16 +120,19 @@ mpc52xx_map_wdt(void)
for_each_compatible_node(np, NULL, "fsl,mpc5200-gpt") {
has_wdt = of_get_property(np, "fsl,has-wdt", NULL);
if (has_wdt) {
@@ -43997,7 +43997,7 @@
--- a/arch/powerpc/platforms/52xx/mpc52xx_pci.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pci.c
-@@ -363,7 +363,7 @@
+@@ -363,7 +363,7 @@ mpc52xx_add_bridge(struct device_node *n
pr_debug("Adding MPC52xx PCI host bridge %s\n", node->full_name);
@@ -44006,7 +44006,7 @@
if (of_address_to_resource(node, 0, &rsrc) != 0) {
printk(KERN_ERR "Can't get %s resources\n", node->full_name);
-@@ -406,3 +406,17 @@
+@@ -406,3 +406,17 @@ mpc52xx_add_bridge(struct device_node *n
return 0;
}
@@ -44026,7 +44026,7 @@
+}
--- a/arch/powerpc/platforms/52xx/mpc52xx_pic.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
-@@ -364,16 +364,18 @@
+@@ -364,16 +364,18 @@ void __init mpc52xx_init_irq(void)
{
u32 intr_ctrl;
struct device_node *picnode;
@@ -44050,7 +44050,7 @@
"Check node !");
--- a/arch/powerpc/platforms/52xx/mpc52xx_pm.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pm.c
-@@ -59,10 +59,14 @@
+@@ -59,10 +59,14 @@ int mpc52xx_set_wakeup_gpio(u8 pin, u8 l
int mpc52xx_pm_prepare(void)
{
@@ -44069,7 +44069,7 @@
/* these offsets are from mpc5200 users manual */
--- a/arch/powerpc/platforms/82xx/Kconfig
+++ b/arch/powerpc/platforms/82xx/Kconfig
-@@ -26,6 +26,19 @@
+@@ -26,6 +26,19 @@ config PQ2FADS
help
This option enables support for the PQ2FADS board
@@ -44091,7 +44091,7 @@
config PQ2ADS
--- a/arch/powerpc/platforms/82xx/Makefile
+++ b/arch/powerpc/platforms/82xx/Makefile
-@@ -5,3 +5,4 @@
+@@ -5,3 +5,4 @@ obj-$(CONFIG_MPC8272_ADS) += mpc8272_ads
obj-$(CONFIG_CPM2) += pq2.o
obj-$(CONFIG_PQ2_ADS_PCI_PIC) += pq2ads-pci-pic.o
obj-$(CONFIG_PQ2FADS) += pq2fads.o
@@ -44425,7 +44425,7 @@
+};
--- a/arch/powerpc/platforms/82xx/pq2.c
+++ b/arch/powerpc/platforms/82xx/pq2.c
-@@ -53,13 +53,13 @@
+@@ -53,13 +53,13 @@ static void __init pq2_pci_add_bridge(st
if (of_address_to_resource(np, 0, &r) || r.end - r.start < 0x10b)
goto err;
@@ -44459,7 +44459,7 @@
#include <sysdev/fsl_soc.h>
--- a/arch/powerpc/platforms/83xx/Kconfig
+++ b/arch/powerpc/platforms/83xx/Kconfig
-@@ -50,6 +50,11 @@
+@@ -50,6 +50,11 @@ config MPC836x_MDS
help
This option enables support for the MPC836x MDS Processor Board.
@@ -44471,7 +44471,7 @@
endchoice
config PPC_MPC831x
-@@ -75,3 +80,9 @@
+@@ -75,3 +80,9 @@ config PPC_MPC836x
select PPC_UDBG_16550
select PPC_INDIRECT_PCI
default y if MPC836x_MDS
@@ -44483,7 +44483,7 @@
+ default y if MPC837x_MDS
--- a/arch/powerpc/platforms/83xx/Makefile
+++ b/arch/powerpc/platforms/83xx/Makefile
-@@ -9,3 +9,4 @@
+@@ -9,3 +9,4 @@ obj-$(CONFIG_MPC834x_MDS) += mpc834x_mds
obj-$(CONFIG_MPC834x_ITX) += mpc834x_itx.o
obj-$(CONFIG_MPC836x_MDS) += mpc836x_mds.o
obj-$(CONFIG_MPC832x_MDS) += mpc832x_mds.o
@@ -44498,7 +44498,7 @@
#include <asm/time.h>
#include <asm/ipic.h>
-@@ -70,11 +71,23 @@
+@@ -70,11 +71,23 @@ void __init mpc8313_rdb_init_IRQ(void)
*/
static int __init mpc8313_rdb_probe(void)
{
@@ -44538,7 +44538,7 @@
#include <asm/system.h>
#include <asm/atomic.h>
#include <asm/time.h>
-@@ -110,15 +110,12 @@
+@@ -110,15 +110,12 @@ static struct of_device_id mpc832x_ids[]
static int __init mpc832x_declare_of_platform_devices(void)
{
@@ -44567,7 +44567,7 @@
#include <asm/time.h>
#include <asm/ipic.h>
#include <asm/udbg.h>
-@@ -63,9 +63,6 @@
+@@ -63,9 +63,6 @@ static struct spi_board_info mpc832x_spi
static int __init mpc832x_spi_init(void)
{
@@ -44577,7 +44577,7 @@
par_io_config_pin(3, 0, 3, 0, 1, 0); /* SPI1 MOSI, I/O */
par_io_config_pin(3, 1, 3, 0, 1, 0); /* SPI1 MISO, I/O */
par_io_config_pin(3, 2, 3, 0, 1, 0); /* SPI1 CLK, I/O */
-@@ -80,7 +77,7 @@
+@@ -80,7 +77,7 @@ static int __init mpc832x_spi_init(void)
mpc83xx_spi_deactivate_cs);
}
@@ -44586,7 +44586,7 @@
/* ************************************************************************
*
-@@ -123,15 +120,12 @@
+@@ -123,15 +120,12 @@ static struct of_device_id mpc832x_ids[]
static int __init mpc832x_declare_of_platform_devices(void)
{
@@ -44641,7 +44641,7 @@
#include <asm/system.h>
#include <asm/atomic.h>
-@@ -106,14 +107,27 @@
+@@ -106,14 +107,27 @@ static void __init mpc834x_mds_init_IRQ(
ipic_set_default_priority();
}
@@ -44685,7 +44685,7 @@
#include <asm/system.h>
#include <asm/atomic.h>
#include <asm/time.h>
-@@ -141,15 +141,12 @@
+@@ -141,15 +141,12 @@ static struct of_device_id mpc836x_ids[]
static int __init mpc836x_declare_of_platform_devices(void)
{
@@ -44873,7 +44873,7 @@
#define MPC83XX_SICRH_OFFS 0x118
--- a/arch/powerpc/platforms/83xx/pci.c
+++ b/arch/powerpc/platforms/83xx/pci.c
-@@ -54,7 +54,7 @@
+@@ -54,7 +54,7 @@ int __init mpc83xx_add_bridge(struct dev
" bus 0\n", dev->full_name);
}
@@ -44884,7 +44884,7 @@
return -ENOMEM;
--- a/arch/powerpc/platforms/83xx/usb.c
+++ b/arch/powerpc/platforms/83xx/usb.c
-@@ -41,7 +41,7 @@
+@@ -41,7 +41,7 @@ int mpc834x_usb_cfg(void)
sicrl = in_be32(immap + MPC83XX_SICRL_OFFS) & ~MPC834X_SICRL_USB_MASK;
sicrh = in_be32(immap + MPC83XX_SICRH_OFFS) & ~MPC834X_SICRH_USB_UTMI;
@@ -44893,7 +44893,7 @@
if (np) {
sccr |= MPC83XX_SCCR_USB_DRCM_11; /* 1:3 */
-@@ -67,7 +67,7 @@
+@@ -67,7 +67,7 @@ int mpc834x_usb_cfg(void)
port0_is_dr = 1;
of_node_put(np);
}
@@ -44902,7 +44902,7 @@
if (np) {
sccr |= MPC83XX_SCCR_USB_MPHCM_11; /* 1:3 */
-@@ -111,7 +111,7 @@
+@@ -111,7 +111,7 @@ int mpc831x_usb_cfg(void)
const void *dr_mode;
#endif
@@ -44911,7 +44911,7 @@
if (!np)
return -ENODEV;
prop = of_get_property(np, "phy_type", NULL);
-@@ -179,3 +179,43 @@
+@@ -179,3 +179,43 @@ int mpc831x_usb_cfg(void)
return ret;
}
#endif /* CONFIG_PPC_MPC831x */
@@ -44957,7 +44957,7 @@
+#endif /* CONFIG_PPC_MPC837x */
--- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
-@@ -52,9 +52,9 @@
+@@ -52,9 +52,9 @@ static void cpm2_cascade(unsigned int ir
{
int cascade_irq;
@@ -44969,7 +44969,7 @@
desc->chip->eoi(irq);
}
-@@ -70,13 +70,12 @@
+@@ -70,13 +70,12 @@ static void __init mpc85xx_ads_pic_init(
#endif
np = of_find_node_by_type(np, "open-pic");
@@ -44985,7 +44985,7 @@
printk(KERN_ERR "Could not map mpic register space\n");
of_node_put(np);
return;
-@@ -100,6 +99,7 @@
+@@ -100,6 +99,7 @@ static void __init mpc85xx_ads_pic_init(
irq = irq_of_parse_and_map(np, 0);
cpm2_pic_init(np);
@@ -44993,7 +44993,7 @@
set_irq_chained_handler(irq, cpm2_cascade);
#endif
}
-@@ -112,7 +112,7 @@
+@@ -112,7 +112,7 @@ struct cpm_pin {
int port, pin, flags;
};
@@ -45002,7 +45002,7 @@
/* SCC1 */
{3, 29, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
{3, 30, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
-@@ -233,13 +233,11 @@
+@@ -233,13 +233,11 @@ static struct of_device_id __initdata of
static int __init declare_of_platform_devices(void)
{
@@ -45020,7 +45020,7 @@
* Called very early, device-tree isn't unflattened
--- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
-@@ -222,9 +222,6 @@
+@@ -222,9 +222,6 @@ static int mpc85xx_cds_8259_attach(void)
struct device_node *cascade_node = NULL;
int cascade_irq;
@@ -45030,7 +45030,7 @@
/* Initialize the i8259 controller */
for_each_node_by_type(np, "interrupt-controller")
if (of_device_is_compatible(np, "chrp,iic")) {
-@@ -262,8 +259,7 @@
+@@ -262,8 +259,7 @@ static int mpc85xx_cds_8259_attach(void)
return 0;
}
@@ -45042,7 +45042,7 @@
--- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
-@@ -123,7 +123,7 @@
+@@ -123,7 +123,7 @@ static int mpc85xx_exclude_device(struct
struct device_node* node;
struct resource rsrc;
@@ -45065,7 +45065,7 @@
#include <asm/system.h>
#include <asm/atomic.h>
#include <asm/time.h>
-@@ -144,15 +144,12 @@
+@@ -144,15 +144,12 @@ static struct of_device_id mpc85xx_ids[]
static int __init mpc85xx_publish_devices(void)
{
@@ -45110,7 +45110,7 @@
void __init
mpc86xx_hpcd_init_irq(void)
{
-@@ -124,7 +139,7 @@
+@@ -124,7 +139,7 @@ static void __devinit quirk_uli5229(stru
static void __devinit final_uli5288(struct pci_dev *dev)
{
struct pci_controller *hose = pci_bus_to_host(dev->bus);
@@ -45129,7 +45129,7 @@
#include <asm/system.h>
#include <asm/time.h>
-@@ -116,7 +117,7 @@
+@@ -116,7 +117,7 @@ static int mpc86xx_exclude_device(struct
struct device_node* node;
struct resource rsrc;
@@ -45138,7 +45138,7 @@
of_address_to_resource(node, 0, &rsrc);
if ((rsrc.start & 0xfffff) == 0x8000) {
-@@ -212,6 +213,19 @@
+@@ -212,6 +213,19 @@ mpc86xx_time_init(void)
return 0;
}
@@ -45160,7 +45160,7 @@
.probe = mpc86xx_hpcn_probe,
--- a/arch/powerpc/platforms/8xx/Kconfig
+++ b/arch/powerpc/platforms/8xx/Kconfig
-@@ -18,6 +18,7 @@
+@@ -18,6 +18,7 @@ config MPC8XXFADS
config MPC86XADS
bool "MPC86XADS"
select CPM1
@@ -45168,7 +45168,7 @@
help
MPC86x Application Development System by Freescale Semiconductor.
The MPC86xADS is meant to serve as a platform for s/w and h/w
-@@ -43,6 +44,15 @@
+@@ -43,6 +44,15 @@ config PPC_EP88XC
This board is also resold by Freescale as the QUICCStart
MPC885 Evaluation System and/or the CWH-PPC-885XN-VE.
@@ -45186,7 +45186,7 @@
menu "Freescale Ethernet driver platform-specific options"
--- a/arch/powerpc/platforms/8xx/Makefile
+++ b/arch/powerpc/platforms/8xx/Makefile
-@@ -5,3 +5,4 @@
+@@ -5,3 +5,4 @@ obj-$(CONFIG_PPC_8xx) += m8xx_setup.o
obj-$(CONFIG_MPC885ADS) += mpc885ads_setup.o
obj-$(CONFIG_MPC86XADS) += mpc86xads_setup.o
obj-$(CONFIG_PPC_EP88XC) += ep88xc.o
@@ -45314,7 +45314,7 @@
+};
--- a/arch/powerpc/platforms/8xx/ep88xc.c
+++ b/arch/powerpc/platforms/8xx/ep88xc.c
-@@ -155,12 +155,11 @@
+@@ -155,12 +155,11 @@ static struct of_device_id __initdata of
static int __init declare_of_platform_devices(void)
{
/* Publish the QE devices */
@@ -45331,7 +45331,7 @@
.name = "Embedded Planet EP88xC",
--- a/arch/powerpc/platforms/8xx/m8xx_setup.c
+++ b/arch/powerpc/platforms/8xx/m8xx_setup.c
-@@ -120,7 +120,7 @@
+@@ -120,7 +120,7 @@ void __init mpc8xx_calibrate_decr(void)
ppc_tb_freq /= 16;
ppc_proc_freq = 50000000;
if (!get_freq("clock-frequency", &ppc_proc_freq))
@@ -45744,7 +45744,7 @@
define_machine(mpc86x_ads) {
.name = "MPC86x ADS",
-@@ -275,4 +144,5 @@
+@@ -275,4 +144,5 @@ define_machine(mpc86x_ads) {
.calibrate_decr = mpc8xx_calibrate_decr,
.set_rtc_time = mpc8xx_set_rtc_time,
.get_rtc_time = mpc8xx_get_rtc_time,
@@ -45752,7 +45752,7 @@
};
--- a/arch/powerpc/platforms/8xx/mpc885ads_setup.c
+++ b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
-@@ -264,12 +264,11 @@
+@@ -264,12 +264,11 @@ static struct of_device_id __initdata of
static int __init declare_of_platform_devices(void)
{
/* Publish the QE devices */
@@ -45769,7 +45769,7 @@
.name = "Freescale MPC885 ADS",
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
-@@ -22,6 +22,7 @@
+@@ -22,6 +22,7 @@ config PPC_83xx
depends on 6xx
select FSL_SOC
select 83xx
@@ -45777,7 +45777,7 @@
select WANT_DEVICE_TREE
config PPC_86xx
-@@ -80,6 +81,10 @@
+@@ -80,6 +81,10 @@ config XICS
bool
default y
@@ -45788,7 +45788,7 @@
config MPIC
bool
default n
-@@ -265,6 +270,7 @@
+@@ -265,6 +270,7 @@ config TAU_AVERAGE
config QUICC_ENGINE
bool
select PPC_LIB_RHEAP
@@ -45796,7 +45796,7 @@
help
The QUICC Engine (QE) is a new generation of communications
coprocessors on Freescale embedded CPUs (akin to CPM in older chips).
-@@ -315,6 +321,12 @@
+@@ -315,6 +321,12 @@ config FSL_ULI1575
config CPM
bool
@@ -45811,7 +45811,7 @@
endmenu
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
-@@ -43,6 +43,7 @@
+@@ -43,6 +43,7 @@ config 40x
bool "AMCC 40x"
select PPC_DCR_NATIVE
select WANT_DEVICE_TREE
@@ -45821,7 +45821,7 @@
bool "AMCC 44x"
--- a/arch/powerpc/platforms/cell/Makefile
+++ b/arch/powerpc/platforms/cell/Makefile
-@@ -20,7 +20,7 @@
+@@ -20,7 +20,7 @@ spu-manage-$(CONFIG_PPC_CELL_NATIVE) +=
obj-$(CONFIG_SPU_BASE) += spu_callbacks.o spu_base.o \
spu_notify.o \
@@ -45873,7 +45873,7 @@
#include <asm/cell-regs.h>
/*
-@@ -256,6 +256,7 @@
+@@ -256,6 +256,7 @@ void __init cbe_regs_init(void)
printk(KERN_ERR "cbe_regs: More BE chips than supported"
"!\n");
cbe_regs_map_count--;
@@ -45883,7 +45883,7 @@
map->cpu_node = cpu;
--- a/arch/powerpc/platforms/cell/io-workarounds.c
+++ b/arch/powerpc/platforms/cell/io-workarounds.c
-@@ -238,7 +238,7 @@
+@@ -238,7 +238,7 @@ static void __init spider_pci_setup_chip
static void __init spider_pci_add_one(struct pci_controller *phb)
{
struct spider_pci_bus *bus = &spider_pci_busses[spider_pci_count];
@@ -45892,7 +45892,7 @@
struct resource rsrc;
void __iomem *regs;
-@@ -309,15 +309,12 @@
+@@ -309,15 +309,12 @@ static int __init spider_pci_workaround_
{
struct pci_controller *phb;
@@ -45909,7 +45909,7 @@
const char *model = of_get_property(np, "model", NULL);
/* If no model property or name isn't exactly "pci", skip */
-@@ -343,4 +340,4 @@
+@@ -343,4 +340,4 @@ static int __init spider_pci_workaround_
return 0;
}
@@ -45934,7 +45934,7 @@
#include <asm/cell-regs.h>
#include "interrupt.h"
-@@ -309,8 +310,8 @@
+@@ -309,8 +310,8 @@ static void cell_iommu_setup_hardware(st
{
struct page *page;
int ret, i;
@@ -45945,7 +45945,7 @@
unsigned int virq;
if (cell_iommu_find_ioc(iommu->nid, &xlate_base))
-@@ -327,7 +328,8 @@
+@@ -327,7 +328,8 @@ static void cell_iommu_setup_hardware(st
__FUNCTION__, iommu->nid, segments, pages_per_segment);
/* set up the segment table */
@@ -45955,7 +45955,7 @@
BUG_ON(!page);
iommu->stab = page_address(page);
clear_page(iommu->stab);
-@@ -489,15 +491,18 @@
+@@ -489,15 +491,18 @@ static struct cbe_iommu *cell_iommu_for_
return NULL;
}
@@ -45976,7 +45976,7 @@
/* Current implementation uses the first window available in that
* node's iommu. We -might- do something smarter later though it may
-@@ -653,7 +658,7 @@
+@@ -653,7 +658,7 @@ static int __init cell_iommu_init_disabl
/* If we have no Axon, we set up the spider DMA magic offset */
if (of_find_node_by_name(NULL, "axon") == NULL)
@@ -45985,7 +45985,7 @@
/* Now we need to check to see where the memory is mapped
* in PCI space. We assume that all busses use the same dma
-@@ -687,10 +692,13 @@
+@@ -687,10 +692,13 @@ static int __init cell_iommu_init_disabl
return -ENODEV;
}
@@ -46001,7 +46001,7 @@
return 0;
}
-@@ -699,9 +707,6 @@
+@@ -699,9 +707,6 @@ static int __init cell_iommu_init(void)
{
struct device_node *np;
@@ -46011,7 +46011,7 @@
/* If IOMMU is disabled or we have little enough RAM to not need
* to enable it, we setup a direct mapping.
*
-@@ -744,5 +749,6 @@
+@@ -744,5 +749,6 @@ static int __init cell_iommu_init(void)
return 0;
}
@@ -46021,7 +46021,7 @@
--- a/arch/powerpc/platforms/cell/pmu.c
+++ b/arch/powerpc/platforms/cell/pmu.c
-@@ -213,7 +213,7 @@
+@@ -213,7 +213,7 @@ u32 cbe_read_pm(u32 cpu, enum pm_reg_nam
break;
case pm_interval:
@@ -46030,7 +46030,7 @@
break;
case pm_start_stop:
-@@ -381,9 +381,6 @@
+@@ -381,9 +381,6 @@ static int __init cbe_init_pm_irq(void)
unsigned int irq;
int rc, node;
@@ -46040,7 +46040,7 @@
for_each_node(node) {
irq = irq_create_mapping(NULL, IIC_IRQ_IOEX_PMI |
(node << IIC_IRQ_NODE_SHIFT));
-@@ -404,7 +401,7 @@
+@@ -404,7 +401,7 @@ static int __init cbe_init_pm_irq(void)
return 0;
}
@@ -46067,7 +46067,7 @@
#include <asm/cell-regs.h>
#include "interrupt.h"
-@@ -85,9 +85,6 @@
+@@ -85,9 +85,6 @@ static int __init cell_publish_devices(v
{
int node;
@@ -46077,7 +46077,7 @@
/* Publish OF platform devices for southbridge IOs */
of_platform_bus_probe(NULL, NULL, NULL);
-@@ -101,7 +98,7 @@
+@@ -101,7 +98,7 @@ static int __init cell_publish_devices(v
}
return 0;
}
@@ -46096,7 +46096,7 @@
#include "interrupt.h"
#include <asm/udbg.h>
-@@ -182,7 +183,7 @@
+@@ -182,7 +183,7 @@ static int smp_cell_cpu_bootable(unsigne
*/
if (system_state < SYSTEM_RUNNING &&
cpu_has_feature(CPU_FTR_SMT) &&
@@ -46115,7 +46115,7 @@
#include <asm/xmon.h>
#include <asm/prom.h>
-@@ -47,6 +48,13 @@
+@@ -47,6 +48,13 @@ struct cbe_spu_info cbe_spu_info[MAX_NUM
EXPORT_SYMBOL_GPL(cbe_spu_info);
/*
@@ -46129,7 +46129,7 @@
* Protects cbe_spu_info and spu->number.
*/
static DEFINE_SPINLOCK(spu_lock);
-@@ -66,6 +74,10 @@
+@@ -66,6 +74,10 @@ static LIST_HEAD(spu_full_list);
static DEFINE_SPINLOCK(spu_full_list_lock);
static DEFINE_MUTEX(spu_full_list_mutex);
@@ -46140,7 +46140,7 @@
void spu_invalidate_slbs(struct spu *spu)
{
struct spu_priv2 __iomem *priv2 = spu->priv2;
-@@ -114,40 +126,36 @@
+@@ -114,40 +126,36 @@ void spu_associate_mm(struct spu *spu, s
}
EXPORT_SYMBOL_GPL(spu_associate_mm);
@@ -46196,7 +46196,7 @@
int psize;
pr_debug("%s\n", __FUNCTION__);
-@@ -159,7 +167,7 @@
+@@ -159,7 +167,7 @@ static int __spu_trap_data_seg(struct sp
printk("%s: invalid access during switch!\n", __func__);
return 1;
}
@@ -46205,7 +46205,7 @@
switch(REGION_ID(ea)) {
case USER_REGION_ID:
-@@ -168,21 +176,21 @@
+@@ -168,21 +176,21 @@ static int __spu_trap_data_seg(struct sp
#else
psize = mm->context.user_psize;
#endif
@@ -46233,7 +46233,7 @@
break;
default:
/* Future: support kernel segments so that drivers
-@@ -191,11 +199,9 @@
+@@ -191,11 +199,9 @@ static int __spu_trap_data_seg(struct sp
pr_debug("invalid region access at %016lx\n", ea);
return 1;
}
@@ -46247,7 +46247,7 @@
spu->slb_replace++;
if (spu->slb_replace >= 8)
-@@ -225,13 +231,83 @@
+@@ -225,13 +231,83 @@ static int __spu_trap_data_map(struct sp
return 1;
}
@@ -46332,7 +46332,7 @@
static irqreturn_t
spu_irq_class_0(int irq, void *data)
{
-@@ -240,12 +316,13 @@
+@@ -240,12 +316,13 @@ spu_irq_class_0(int irq, void *data)
spu = data;
@@ -46349,7 +46349,7 @@
spin_unlock(&spu->register_lock);
spu->stop_callback(spu);
-@@ -255,31 +332,6 @@
+@@ -255,31 +332,6 @@ spu_irq_class_0(int irq, void *data)
return IRQ_HANDLED;
}
@@ -46381,7 +46381,7 @@
static irqreturn_t
spu_irq_class_1(int irq, void *data)
{
-@@ -294,24 +346,23 @@
+@@ -294,24 +346,23 @@ spu_irq_class_1(int irq, void *data)
stat = spu_int_stat_get(spu, 1) & mask;
dar = spu_mfc_dar_get(spu);
dsisr = spu_mfc_dsisr_get(spu);
@@ -46411,7 +46411,7 @@
;
return stat ? IRQ_HANDLED : IRQ_NONE;
-@@ -323,6 +374,8 @@
+@@ -323,6 +374,8 @@ spu_irq_class_2(int irq, void *data)
struct spu *spu;
unsigned long stat;
unsigned long mask;
@@ -46420,7 +46420,7 @@
spu = data;
spin_lock(&spu->register_lock);
-@@ -330,31 +383,30 @@
+@@ -330,31 +383,30 @@ spu_irq_class_2(int irq, void *data)
mask = spu_int_mask_get(spu, 2);
/* ignore interrupts we're not waiting for */
stat &= mask;
@@ -46462,7 +46462,7 @@
spu->wbox_callback(spu);
spu->stats.class2_intr++;
-@@ -479,13 +531,27 @@
+@@ -479,13 +531,27 @@ EXPORT_SYMBOL_GPL(spu_add_sysdev_attr);
int spu_add_sysdev_attr_group(struct attribute_group *attrs)
{
struct spu *spu;
@@ -46604,7 +46604,7 @@
#include "interrupt.h"
struct device_node *spu_devnode(struct spu *spu)
-@@ -345,7 +346,7 @@
+@@ -345,7 +346,7 @@ static int __init of_create_spu(struct s
}
ret = spu_map_interrupts_old(spu, spe);
if (ret) {
@@ -46613,7 +46613,7 @@
spu->name);
goto out_unmap;
}
-@@ -369,6 +370,16 @@
+@@ -369,6 +370,16 @@ static int of_destroy_spu(struct spu *sp
return 0;
}
@@ -46630,7 +46630,7 @@
/* Hardcoded affinity idxs for qs20 */
#define QS20_SPES_PER_BE 8
static int qs20_reg_idxs[QS20_SPES_PER_BE] = { 0, 2, 4, 6, 7, 5, 3, 1 };
-@@ -411,10 +422,15 @@
+@@ -411,10 +422,15 @@ static void init_affinity_qs20_harcoded(
static int of_has_vicinity(void)
{
@@ -46649,7 +46649,7 @@
}
static struct spu *devnode_spu(int cbe, struct device_node *dn)
-@@ -525,7 +541,7 @@
+@@ -525,7 +541,7 @@ static int __init init_affinity(void)
if (of_flat_dt_is_compatible(root, "IBM,CPBW-1.0"))
init_affinity_qs20_harcoded();
else
@@ -46658,7 +46658,7 @@
}
return 0;
-@@ -535,5 +551,7 @@
+@@ -535,5 +551,7 @@ const struct spu_management_ops spu_mana
.enumerate_spus = of_enumerate_spus,
.create_spu = of_create_spu,
.destroy_spu = of_destroy_spu,
@@ -46680,7 +46680,7 @@
SPU_CROSS := spu-
--- a/arch/powerpc/platforms/cell/spufs/backing_ops.c
+++ b/arch/powerpc/platforms/cell/spufs/backing_ops.c
-@@ -106,16 +106,20 @@
+@@ -106,16 +106,20 @@ static unsigned int spu_backing_mbox_sta
if (stat & 0xff0000)
ret |= POLLIN | POLLRDNORM;
else {
@@ -46705,7 +46705,7 @@
}
}
spin_unlock_irq(&ctx->csa.register_lock);
-@@ -139,7 +143,7 @@
+@@ -139,7 +143,7 @@ static int spu_backing_ibox_read(struct
ret = 4;
} else {
/* make sure we get woken up by the interrupt */
@@ -46714,7 +46714,7 @@
ret = 0;
}
spin_unlock(&ctx->csa.register_lock);
-@@ -169,7 +173,8 @@
+@@ -169,7 +173,8 @@ static int spu_backing_wbox_write(struct
} else {
/* make sure we get woken up by the interrupt when space
becomes available */
@@ -46724,7 +46724,7 @@
ret = 0;
}
spin_unlock(&ctx->csa.register_lock);
-@@ -268,6 +273,11 @@
+@@ -268,6 +273,11 @@ static char *spu_backing_get_ls(struct s
return ctx->csa.lscsa->ls;
}
@@ -46736,7 +46736,7 @@
static u32 spu_backing_runcntl_read(struct spu_context *ctx)
{
return ctx->csa.prob.spu_runcntl_RW;
-@@ -285,6 +295,11 @@
+@@ -285,6 +295,11 @@ static void spu_backing_runcntl_write(st
spin_unlock(&ctx->csa.register_lock);
}
@@ -46748,7 +46748,7 @@
static void spu_backing_master_start(struct spu_context *ctx)
{
struct spu_state *csa = &ctx->csa;
-@@ -358,7 +373,7 @@
+@@ -358,7 +373,7 @@ static int spu_backing_send_mfc_command(
static void spu_backing_restart_dma(struct spu_context *ctx)
{
@@ -46757,7 +46757,7 @@
}
struct spu_context_ops spu_backing_ops = {
-@@ -379,8 +394,10 @@
+@@ -379,8 +394,10 @@ struct spu_context_ops spu_backing_ops =
.npc_write = spu_backing_npc_write,
.status_read = spu_backing_status_read,
.get_ls = spu_backing_get_ls,
@@ -46770,7 +46770,7 @@
.set_mfc_query = spu_backing_set_mfc_query,
--- a/arch/powerpc/platforms/cell/spufs/context.c
+++ b/arch/powerpc/platforms/cell/spufs/context.c
-@@ -52,6 +52,7 @@
+@@ -52,6 +52,7 @@ struct spu_context *alloc_spu_context(st
init_waitqueue_head(&ctx->wbox_wq);
init_waitqueue_head(&ctx->stop_wq);
init_waitqueue_head(&ctx->mfc_wq);
@@ -46778,7 +46778,7 @@
ctx->state = SPU_STATE_SAVED;
ctx->ops = &spu_backing_ops;
ctx->owner = get_task_mm(current);
-@@ -105,7 +106,17 @@
+@@ -105,7 +106,17 @@ int put_spu_context(struct spu_context *
void spu_forget(struct spu_context *ctx)
{
struct mm_struct *mm;
@@ -46797,7 +46797,7 @@
mm = ctx->owner;
ctx->owner = NULL;
mmput(mm);
-@@ -133,47 +144,23 @@
+@@ -133,47 +144,23 @@ void spu_unmap_mappings(struct spu_conte
}
/**
@@ -46855,7 +46855,7 @@
/**
--- a/arch/powerpc/platforms/cell/spufs/coredump.c
+++ b/arch/powerpc/platforms/cell/spufs/coredump.c
-@@ -148,7 +148,9 @@
+@@ -148,7 +148,9 @@ int spufs_coredump_extra_notes_size(void
fd = 0;
while ((ctx = coredump_next_context(&fd)) != NULL) {
@@ -46866,7 +46866,7 @@
rc = spufs_ctx_note_size(ctx, fd);
spu_release_saved(ctx);
if (rc < 0)
-@@ -224,7 +226,9 @@
+@@ -224,7 +226,9 @@ int spufs_coredump_extra_notes_write(str
fd = 0;
while ((ctx = coredump_next_context(&fd)) != NULL) {
@@ -47051,7 +47051,7 @@
/*
* bottom half handler for page faults, we can't do this from
-@@ -154,7 +108,7 @@
+@@ -154,7 +108,7 @@ int spufs_handle_class1(struct spu_conte
u64 ea, dsisr, access;
unsigned long flags;
unsigned flt = 0;
@@ -47060,7 +47060,7 @@
/*
* dar and dsisr get passed from the registers
-@@ -165,16 +119,8 @@
+@@ -165,16 +119,8 @@ int spufs_handle_class1(struct spu_conte
* in time, we can still expect to get the same fault
* the immediately after the context restore.
*/
@@ -47079,7 +47079,7 @@
if (!(dsisr & (MFC_DSISR_PTE_NOT_FOUND | MFC_DSISR_ACCESS_DENIED)))
return 0;
-@@ -201,7 +147,22 @@
+@@ -201,7 +147,22 @@ int spufs_handle_class1(struct spu_conte
if (ret)
ret = spu_handle_mm_fault(current->mm, ea, dsisr, &flt);
@@ -47103,7 +47103,7 @@
/*
* If we handled the fault successfully and are in runnable
* state, restart the DMA.
-@@ -222,9 +183,9 @@
+@@ -222,9 +183,9 @@ int spufs_handle_class1(struct spu_conte
if (ctx->spu)
ctx->ops->restart_dma(ctx);
} else
@@ -47238,7 +47238,7 @@
static int
spufs_mem_open(struct inode *inode, struct file *file)
-@@ -84,9 +198,12 @@
+@@ -84,9 +198,12 @@ spufs_mem_read(struct file *file, char _
struct spu_context *ctx = file->private_data;
ssize_t ret;
@@ -47252,7 +47252,7 @@
return ret;
}
-@@ -106,7 +223,10 @@
+@@ -106,7 +223,10 @@ spufs_mem_write(struct file *file, const
if (size > LS_SIZE - pos)
size = LS_SIZE - pos;
@@ -47264,7 +47264,7 @@
local_store = ctx->ops->get_ls(ctx);
ret = copy_from_user(local_store + pos, buffer, size);
spu_release(ctx);
-@@ -146,7 +266,8 @@
+@@ -146,7 +266,8 @@ static unsigned long spufs_mem_mmap_nopf
pr_debug("spufs_mem_mmap_nopfn address=0x%lx -> 0x%lx, offset=0x%lx\n",
addr0, address, offset);
@@ -47274,7 +47274,7 @@
if (ctx->state == SPU_STATE_SAVED) {
vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
-@@ -236,23 +357,32 @@
+@@ -236,23 +357,32 @@ static unsigned long spufs_ps_nopfn(stru
{
struct spu_context *ctx = vma->vm_file->private_data;
unsigned long area, offset = address - vma->vm_start;
@@ -47315,7 +47315,7 @@
return NOPFN_REFAULT;
}
-@@ -286,25 +416,32 @@
+@@ -286,25 +416,32 @@ static int spufs_cntl_mmap(struct file *
#define spufs_cntl_mmap NULL
#endif /* !SPUFS_MMAP_4K */
@@ -47355,7 +47355,7 @@
}
static int spufs_cntl_open(struct inode *inode, struct file *file)
-@@ -317,7 +454,7 @@
+@@ -317,7 +454,7 @@ static int spufs_cntl_open(struct inode
if (!i->i_openers++)
ctx->cntl = inode->i_mapping;
mutex_unlock(&ctx->mapping_lock);
@@ -47364,7 +47364,7 @@
spufs_cntl_set, "0x%08lx");
}
-@@ -327,7 +464,7 @@
+@@ -327,7 +464,7 @@ spufs_cntl_release(struct inode *inode,
struct spufs_inode_info *i = SPUFS_I(inode);
struct spu_context *ctx = i->i_ctx;
@@ -47373,7 +47373,7 @@
mutex_lock(&ctx->mapping_lock);
if (!--i->i_openers)
-@@ -339,8 +476,8 @@
+@@ -339,8 +476,8 @@ spufs_cntl_release(struct inode *inode,
static const struct file_operations spufs_cntl_fops = {
.open = spufs_cntl_open,
.release = spufs_cntl_release,
@@ -47384,7 +47384,7 @@
.mmap = spufs_cntl_mmap,
};
-@@ -368,7 +505,9 @@
+@@ -368,7 +505,9 @@ spufs_regs_read(struct file *file, char
int ret;
struct spu_context *ctx = file->private_data;
@@ -47395,7 +47395,7 @@
ret = __spufs_regs_read(ctx, buffer, size, pos);
spu_release_saved(ctx);
return ret;
-@@ -387,7 +526,9 @@
+@@ -387,7 +526,9 @@ spufs_regs_write(struct file *file, cons
return -EFBIG;
*pos += size;
@@ -47406,7 +47406,7 @@
ret = copy_from_user(lscsa->gprs + *pos - size,
buffer, size) ? -EFAULT : size;
-@@ -419,7 +560,9 @@
+@@ -419,7 +560,9 @@ spufs_fpcr_read(struct file *file, char
int ret;
struct spu_context *ctx = file->private_data;
@@ -47417,7 +47417,7 @@
ret = __spufs_fpcr_read(ctx, buffer, size, pos);
spu_release_saved(ctx);
return ret;
-@@ -436,10 +579,12 @@
+@@ -436,10 +579,12 @@ spufs_fpcr_write(struct file *file, cons
size = min_t(ssize_t, sizeof(lscsa->fpcr) - *pos, size);
if (size <= 0)
return -EFBIG;
@@ -47432,7 +47432,7 @@
ret = copy_from_user((char *)&lscsa->fpcr + *pos - size,
buffer, size) ? -EFAULT : size;
-@@ -486,7 +631,10 @@
+@@ -486,7 +631,10 @@ static ssize_t spufs_mbox_read(struct fi
udata = (void __user *)buf;
@@ -47444,7 +47444,7 @@
for (count = 0; (count + 4) <= len; count += 4, udata++) {
int ret;
ret = ctx->ops->mbox_read(ctx, &mbox_data);
-@@ -522,12 +670,15 @@
+@@ -522,12 +670,15 @@ static ssize_t spufs_mbox_stat_read(stru
size_t len, loff_t *pos)
{
struct spu_context *ctx = file->private_data;
@@ -47461,7 +47461,7 @@
mbox_stat = ctx->ops->mbox_stat_read(ctx) & 0xff;
-@@ -562,6 +713,9 @@
+@@ -562,6 +713,9 @@ void spufs_ibox_callback(struct spu *spu
{
struct spu_context *ctx = spu->ctx;
@@ -47471,7 +47471,7 @@
wake_up_all(&ctx->ibox_wq);
kill_fasync(&ctx->ibox_fasync, SIGIO, POLLIN);
}
-@@ -593,7 +747,9 @@
+@@ -593,7 +747,9 @@ static ssize_t spufs_ibox_read(struct fi
udata = (void __user *)buf;
@@ -47482,7 +47482,7 @@
/* wait only for the first element */
count = 0;
-@@ -639,7 +795,11 @@
+@@ -639,7 +795,11 @@ static unsigned int spufs_ibox_poll(stru
poll_wait(file, &ctx->ibox_wq, wait);
@@ -47495,7 +47495,7 @@
mask = ctx->ops->mbox_stat_poll(ctx, POLLIN | POLLRDNORM);
spu_release(ctx);
-@@ -657,12 +817,15 @@
+@@ -657,12 +817,15 @@ static ssize_t spufs_ibox_stat_read(stru
size_t len, loff_t *pos)
{
struct spu_context *ctx = file->private_data;
@@ -47512,7 +47512,7 @@
ibox_stat = (ctx->ops->mbox_stat_read(ctx) >> 16) & 0xff;
spu_release(ctx);
-@@ -698,6 +861,9 @@
+@@ -698,6 +861,9 @@ void spufs_wbox_callback(struct spu *spu
{
struct spu_context *ctx = spu->ctx;
@@ -47522,7 +47522,7 @@
wake_up_all(&ctx->wbox_wq);
kill_fasync(&ctx->wbox_fasync, SIGIO, POLLOUT);
}
-@@ -731,7 +897,9 @@
+@@ -731,7 +897,9 @@ static ssize_t spufs_wbox_write(struct f
if (__get_user(wbox_data, udata))
return -EFAULT;
@@ -47533,7 +47533,7 @@
/*
* make sure we can at least write one element, by waiting
-@@ -772,7 +940,11 @@
+@@ -772,7 +940,11 @@ static unsigned int spufs_wbox_poll(stru
poll_wait(file, &ctx->wbox_wq, wait);
@@ -47546,7 +47546,7 @@
mask = ctx->ops->mbox_stat_poll(ctx, POLLOUT | POLLWRNORM);
spu_release(ctx);
-@@ -790,12 +962,15 @@
+@@ -790,12 +962,15 @@ static ssize_t spufs_wbox_stat_read(stru
size_t len, loff_t *pos)
{
struct spu_context *ctx = file->private_data;
@@ -47563,7 +47563,7 @@
wbox_stat = (ctx->ops->mbox_stat_read(ctx) >> 8) & 0xff;
spu_release(ctx);
-@@ -866,7 +1041,9 @@
+@@ -866,7 +1041,9 @@ static ssize_t spufs_signal1_read(struct
int ret;
struct spu_context *ctx = file->private_data;
@@ -47574,7 +47574,7 @@
ret = __spufs_signal1_read(ctx, buf, len, pos);
spu_release_saved(ctx);
-@@ -877,6 +1054,7 @@
+@@ -877,6 +1054,7 @@ static ssize_t spufs_signal1_write(struc
size_t len, loff_t *pos)
{
struct spu_context *ctx;
@@ -47582,7 +47582,7 @@
u32 data;
ctx = file->private_data;
-@@ -887,7 +1065,9 @@
+@@ -887,7 +1065,9 @@ static ssize_t spufs_signal1_write(struc
if (copy_from_user(&data, buf, 4))
return -EFAULT;
@@ -47593,7 +47593,7 @@
ctx->ops->signal1_write(ctx, data);
spu_release(ctx);
-@@ -997,7 +1177,9 @@
+@@ -997,7 +1177,9 @@ static ssize_t spufs_signal2_read(struct
struct spu_context *ctx = file->private_data;
int ret;
@@ -47604,7 +47604,7 @@
ret = __spufs_signal2_read(ctx, buf, len, pos);
spu_release_saved(ctx);
-@@ -1008,6 +1190,7 @@
+@@ -1008,6 +1190,7 @@ static ssize_t spufs_signal2_write(struc
size_t len, loff_t *pos)
{
struct spu_context *ctx;
@@ -47612,7 +47612,7 @@
u32 data;
ctx = file->private_data;
-@@ -1018,7 +1201,9 @@
+@@ -1018,7 +1201,9 @@ static ssize_t spufs_signal2_write(struc
if (copy_from_user(&data, buf, 4))
return -EFAULT;
@@ -47623,7 +47623,7 @@
ctx->ops->signal2_write(ctx, data);
spu_release(ctx);
-@@ -1086,33 +1271,42 @@
+@@ -1086,33 +1271,42 @@ static const struct file_operations spuf
#define SPU_ATTR_ACQUIRE_SAVED 2
#define DEFINE_SPUFS_ATTRIBUTE(__name, __get, __set, __fmt, __acquire) \
@@ -47677,7 +47677,7 @@
}
static u64 spufs_signal1_type_get(struct spu_context *ctx)
-@@ -1123,13 +1317,18 @@
+@@ -1123,13 +1317,18 @@ DEFINE_SPUFS_ATTRIBUTE(spufs_signal1_typ
spufs_signal1_type_set, "%llu", SPU_ATTR_ACQUIRE);
@@ -47698,7 +47698,7 @@
}
static u64 spufs_signal2_type_get(struct spu_context *ctx)
-@@ -1329,6 +1528,9 @@
+@@ -1329,6 +1528,9 @@ void spufs_mfc_callback(struct spu *spu)
{
struct spu_context *ctx = spu->ctx;
@@ -47708,7 +47708,7 @@
wake_up_all(&ctx->mfc_wq);
pr_debug("%s %s\n", __FUNCTION__, spu->name);
-@@ -1375,12 +1577,17 @@
+@@ -1375,12 +1577,17 @@ static ssize_t spufs_mfc_read(struct fil
if (size != 4)
goto out;
@@ -47727,7 +47727,7 @@
ctx->tagwait &= ~status;
} else {
ret = spufs_wait(ctx->mfc_wq,
-@@ -1505,7 +1712,11 @@
+@@ -1505,7 +1712,11 @@ static ssize_t spufs_mfc_write(struct fi
if (ret)
goto out;
@@ -47740,7 +47740,7 @@
if (ret)
goto out;
-@@ -1539,7 +1750,11 @@
+@@ -1539,7 +1750,11 @@ static unsigned int spufs_mfc_poll(struc
poll_wait(file, &ctx->mfc_wq, wait);
@@ -47753,7 +47753,7 @@
ctx->ops->set_mfc_query(ctx, ctx->tagwait, 2);
free_elements = ctx->ops->get_mfc_free_elements(ctx);
tagstatus = ctx->ops->read_mfc_tagstatus(ctx);
-@@ -1562,7 +1777,9 @@
+@@ -1562,7 +1777,9 @@ static int spufs_mfc_flush(struct file *
struct spu_context *ctx = file->private_data;
int ret;
@@ -47764,7 +47764,7 @@
#if 0
/* this currently hangs */
ret = spufs_wait(ctx->mfc_wq,
-@@ -1605,12 +1822,18 @@
+@@ -1605,12 +1822,18 @@ static const struct file_operations spuf
.mmap = spufs_mfc_mmap,
};
@@ -47785,7 +47785,7 @@
}
static u64 spufs_npc_get(struct spu_context *ctx)
-@@ -1620,13 +1843,19 @@
+@@ -1620,13 +1843,19 @@ static u64 spufs_npc_get(struct spu_cont
DEFINE_SPUFS_ATTRIBUTE(spufs_npc_ops, spufs_npc_get, spufs_npc_set,
"0x%llx\n", SPU_ATTR_ACQUIRE);
@@ -47807,7 +47807,7 @@
}
static u64 spufs_decr_get(struct spu_context *ctx)
-@@ -1637,15 +1866,21 @@
+@@ -1637,15 +1866,21 @@ static u64 spufs_decr_get(struct spu_con
DEFINE_SPUFS_ATTRIBUTE(spufs_decr_ops, spufs_decr_get, spufs_decr_set,
"0x%llx\n", SPU_ATTR_ACQUIRE_SAVED);
@@ -47831,7 +47831,7 @@
}
static u64 spufs_decr_status_get(struct spu_context *ctx)
-@@ -1659,13 +1894,19 @@
+@@ -1659,13 +1894,19 @@ DEFINE_SPUFS_ATTRIBUTE(spufs_decr_status
spufs_decr_status_set, "0x%llx\n",
SPU_ATTR_ACQUIRE_SAVED);
@@ -47853,7 +47853,7 @@
}
static u64 spufs_event_mask_get(struct spu_context *ctx)
-@@ -1690,13 +1931,19 @@
+@@ -1690,13 +1931,19 @@ static u64 spufs_event_status_get(struct
DEFINE_SPUFS_ATTRIBUTE(spufs_event_status_ops, spufs_event_status_get,
NULL, "0x%llx\n", SPU_ATTR_ACQUIRE_SAVED)
@@ -47875,7 +47875,7 @@
}
static u64 spufs_srr0_get(struct spu_context *ctx)
-@@ -1727,10 +1974,12 @@
+@@ -1727,10 +1974,12 @@ static u64 spufs_object_id_get(struct sp
return ctx->object_id;
}
@@ -47889,7 +47889,7 @@
}
DEFINE_SPUFS_ATTRIBUTE(spufs_object_id_ops, spufs_object_id_get,
-@@ -1777,13 +2026,13 @@
+@@ -1777,13 +2026,13 @@ static const struct file_operations spuf
static ssize_t __spufs_mbox_info_read(struct spu_context *ctx,
char __user *buf, size_t len, loff_t *pos)
{
@@ -47908,7 +47908,7 @@
return simple_read_from_buffer(buf, len, pos, &data, sizeof data);
}
-@@ -1797,7 +2046,9 @@
+@@ -1797,7 +2046,9 @@ static ssize_t spufs_mbox_info_read(stru
if (!access_ok(VERIFY_WRITE, buf, len))
return -EFAULT;
@@ -47919,7 +47919,7 @@
spin_lock(&ctx->csa.register_lock);
ret = __spufs_mbox_info_read(ctx, buf, len, pos);
spin_unlock(&ctx->csa.register_lock);
-@@ -1815,13 +2066,13 @@
+@@ -1815,13 +2066,13 @@ static const struct file_operations spuf
static ssize_t __spufs_ibox_info_read(struct spu_context *ctx,
char __user *buf, size_t len, loff_t *pos)
{
@@ -47938,7 +47938,7 @@
return simple_read_from_buffer(buf, len, pos, &data, sizeof data);
}
-@@ -1835,7 +2086,9 @@
+@@ -1835,7 +2086,9 @@ static ssize_t spufs_ibox_info_read(stru
if (!access_ok(VERIFY_WRITE, buf, len))
return -EFAULT;
@@ -47949,7 +47949,7 @@
spin_lock(&ctx->csa.register_lock);
ret = __spufs_ibox_info_read(ctx, buf, len, pos);
spin_unlock(&ctx->csa.register_lock);
-@@ -1876,7 +2129,9 @@
+@@ -1876,7 +2129,9 @@ static ssize_t spufs_wbox_info_read(stru
if (!access_ok(VERIFY_WRITE, buf, len))
return -EFAULT;
@@ -47960,7 +47960,7 @@
spin_lock(&ctx->csa.register_lock);
ret = __spufs_wbox_info_read(ctx, buf, len, pos);
spin_unlock(&ctx->csa.register_lock);
-@@ -1926,7 +2181,9 @@
+@@ -1926,7 +2181,9 @@ static ssize_t spufs_dma_info_read(struc
if (!access_ok(VERIFY_WRITE, buf, len))
return -EFAULT;
@@ -47971,7 +47971,7 @@
spin_lock(&ctx->csa.register_lock);
ret = __spufs_dma_info_read(ctx, buf, len, pos);
spin_unlock(&ctx->csa.register_lock);
-@@ -1977,7 +2234,9 @@
+@@ -1977,7 +2234,9 @@ static ssize_t spufs_proxydma_info_read(
struct spu_context *ctx = file->private_data;
int ret;
@@ -47982,7 +47982,7 @@
spin_lock(&ctx->csa.register_lock);
ret = __spufs_proxydma_info_read(ctx, buf, len, pos);
spin_unlock(&ctx->csa.register_lock);
-@@ -2066,8 +2325,12 @@
+@@ -2066,8 +2325,12 @@ static unsigned long long spufs_class2_i
static int spufs_show_stat(struct seq_file *s, void *private)
{
struct spu_context *ctx = s->private;
@@ -47998,7 +47998,7 @@
ctx_state_names[ctx->stats.util_state],
--- a/arch/powerpc/platforms/cell/spufs/hw_ops.c
+++ b/arch/powerpc/platforms/cell/spufs/hw_ops.c
-@@ -76,16 +76,18 @@
+@@ -76,16 +76,18 @@ static unsigned int spu_hw_mbox_stat_pol
if (stat & 0xff0000)
ret |= POLLIN | POLLRDNORM;
else {
@@ -48021,7 +48021,7 @@
}
}
spin_unlock_irq(&spu->register_lock);
-@@ -106,7 +108,7 @@
+@@ -106,7 +108,7 @@ static int spu_hw_ibox_read(struct spu_c
ret = 4;
} else {
/* make sure we get woken up by the interrupt */
@@ -48030,7 +48030,7 @@
ret = 0;
}
spin_unlock_irq(&spu->register_lock);
-@@ -127,7 +129,7 @@
+@@ -127,7 +129,7 @@ static int spu_hw_wbox_write(struct spu_
} else {
/* make sure we get woken up by the interrupt when space
becomes available */
@@ -48039,7 +48039,7 @@
ret = 0;
}
spin_unlock_irq(&spu->register_lock);
-@@ -206,6 +208,11 @@
+@@ -206,6 +208,11 @@ static char *spu_hw_get_ls(struct spu_co
return ctx->spu->local_store;
}
@@ -48051,7 +48051,7 @@
static u32 spu_hw_runcntl_read(struct spu_context *ctx)
{
return in_be32(&ctx->spu->problem->spu_runcntl_RW);
-@@ -215,11 +222,21 @@
+@@ -215,11 +222,21 @@ static void spu_hw_runcntl_write(struct
{
spin_lock_irq(&ctx->spu->register_lock);
if (val & SPU_RUNCNTL_ISOLATE)
@@ -48074,7 +48074,7 @@
static void spu_hw_master_start(struct spu_context *ctx)
{
struct spu *spu = ctx->spu;
-@@ -319,8 +336,10 @@
+@@ -319,8 +336,10 @@ struct spu_context_ops spu_hw_ops = {
.npc_write = spu_hw_npc_write,
.status_read = spu_hw_status_read,
.get_ls = spu_hw_get_ls,
@@ -48096,7 +48096,7 @@
static int spu_alloc_lscsa_std(struct spu_state *csa)
{
struct spu_lscsa *lscsa;
-@@ -73,7 +75,7 @@
+@@ -73,7 +75,7 @@ int spu_alloc_lscsa(struct spu_state *cs
int i, j, n_4k;
/* Check availability of 64K pages */
@@ -48107,7 +48107,7 @@
csa->use_big_pages = 1;
--- a/arch/powerpc/platforms/cell/spufs/run.c
+++ b/arch/powerpc/platforms/cell/spufs/run.c
-@@ -15,24 +15,55 @@
+@@ -15,24 +15,55 @@ void spufs_stop_callback(struct spu *spu
{
struct spu_context *ctx = spu->ctx;
@@ -48174,7 +48174,7 @@
}
static int spu_setup_isolated(struct spu_context *ctx)
-@@ -128,34 +159,66 @@
+@@ -128,34 +159,66 @@ out:
static int spu_run_init(struct spu_context *ctx, u32 *npc)
{
@@ -48253,7 +48253,7 @@
return 0;
}
-@@ -165,6 +228,8 @@
+@@ -165,6 +228,8 @@ static int spu_run_fini(struct spu_conte
{
int ret = 0;
@@ -48262,7 +48262,7 @@
*status = ctx->ops->status_read(ctx);
*npc = ctx->ops->npc_read(ctx);
-@@ -177,26 +242,6 @@
+@@ -177,26 +242,6 @@ static int spu_run_fini(struct spu_conte
return ret;
}
@@ -48289,7 +48289,7 @@
/*
* SPU syscall restarting is tricky because we violate the basic
* assumption that the signal handler is running on the interrupted
-@@ -247,7 +292,7 @@
+@@ -247,7 +292,7 @@ static int spu_process_callback(struct s
u32 ls_pointer, npc;
void __iomem *ls;
long spu_ret;
@@ -48298,7 +48298,7 @@
/* get syscall block from local store */
npc = ctx->ops->npc_read(ctx) & ~3;
-@@ -269,9 +314,11 @@
+@@ -269,9 +314,11 @@ static int spu_process_callback(struct s
if (spu_ret <= -ERESTARTSYS) {
ret = spu_handle_restartsys(ctx, &spu_ret, &npc);
}
@@ -48311,7 +48311,7 @@
}
/* write result, jump over indirect pointer */
-@@ -281,18 +328,6 @@
+@@ -281,18 +328,6 @@ static int spu_process_callback(struct s
return ret;
}
@@ -48330,7 +48330,7 @@
long spufs_run_spu(struct spu_context *ctx, u32 *npc, u32 *event)
{
int ret;
-@@ -302,29 +337,14 @@
+@@ -302,29 +337,14 @@ long spufs_run_spu(struct spu_context *c
if (mutex_lock_interruptible(&ctx->run_mutex))
return -ERESTARTSYS;
@@ -48366,7 +48366,7 @@
ret = spu_run_init(ctx, npc);
if (ret) {
-@@ -358,14 +378,12 @@
+@@ -358,14 +378,12 @@ long spufs_run_spu(struct spu_context *c
if (ret)
break;
@@ -48386,7 +48386,7 @@
} while (!ret && !(status & (SPU_STATUS_STOPPED_BY_STOP |
SPU_STATUS_STOPPED_BY_HALT |
SPU_STATUS_SINGLE_STEP)));
-@@ -376,11 +394,10 @@
+@@ -376,11 +394,10 @@ long spufs_run_spu(struct spu_context *c
ctx->stats.libassist++;
@@ -48399,7 +48399,7 @@
if ((ret == 0) ||
((ret == -ERESTARTSYS) &&
((status & SPU_STATUS_STOPPED_BY_HALT) ||
-@@ -401,6 +418,7 @@
+@@ -401,6 +418,7 @@ out2:
out:
*event = ctx->event_return;
@@ -48409,7 +48409,7 @@
}
--- a/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
-@@ -58,6 +58,7 @@
+@@ -58,6 +58,7 @@ static unsigned long spu_avenrun[3];
static struct spu_prio_array *spu_prio;
static struct task_struct *spusched_task;
static struct timer_list spusched_timer;
@@ -48417,7 +48417,7 @@
/*
* Priority of a normal, non-rt, non-niced'd process (aka nice level 0).
-@@ -105,15 +106,21 @@
+@@ -105,15 +106,21 @@ void spu_set_timeslice(struct spu_contex
void __spu_update_sched_info(struct spu_context *ctx)
{
/*
@@ -48443,7 +48443,7 @@
* contains junk for threads with a realtime scheduling
* policy so we have to look at ->prio in this case.
*/
-@@ -124,23 +131,32 @@
+@@ -124,23 +131,32 @@ void __spu_update_sched_info(struct spu_
ctx->policy = current->policy;
/*
@@ -48486,7 +48486,7 @@
}
static int __node_allowed(struct spu_context *ctx, int node)
-@@ -174,7 +190,7 @@
+@@ -174,7 +190,7 @@ void do_notify_spus_active(void)
* Wake up the active spu_contexts.
*
* When the awakened processes see their "notify_active" flag is set,
@@ -48495,7 +48495,7 @@
*/
for_each_online_node(node) {
struct spu *spu;
-@@ -221,7 +237,6 @@
+@@ -221,7 +237,6 @@ static void spu_bind_context(struct spu
spu->wbox_callback = spufs_wbox_callback;
spu->stop_callback = spufs_stop_callback;
spu->mfc_callback = spufs_mfc_callback;
@@ -48503,7 +48503,7 @@
mb();
spu_unmap_mappings(ctx);
spu_restore(&ctx->csa, spu);
-@@ -409,7 +424,6 @@
+@@ -409,7 +424,6 @@ static void spu_unbind_context(struct sp
spu->wbox_callback = NULL;
spu->stop_callback = NULL;
spu->mfc_callback = NULL;
@@ -48511,7 +48511,7 @@
spu_associate_mm(spu, NULL);
spu->pid = 0;
spu->tgid = 0;
-@@ -454,6 +468,13 @@
+@@ -454,6 +468,13 @@ static void __spu_add_to_rq(struct spu_c
}
}
@@ -48525,7 +48525,7 @@
static void __spu_del_from_rq(struct spu_context *ctx)
{
int prio = ctx->prio;
-@@ -468,10 +489,24 @@
+@@ -468,10 +489,24 @@ static void __spu_del_from_rq(struct spu
}
}
@@ -48550,7 +48550,7 @@
spin_lock(&spu_prio->runq_lock);
prepare_to_wait_exclusive(&ctx->stop_wq, &wait, TASK_INTERRUPTIBLE);
if (!signal_pending(current)) {
-@@ -555,7 +590,7 @@
+@@ -555,7 +590,7 @@ static struct spu *find_victim(struct sp
/*
* Look for a possible preemption candidate on the local node first.
* If there is no candidate look at the other nodes. This isn't
@@ -48559,7 +48559,7 @@
* a strong node affinity. We might want to fine-tune this in
* the future.
*/
-@@ -571,6 +606,7 @@
+@@ -571,6 +606,7 @@ static struct spu *find_victim(struct sp
struct spu_context *tmp = spu->ctx;
if (tmp && tmp->prio > ctx->prio &&
@@ -48567,7 +48567,7 @@
(!victim || tmp->prio > victim->prio))
victim = spu->ctx;
}
-@@ -582,6 +618,10 @@
+@@ -582,6 +618,10 @@ static struct spu *find_victim(struct sp
* higher priority contexts before lower priority
* ones, so this is safe until we introduce
* priority inheritance schemes.
@@ -48578,7 +48578,7 @@
*/
if (!mutex_trylock(&victim->state_mutex)) {
victim = NULL;
-@@ -589,10 +629,10 @@
+@@ -589,10 +629,10 @@ static struct spu *find_victim(struct sp
}
spu = victim->spu;
@@ -48591,7 +48591,7 @@
* restart the search.
*/
mutex_unlock(&victim->state_mutex);
-@@ -607,13 +647,10 @@
+@@ -607,13 +647,10 @@ static struct spu *find_victim(struct sp
victim->stats.invol_ctx_switch++;
spu->stats.invol_ctx_switch++;
@@ -48608,7 +48608,7 @@
return spu;
}
}
-@@ -621,6 +658,50 @@
+@@ -621,6 +658,50 @@ static struct spu *find_victim(struct sp
return NULL;
}
@@ -48659,7 +48659,7 @@
/**
* spu_activate - find a free spu for a context and execute it
* @ctx: spu context to schedule
-@@ -632,39 +713,47 @@
+@@ -632,39 +713,47 @@ static struct spu *find_victim(struct sp
*/
int spu_activate(struct spu_context *ctx, unsigned long flags)
{
@@ -48734,7 +48734,7 @@
}
/**
-@@ -706,21 +795,19 @@
+@@ -706,21 +795,19 @@ static int __spu_deactivate(struct spu_c
if (spu) {
new = grab_runnable_context(max_prio, spu->node);
if (new || force) {
@@ -48768,7 +48768,7 @@
}
return new != NULL;
-@@ -757,43 +844,38 @@
+@@ -757,43 +844,38 @@ void spu_yield(struct spu_context *ctx)
static noinline void spusched_tick(struct spu_context *ctx)
{
@@ -48836,7 +48836,7 @@
}
/**
-@@ -817,35 +899,31 @@
+@@ -817,35 +899,31 @@ static unsigned long count_active_contex
}
/**
@@ -48884,7 +48884,7 @@
}
static int spusched_thread(void *unused)
-@@ -857,17 +935,58 @@
+@@ -857,17 +935,58 @@ static int spusched_thread(void *unused)
set_current_state(TASK_INTERRUPTIBLE);
schedule();
for (node = 0; node < MAX_NUMNODES; node++) {
@@ -48948,7 +48948,7 @@
#define LOAD_INT(x) ((x) >> FSHIFT)
#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
-@@ -881,7 +1000,7 @@
+@@ -881,7 +1000,7 @@ static int show_spu_loadavg(struct seq_f
/*
* Note that last_pid doesn't really make much sense for the
@@ -48957,7 +48957,7 @@
* but we include it here to have a 100% compatible interface.
*/
seq_printf(s, "%d.%02d %d.%02d %d.%02d %ld/%d %d\n",
-@@ -922,6 +1041,7 @@
+@@ -922,6 +1041,7 @@ int __init spu_sched_init(void)
spin_lock_init(&spu_prio->runq_lock);
setup_timer(&spusched_timer, spusched_wake, 0);
@@ -48965,7 +48965,7 @@
spusched_task = kthread_run(spusched_thread, NULL, "spusched");
if (IS_ERR(spusched_task)) {
-@@ -929,6 +1049,8 @@
+@@ -929,6 +1049,8 @@ int __init spu_sched_init(void)
goto out_free_spu_prio;
}
@@ -48974,7 +48974,7 @@
entry = create_proc_entry("spu_loadavg", 0, NULL);
if (!entry)
goto out_stop_kthread;
-@@ -954,6 +1076,7 @@
+@@ -954,6 +1076,7 @@ void spu_sched_exit(void)
remove_proc_entry("spu_loadavg", NULL);
del_timer_sync(&spusched_timer);
@@ -48984,7 +48984,7 @@
for (node = 0; node < MAX_NUMNODES; node++) {
--- a/arch/powerpc/platforms/cell/spufs/spufs.h
+++ b/arch/powerpc/platforms/cell/spufs/spufs.h
-@@ -71,6 +71,7 @@
+@@ -71,6 +71,7 @@ struct spu_context {
wait_queue_head_t wbox_wq;
wait_queue_head_t stop_wq;
wait_queue_head_t mfc_wq;
@@ -48992,7 +48992,7 @@
struct fasync_struct *ibox_fasync;
struct fasync_struct *wbox_fasync;
struct fasync_struct *mfc_fasync;
-@@ -168,8 +169,10 @@
+@@ -168,8 +169,10 @@ struct spu_context_ops {
void (*npc_write) (struct spu_context * ctx, u32 data);
u32(*status_read) (struct spu_context * ctx);
char*(*get_ls) (struct spu_context * ctx);
@@ -49003,7 +49003,7 @@
void (*master_start) (struct spu_context * ctx);
void (*master_stop) (struct spu_context * ctx);
int (*set_mfc_query)(struct spu_context * ctx, u32 mask, u32 mode);
-@@ -219,15 +222,16 @@
+@@ -219,15 +222,16 @@ void spu_gang_add_ctx(struct spu_gang *g
/* fault handling */
int spufs_handle_class1(struct spu_context *ctx);
@@ -49022,7 +49022,7 @@
}
static inline void spu_release(struct spu_context *ctx)
-@@ -242,10 +246,11 @@
+@@ -242,10 +246,11 @@ int put_spu_context(struct spu_context *
void spu_unmap_mappings(struct spu_context *ctx);
void spu_forget(struct spu_context *ctx);
@@ -49036,7 +49036,7 @@
int spu_activate(struct spu_context *ctx, unsigned long flags);
void spu_deactivate(struct spu_context *ctx);
void spu_yield(struct spu_context *ctx);
-@@ -279,7 +284,9 @@
+@@ -279,7 +284,9 @@ extern char *isolated_loader;
} \
spu_release(ctx); \
schedule(); \
@@ -49047,7 +49047,7 @@
} \
finish_wait(&(wq), &__wait); \
__ret; \
-@@ -306,41 +313,16 @@
+@@ -306,41 +313,16 @@ struct spufs_coredump_reader {
extern struct spufs_coredump_reader spufs_coredump_read[];
extern int spufs_coredump_num_notes;
@@ -49111,7 +49111,7 @@
#include "spu_save_dump.h"
#include "spu_restore_dump.h"
-@@ -691,35 +693,9 @@
+@@ -691,35 +693,9 @@ static inline void resume_mfc_queue(stru
out_be64(&priv2->mfc_control_RW, MFC_CNTL_RESUME_DMA_QUEUE);
}
@@ -49149,7 +49149,7 @@
/* Save, Step 47:
* Restore, Step 30.
* If MFC_SR1[R]=1, write 0 to SLB_Invalidate_All
-@@ -735,11 +711,7 @@
+@@ -735,11 +711,7 @@ static inline void setup_mfc_slbs(struct
* translation is desired by OS environment).
*/
spu_invalidate_slbs(spu);
@@ -49162,7 +49162,7 @@
}
static inline void set_switch_active(struct spu_state *csa, struct spu *spu)
-@@ -768,9 +740,9 @@
+@@ -768,9 +740,9 @@ static inline void enable_interrupts(str
* (translation) interrupts.
*/
spin_lock_irq(&spu->register_lock);
@@ -49175,7 +49175,7 @@
spu_int_mask_set(spu, 0, 0ul);
spu_int_mask_set(spu, 1, class1_mask);
spu_int_mask_set(spu, 2, 0ul);
-@@ -927,8 +899,8 @@
+@@ -927,8 +899,8 @@ static inline void wait_tag_complete(str
POLL_WHILE_FALSE(in_be32(&prob->dma_tagstatus_R) & mask);
local_irq_save(flags);
@@ -49186,7 +49186,7 @@
local_irq_restore(flags);
}
-@@ -946,8 +918,8 @@
+@@ -946,8 +918,8 @@ static inline void wait_spu_stopped(stru
POLL_WHILE_TRUE(in_be32(&prob->spu_status_R) & SPU_STATUS_RUNNING);
local_irq_save(flags);
@@ -49197,7 +49197,7 @@
local_irq_restore(flags);
}
-@@ -1423,9 +1395,9 @@
+@@ -1423,9 +1395,9 @@ static inline void clear_interrupts(stru
spu_int_mask_set(spu, 0, 0ul);
spu_int_mask_set(spu, 1, 0ul);
spu_int_mask_set(spu, 2, 0ul);
@@ -49210,7 +49210,7 @@
spin_unlock_irq(&spu->register_lock);
}
-@@ -1866,7 +1838,8 @@
+@@ -1866,7 +1838,8 @@ static void save_lscsa(struct spu_state
*/
resume_mfc_queue(prev, spu); /* Step 46. */
@@ -49220,7 +49220,7 @@
set_switch_active(prev, spu); /* Step 48. */
enable_interrupts(prev, spu); /* Step 49. */
save_ls_16kb(prev, spu); /* Step 50. */
-@@ -1971,7 +1944,8 @@
+@@ -1971,7 +1944,8 @@ static void restore_lscsa(struct spu_sta
setup_spu_status_part1(next, spu); /* Step 27. */
setup_spu_status_part2(next, spu); /* Step 28. */
restore_mfc_rag(next, spu); /* Step 29. */
@@ -49230,7 +49230,7 @@
set_spu_npc(next, spu); /* Step 31. */
set_signot1(next, spu); /* Step 32. */
set_signot2(next, spu); /* Step 33. */
-@@ -2103,10 +2077,6 @@
+@@ -2103,10 +2077,6 @@ int spu_save(struct spu_state *prev, str
int rc;
acquire_spu_lock(spu); /* Step 1. */
@@ -49241,7 +49241,7 @@
rc = __do_spu_save(prev, spu); /* Steps 2-53. */
release_spu_lock(spu);
if (rc != 0 && rc != 2 && rc != 6) {
-@@ -2133,9 +2103,6 @@
+@@ -2133,9 +2103,6 @@ int spu_restore(struct spu_state *new, s
acquire_spu_lock(spu);
harvest(NULL, spu);
spu->slb_replace = 0;
@@ -49251,7 +49251,7 @@
rc = __do_spu_restore(new, spu);
release_spu_lock(spu);
if (rc) {
-@@ -2215,10 +2182,8 @@
+@@ -2215,10 +2182,8 @@ int spu_init_csa(struct spu_state *csa)
return 0;
}
@@ -49264,7 +49264,7 @@
-EXPORT_SYMBOL_GPL(spu_fini_csa);
--- a/arch/powerpc/platforms/celleb/Kconfig
+++ b/arch/powerpc/platforms/celleb/Kconfig
-@@ -2,6 +2,8 @@
+@@ -2,6 +2,8 @@ config PPC_CELLEB
bool "Toshiba's Cell Reference Set 'Celleb' Architecture"
depends on PPC_MULTIPLATFORM && PPC64
select PPC_CELL
@@ -49283,7 +49283,7 @@
#include <linux/of_device.h>
#include <linux/irq.h>
-@@ -222,7 +223,7 @@
+@@ -222,7 +223,7 @@ void __init celleb_pci_add_one(struct pc
void (*dummy_read)(struct pci_controller *))
{
struct celleb_pci_bus *bus = &celleb_pci_busses[celleb_pci_count];
@@ -49292,7 +49292,7 @@
if (celleb_pci_count >= MAX_CELLEB_PCI_BUS) {
printk(KERN_ERR "Too many pci bridges, workarounds"
-@@ -256,13 +257,13 @@
+@@ -256,13 +257,13 @@ int __init celleb_pci_workaround_init(vo
celleb_dummy_page_va = kmalloc(PAGE_SIZE, GFP_KERNEL);
if (!celleb_dummy_page_va) {
@@ -49321,7 +49321,7 @@
#include "beat_wrapper.h"
-@@ -51,6 +52,8 @@
+@@ -51,6 +52,8 @@ static int __init find_dma_window(u64 *i
return 0;
}
@@ -49330,7 +49330,7 @@
static void __init celleb_init_direct_mapping(void)
{
u64 lpar_addr, io_addr;
-@@ -68,7 +71,18 @@
+@@ -68,7 +71,18 @@ static void __init celleb_init_direct_ma
ioid, DMA_FLAGS);
}
@@ -49350,7 +49350,7 @@
}
static int celleb_of_bus_notify(struct notifier_block *nb,
-@@ -80,7 +94,7 @@
+@@ -80,7 +94,7 @@ static int celleb_of_bus_notify(struct n
if (action != BUS_NOTIFY_ADD_DEVICE)
return 0;
@@ -49359,7 +49359,7 @@
return 0;
}
-@@ -91,14 +105,12 @@
+@@ -91,14 +105,12 @@ static struct notifier_block celleb_of_b
static int __init celleb_init_iommu(void)
{
@@ -49386,7 +49386,7 @@
#include <linux/of_device.h>
#include <asm/io.h>
-@@ -138,8 +139,6 @@
+@@ -138,8 +139,6 @@ static void celleb_config_read_fake(unsi
*val = celleb_fake_config_readl(p);
break;
}
@@ -49395,7 +49395,7 @@
}
static void celleb_config_write_fake(unsigned char *config, int where,
-@@ -158,7 +157,6 @@
+@@ -158,7 +157,6 @@ static void celleb_config_write_fake(uns
celleb_fake_config_writel(val, p);
break;
}
@@ -49403,7 +49403,7 @@
}
static int celleb_fake_pci_read_config(struct pci_bus *bus,
-@@ -351,6 +349,10 @@
+@@ -351,6 +349,10 @@ static int __init celleb_setup_fake_pci_
wi1 = of_get_property(node, "vendor-id", NULL);
wi2 = of_get_property(node, "class-code", NULL);
wi3 = of_get_property(node, "revision-id", NULL);
@@ -49414,7 +49414,7 @@
celleb_config_write_fake(*config, PCI_DEVICE_ID, 2, wi0[0] & 0xffff);
celleb_config_write_fake(*config, PCI_VENDOR_ID, 2, wi1[0] & 0xffff);
-@@ -372,6 +374,10 @@
+@@ -372,6 +374,10 @@ static int __init celleb_setup_fake_pci_
celleb_setup_pci_base_addrs(hose, devno, fn, num_base_addr);
li = of_get_property(node, "interrupts", &rlen);
@@ -49425,7 +49425,7 @@
val = li[0];
celleb_config_write_fake(*config, PCI_INTERRUPT_PIN, 1, 1);
celleb_config_write_fake(*config, PCI_INTERRUPT_LINE, 1, val);
-@@ -475,7 +481,7 @@
+@@ -475,7 +481,7 @@ static struct of_device_id celleb_phb_ma
int __init celleb_setup_phb(struct pci_controller *phb)
{
@@ -49436,7 +49436,7 @@
--- a/arch/powerpc/platforms/celleb/scc_epci.c
+++ b/arch/powerpc/platforms/celleb/scc_epci.c
-@@ -95,7 +95,7 @@
+@@ -95,7 +95,7 @@ void __init epci_workaround_init(struct
private->dummy_page_da = dma_map_single(hose->parent,
celleb_dummy_page_va, PAGE_SIZE, DMA_FROM_DEVICE);
if (private->dummy_page_da == DMA_ERROR_CODE) {
@@ -49447,7 +49447,7 @@
}
--- a/arch/powerpc/platforms/celleb/scc_uhc.c
+++ b/arch/powerpc/platforms/celleb/scc_uhc.c
-@@ -47,7 +47,8 @@
+@@ -47,7 +47,8 @@ static void enable_scc_uhc(struct pci_de
u32 val = 0;
int i;
@@ -49485,7 +49485,7 @@
static char celleb_machine_type[128] = "Celleb";
-@@ -88,61 +93,122 @@
+@@ -88,61 +93,122 @@ static void celleb_progress(char *s, uns
printk("*** %04x : %s\n", hex, s ? s : "");
}
@@ -49636,7 +49636,7 @@
.show_cpuinfo = celleb_show_cpuinfo,
.restart = beat_restart,
.power_off = beat_power_off,
-@@ -167,3 +233,26 @@
+@@ -167,3 +233,26 @@ define_machine(celleb) {
.machine_crash_shutdown = default_machine_crash_shutdown,
#endif
};
@@ -49665,7 +49665,7 @@
+};
--- a/arch/powerpc/platforms/chrp/pci.c
+++ b/arch/powerpc/platforms/chrp/pci.c
-@@ -198,7 +198,7 @@
+@@ -198,7 +198,7 @@ static void __init setup_peg2(struct pci
printk ("RTAS supporting Pegasos OF not found, please upgrade"
" your firmware\n");
}
@@ -49676,7 +49676,7 @@
--- a/arch/powerpc/platforms/chrp/setup.c
+++ b/arch/powerpc/platforms/chrp/setup.c
-@@ -115,7 +115,7 @@
+@@ -115,7 +115,7 @@ void chrp_show_cpuinfo(struct seq_file *
seq_printf(m, "machine\t\t: CHRP %s\n", model);
/* longtrail (goldengate) stuff */
@@ -49685,7 +49685,7 @@
/* VLSI VAS96011/12 `Golden Gate 2' */
/* Memory banks */
sdramen = (in_le32(gg2_pci_config_base + GG2_PCI_DRAM_CTRL)
-@@ -203,15 +203,20 @@
+@@ -203,15 +203,20 @@ static void __init sio_fixup_irq(const c
static void __init sio_init(void)
{
struct device_node *root;
@@ -49709,7 +49709,7 @@
of_node_put(root);
}
-@@ -251,6 +256,57 @@
+@@ -251,6 +256,57 @@ static void briq_restart(char *cmd)
for(;;);
}
@@ -49767,7 +49767,7 @@
void __init chrp_setup_arch(void)
{
struct device_node *root = of_find_node_by_path("/");
-@@ -594,6 +650,7 @@
+@@ -594,6 +650,7 @@ define_machine(chrp) {
.probe = chrp_probe,
.setup_arch = chrp_setup_arch,
.init = chrp_init2,
@@ -49777,7 +49777,7 @@
.restart = rtas_restart,
--- a/arch/powerpc/platforms/embedded6xx/Kconfig
+++ b/arch/powerpc/platforms/embedded6xx/Kconfig
-@@ -9,6 +9,8 @@
+@@ -9,6 +9,8 @@ config LINKSTATION
select FSL_SOC
select PPC_UDBG_16550 if SERIAL_8250
select DEFAULT_UIMAGE
@@ -49786,7 +49786,7 @@
help
Select LINKSTATION if configuring for one of PPC- (MPC8241)
based NAS systems from Buffalo Technology. So far only
-@@ -16,6 +18,19 @@
+@@ -16,6 +18,19 @@ config LINKSTATION
Linkstation-I HD-HLAN and HD-HGLAN versions, and PPC-based
Terastation systems should be supported too.
@@ -49806,7 +49806,7 @@
config MPC7448HPC2
bool "Freescale MPC7448HPC2(Taiga)"
depends on EMBEDDED6xx
-@@ -23,6 +38,7 @@
+@@ -23,6 +38,7 @@ config MPC7448HPC2
select DEFAULT_UIMAGE
select PPC_UDBG_16550
select WANT_DEVICE_TREE
@@ -49814,7 +49814,7 @@
help
Select MPC7448HPC2 if configuring for Freescale MPC7448HPC2 (Taiga)
platform
-@@ -33,6 +49,7 @@
+@@ -33,6 +49,7 @@ config PPC_HOLLY
select TSI108_BRIDGE
select PPC_UDBG_16550
select WANT_DEVICE_TREE
@@ -49822,7 +49822,7 @@
help
Select PPC_HOLLY if configuring for an IBM 750GX/CL Eval
Board with TSI108/9 bridge (Hickory/Holly)
-@@ -48,17 +65,13 @@
+@@ -48,17 +65,13 @@ config PPC_PRPMC2800
config TSI108_BRIDGE
bool
@@ -49840,7 +49840,7 @@
config MV64X60
bool
-@@ -67,8 +80,6 @@
+@@ -67,8 +80,6 @@ config MV64X60
config MPC10X_OPENPIC
bool
@@ -50090,7 +50090,7 @@
+};
--- a/arch/powerpc/platforms/iseries/Makefile
+++ b/arch/powerpc/platforms/iseries/Makefile
-@@ -5,7 +5,7 @@
+@@ -5,7 +5,7 @@ extra-y += dt.o
obj-y += exception.o
obj-y += hvlog.o hvlpconfig.o lpardata.o setup.o dt_mod.o mf.o lpevents.o \
hvcall.o proc.o htab.o iommu.o misc.o irq.o
@@ -50101,7 +50101,7 @@
obj-$(CONFIG_MODULES) += ksyms.o
--- a/arch/powerpc/platforms/iseries/iommu.c
+++ b/arch/powerpc/platforms/iseries/iommu.c
-@@ -163,8 +163,10 @@
+@@ -163,8 +163,10 @@ static struct iommu_table *iommu_table_f
(it->it_type == TCE_PCI) &&
(it->it_offset == tbl->it_offset) &&
(it->it_index == tbl->it_index) &&
@@ -50115,7 +50115,7 @@
}
--- a/arch/powerpc/platforms/iseries/lpevents.c
+++ b/arch/powerpc/platforms/iseries/lpevents.c
-@@ -239,7 +239,7 @@
+@@ -239,7 +239,7 @@ int HvLpEvent_unregisterHandler(HvLpEven
* other CPUs, and that the deleted handler isn't
* still running on another CPU when we return.
*/
@@ -50178,7 +50178,7 @@
/*
* Table defines
-@@ -62,6 +62,7 @@
+@@ -62,6 +62,7 @@ static struct pci_ops iSeries_pci_ops;
#define IOMM_TABLE_MAX_ENTRIES 1024
#define IOMM_TABLE_ENTRY_SIZE 0x0000000000400000UL
#define BASE_IO_MEMORY 0xE000000000000000UL
@@ -50186,7 +50186,7 @@
static unsigned long max_io_memory = BASE_IO_MEMORY;
static long current_iomm_table_entry;
-@@ -70,12 +71,237 @@
+@@ -70,12 +71,237 @@ static long current_iomm_table_entry;
* Lookup Tables.
*/
static struct device_node *iomm_table[IOMM_TABLE_MAX_ENTRIES];
@@ -50426,7 +50426,7 @@
* iomm_table_allocate_entry
*
* Adds pci_dev entry in address translation table
-@@ -87,7 +313,7 @@
+@@ -87,7 +313,7 @@ static DEFINE_SPINLOCK(iomm_table_lock);
* - CurrentIndex is incremented to keep track of the last entry.
* - Builds the resource entry for allocated BARs.
*/
@@ -50435,7 +50435,7 @@
{
struct resource *bar_res = &dev->resource[bar_num];
long bar_size = pci_resource_len(dev, bar_num);
-@@ -101,7 +327,6 @@
+@@ -101,7 +327,6 @@ static void iomm_table_allocate_entry(st
* Set Resource values.
*/
spin_lock(&iomm_table_lock);
@@ -50443,7 +50443,7 @@
bar_res->start = BASE_IO_MEMORY +
IOMM_TABLE_ENTRY_SIZE * current_iomm_table_entry;
bar_res->end = bar_res->start + bar_size - 1;
-@@ -110,7 +335,8 @@
+@@ -110,7 +335,8 @@ static void iomm_table_allocate_entry(st
*/
while (bar_size > 0 ) {
iomm_table[current_iomm_table_entry] = dev->sysdata;
@@ -50453,7 +50453,7 @@
bar_size -= IOMM_TABLE_ENTRY_SIZE;
++current_iomm_table_entry;
}
-@@ -130,7 +356,7 @@
+@@ -130,7 +356,7 @@ static void iomm_table_allocate_entry(st
* - Loops through The Bar resources(0 - 5) including the ROM
* is resource(6).
*/
@@ -50462,7 +50462,7 @@
{
int bar_num;
-@@ -145,79 +371,19 @@
+@@ -145,79 +371,19 @@ static void allocate_device_bars(struct
* PCI: Read Vendor Failed 0x18.58.10 Rc: 0x00xx
* PCI: Connect Bus Unit Failed 0x18.58.10 Rc: 0x00xx
*/
@@ -50547,7 +50547,7 @@
{
struct device_node *node;
-@@ -230,22 +396,66 @@
+@@ -230,22 +396,66 @@ static struct device_node *find_Device_N
return NULL;
}
@@ -50624,7 +50624,7 @@
/*
* Config space read and write functions.
-@@ -269,7 +479,7 @@
+@@ -269,7 +479,7 @@ static u64 hv_cfg_write_func[4] = {
static int iSeries_pci_read_config(struct pci_bus *bus, unsigned int devfn,
int offset, int size, u32 *val)
{
@@ -50633,7 +50633,7 @@
u64 fn;
struct HvCallPci_LoadReturn ret;
-@@ -299,7 +509,7 @@
+@@ -299,7 +509,7 @@ static int iSeries_pci_read_config(struc
static int iSeries_pci_write_config(struct pci_bus *bus, unsigned int devfn,
int offset, int size, u32 val)
{
@@ -50642,7 +50642,7 @@
u64 fn;
u64 ret;
-@@ -331,22 +541,22 @@
+@@ -331,22 +541,22 @@ static struct pci_ops iSeries_pci_ops =
* PCI: Device 23.90 ReadL Retry( 1)
* PCI: Device 23.90 ReadL Retry Successful(1)
*/
@@ -50670,7 +50670,7 @@
mf_display_src(0xB6000103);
panic_timeout = 0;
panic("PCI: Hardware I/O Error, SRC B6000103, "
-@@ -363,28 +573,39 @@
+@@ -363,28 +573,39 @@ static int CheckReturnCode(char *TextHdr
* the exposure of being device global.
*/
static inline struct device_node *xlate_iomm_address(
@@ -50728,7 +50728,7 @@
}
/*
-@@ -392,91 +613,58 @@
+@@ -392,91 +613,58 @@ static inline struct device_node *xlate_
* On MM I/O error, all ones are returned and iSeries_pci_IoError is cal
* else, data is returned in Big Endian format.
*/
@@ -50841,7 +50841,7 @@
return ret.value;
}
-@@ -485,134 +673,72 @@
+@@ -485,134 +673,72 @@ static u32 iSeries_Read_Long(const volat
* Write MM I/O Instructions for the iSeries
*
*/
@@ -51001,7 +51001,7 @@
}
static void iseries_readsb(const volatile void __iomem *addr, void *buf,
-@@ -620,7 +746,7 @@
+@@ -620,7 +746,7 @@ static void iseries_readsb(const volatil
{
u8 *dst = buf;
while(count-- > 0)
@@ -51010,7 +51010,7 @@
}
static void iseries_readsw(const volatile void __iomem *addr, void *buf,
-@@ -628,7 +754,7 @@
+@@ -628,7 +754,7 @@ static void iseries_readsw(const volatil
{
u16 *dst = buf;
while(count-- > 0)
@@ -51019,7 +51019,7 @@
}
static void iseries_readsl(const volatile void __iomem *addr, void *buf,
-@@ -636,7 +762,7 @@
+@@ -636,7 +762,7 @@ static void iseries_readsl(const volatil
{
u32 *dst = buf;
while(count-- > 0)
@@ -51028,7 +51028,7 @@
}
static void iseries_writesb(volatile void __iomem *addr, const void *buf,
-@@ -644,7 +770,7 @@
+@@ -644,7 +770,7 @@ static void iseries_writesb(volatile voi
{
const u8 *src = buf;
while(count-- > 0)
@@ -51037,7 +51037,7 @@
}
static void iseries_writesw(volatile void __iomem *addr, const void *buf,
-@@ -652,7 +778,7 @@
+@@ -652,7 +778,7 @@ static void iseries_writesw(volatile voi
{
const u16 *src = buf;
while(count-- > 0)
@@ -51046,7 +51046,7 @@
}
static void iseries_writesl(volatile void __iomem *addr, const void *buf,
-@@ -660,7 +786,7 @@
+@@ -660,7 +786,7 @@ static void iseries_writesl(volatile voi
{
const u32 *src = buf;
while(count-- > 0)
@@ -51055,7 +51055,7 @@
}
static void iseries_memset_io(volatile void __iomem *addr, int c,
-@@ -669,7 +795,7 @@
+@@ -669,7 +795,7 @@ static void iseries_memset_io(volatile v
volatile char __iomem *d = addr;
while (n-- > 0)
@@ -51064,7 +51064,7 @@
}
static void iseries_memcpy_fromio(void *dest, const volatile void __iomem *src,
-@@ -679,7 +805,7 @@
+@@ -679,7 +805,7 @@ static void iseries_memcpy_fromio(void *
const volatile char __iomem *s = src;
while (n-- > 0)
@@ -51073,7 +51073,7 @@
}
static void iseries_memcpy_toio(volatile void __iomem *dest, const void *src,
-@@ -689,7 +815,7 @@
+@@ -689,7 +815,7 @@ static void iseries_memcpy_toio(volatile
volatile char __iomem *d = dest;
while (n-- > 0)
@@ -51082,7 +51082,7 @@
}
/* We only set MMIO ops. The default PIO ops will be default
-@@ -742,6 +868,8 @@
+@@ -742,6 +868,8 @@ void __init iSeries_pcibios_init(void)
/* Install IO hooks */
ppc_pci_io = iseries_pci_io;
@@ -51091,7 +51091,7 @@
/* iSeries has no IO space in the common sense, it needs to set
* the IO base to 0
*/
-@@ -767,11 +895,21 @@
+@@ -767,11 +895,21 @@ void __init iSeries_pcibios_init(void)
phb = pcibios_alloc_controller(node);
if (phb == NULL)
continue;
@@ -51127,7 +51127,7 @@
/*
* Decodes Linux DevFn to iSeries DevFn, bridge device, or function.
* For Linux, see PCI_SLOT and PCI_FUNC in include/linux/pci.h
-@@ -47,17 +43,16 @@
+@@ -47,17 +43,16 @@ struct pci_dev; /* For Forward Refere
#define ISERIES_GET_DEVICE_FROM_SUBBUS(subbus) ((subbus >> 5) & 0x7)
#define ISERIES_GET_FUNCTION_FROM_SUBBUS(subbus) ((subbus >> 2) & 0x7)
@@ -51177,7 +51177,7 @@
struct MemoryBlock {
-@@ -112,13 +108,13 @@
+@@ -112,13 +108,13 @@ static unsigned long iSeries_process_Con
* correctly.
*/
mb_array[0].logicalStart = 0;
@@ -51194,7 +51194,7 @@
holeStart = addr_to_chunk(holeStart);
holeFirstChunk = holeStart;
holeSize = addr_to_chunk(holeSize);
-@@ -128,9 +124,9 @@
+@@ -128,9 +124,9 @@ static unsigned long iSeries_process_Con
mb_array[0].logicalEnd = holeFirstChunk;
mb_array[0].absEnd = holeFirstChunk;
mb_array[1].logicalStart = holeFirstChunk;
@@ -51206,7 +51206,7 @@
}
return numMemoryBlocks;
}
-@@ -234,9 +230,9 @@
+@@ -234,9 +230,9 @@ static unsigned long iSeries_process_Reg
mb_array[i].logicalEnd,
mb_array[i].absStart, mb_array[i].absEnd);
mb_array[i].absStart = addr_to_chunk(mb_array[i].absStart &
@@ -51218,7 +51218,7 @@
mb_array[i].logicalStart =
addr_to_chunk(mb_array[i].logicalStart);
mb_array[i].logicalEnd = addr_to_chunk(mb_array[i].logicalEnd);
-@@ -320,7 +316,7 @@
+@@ -320,7 +316,7 @@ struct mschunks_map mschunks_map = {
};
EXPORT_SYMBOL(mschunks_map);
@@ -51227,7 +51227,7 @@
{
klimit = _ALIGN(klimit, sizeof(u32));
mschunks_map.mapping = (u32 *)klimit;
-@@ -499,6 +495,8 @@
+@@ -499,6 +495,8 @@ static void __init iSeries_setup_arch(vo
itVpdAreas.xSlicMaxLogicalProcs);
printk("Max physical processors = %d\n",
itVpdAreas.xSlicMaxPhysicalProcs);
@@ -51236,7 +51236,7 @@
}
static void iSeries_show_cpuinfo(struct seq_file *m)
-@@ -641,24 +639,25 @@
+@@ -641,24 +639,25 @@ static int __init iseries_probe(void)
}
define_machine(iseries) {
@@ -51580,7 +51580,7 @@
select MPIC_U3_HT_IRQS
--- a/arch/powerpc/platforms/maple/pci.c
+++ b/arch/powerpc/platforms/maple/pci.c
-@@ -558,7 +558,7 @@
+@@ -558,7 +558,7 @@ void __init maple_pci_init(void)
* safe assumptions hopefully.
*/
if (u3_agp) {
@@ -51609,7 +51609,7 @@
#include <asm/rtas.h>
--- a/arch/powerpc/platforms/pasemi/Kconfig
+++ b/arch/powerpc/platforms/pasemi/Kconfig
-@@ -3,6 +3,7 @@
+@@ -3,6 +3,7 @@ config PPC_PASEMI
bool "PA Semi SoC-based platforms"
default n
select MPIC
@@ -51617,7 +51617,7 @@
select PPC_UDBG_16550
select PPC_NATIVE
select MPIC_BROKEN_REGREAD
-@@ -17,7 +18,7 @@
+@@ -17,7 +18,7 @@ config PPC_PASEMI_IOMMU
bool "PA Semi IOMMU support"
depends on PPC_PASEMI
help
@@ -51626,7 +51626,7 @@
config PPC_PASEMI_IOMMU_DMA_FORCE
bool "Force DMA engine to use IOMMU"
-@@ -36,13 +37,4 @@
+@@ -36,13 +37,4 @@ config PPC_PASEMI_MDIO
help
Driver for MDIO via GPIO on PWRficient platforms
@@ -51657,7 +51657,7 @@
#define SDCASR_REG 0x0100
#define SDCASR_REG_STRIDE 0x1000
-@@ -124,6 +125,11 @@
+@@ -124,6 +125,11 @@ static void set_astate(int cpu, unsigned
local_irq_restore(flags);
}
@@ -51669,7 +51669,7 @@
void restore_astate(int cpu)
{
set_astate(cpu, current_astate);
-@@ -147,7 +153,10 @@
+@@ -147,7 +153,10 @@ static int pas_cpufreq_cpu_init(struct c
if (!cpu)
goto out;
@@ -51681,7 +51681,7 @@
if (!dn)
goto out;
err = of_address_to_resource(dn, 0, &res);
-@@ -160,7 +169,10 @@
+@@ -160,7 +169,10 @@ static int pas_cpufreq_cpu_init(struct c
goto out;
}
@@ -51693,7 +51693,7 @@
if (!dn) {
err = -ENODEV;
goto out_unmap_sdcasr;
-@@ -292,7 +304,8 @@
+@@ -292,7 +304,8 @@ static struct cpufreq_driver pas_cpufreq
static int __init pas_cpufreq_init(void)
{
@@ -51813,7 +51813,7 @@
#define DELAY 1
-@@ -218,45 +218,27 @@
+@@ -218,45 +218,27 @@ static int __devinit gpio_mdio_probe(str
const struct of_device_id *match)
{
struct device *dev = &ofdev->dev;
@@ -51870,7 +51870,7 @@
prop = of_get_property(np, "reg", NULL);
new_bus->id = *prop;
-@@ -265,9 +247,24 @@
+@@ -265,9 +247,24 @@ static int __devinit gpio_mdio_probe(str
new_bus->phy_mask = 0;
new_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);
@@ -51897,7 +51897,7 @@
prop = of_get_property(np, "mdc-pin", NULL);
priv->mdc_pin = *prop;
-@@ -280,17 +277,21 @@
+@@ -280,17 +277,21 @@ static int __devinit gpio_mdio_probe(str
err = mdiobus_register(new_bus);
@@ -51923,7 +51923,7 @@
return err;
}
-@@ -317,6 +318,7 @@
+@@ -317,6 +318,7 @@ static struct of_device_id gpio_mdio_mat
},
{},
};
@@ -51931,7 +51931,7 @@
static struct of_platform_driver gpio_mdio_driver =
{
-@@ -330,12 +332,32 @@
+@@ -330,12 +332,32 @@ static struct of_platform_driver gpio_md
int gpio_mdio_init(void)
{
@@ -51967,7 +51967,7 @@
+MODULE_DESCRIPTION("Driver for MDIO over GPIO on PA Semi PWRficient-based boards");
--- a/arch/powerpc/platforms/pasemi/idle.c
+++ b/arch/powerpc/platforms/pasemi/idle.c
-@@ -74,9 +74,6 @@
+@@ -74,9 +74,6 @@ static int pasemi_system_reset_exception
static int __init pasemi_idle_init(void)
{
@@ -51977,7 +51977,7 @@
#ifndef CONFIG_PPC_PASEMI_CPUFREQ
printk(KERN_WARNING "No cpufreq driver, powersavings modes disabled\n");
current_mode = 0;
-@@ -88,7 +85,7 @@
+@@ -88,7 +85,7 @@ static int __init pasemi_idle_init(void)
return 0;
}
@@ -51988,7 +51988,7 @@
{
--- a/arch/powerpc/platforms/pasemi/pasemi.h
+++ b/arch/powerpc/platforms/pasemi/pasemi.h
-@@ -16,8 +16,14 @@
+@@ -16,8 +16,14 @@ extern void idle_doze(void);
/* Restore astate to last set */
#ifdef CONFIG_PPC_PASEMI_CPUFREQ
@@ -52005,7 +52005,7 @@
}
--- a/arch/powerpc/platforms/pasemi/powersave.S
+++ b/arch/powerpc/platforms/pasemi/powersave.S
-@@ -62,7 +62,16 @@
+@@ -62,7 +62,16 @@ sleep_common:
mflr r0
std r0, 16(r1)
stdu r1,-64(r1)
@@ -52022,7 +52022,7 @@
LOAD_REG_IMMEDIATE(r6,MSR_DR|MSR_IR|MSR_ME|MSR_EE)
mfmsr r4
andc r5,r4,r6
-@@ -73,7 +82,7 @@
+@@ -73,7 +82,7 @@ sleep_common:
mtmsrd r4,0
@@ -52061,7 +52061,7 @@
/* SDC reset register, must be pre-mapped at reset time */
static void __iomem *reset_reg;
-@@ -56,10 +61,14 @@
+@@ -56,10 +61,14 @@ struct mce_regs {
static struct mce_regs mce_regs[MAX_MCE_REGS];
static int num_mce_regs;
@@ -52076,7 +52076,7 @@
printk("Restarting...\n");
while (1)
out_le32(reset_reg, 0x6000000);
-@@ -126,9 +135,6 @@
+@@ -126,9 +135,6 @@ static int __init pas_setup_mce_regs(voi
struct pci_dev *dev;
int reg;
@@ -52086,7 +52086,7 @@
/* Remap various SoC status registers for use by the MCE handler */
reg = 0;
-@@ -172,7 +178,7 @@
+@@ -172,7 +178,7 @@ static int __init pas_setup_mce_regs(voi
return 0;
}
@@ -52095,7 +52095,7 @@
static __init void pas_init_IRQ(void)
{
-@@ -181,6 +187,8 @@
+@@ -181,6 +187,8 @@ static __init void pas_init_IRQ(void)
unsigned long openpic_addr;
const unsigned int *opprop;
int naddr, opplen;
@@ -52104,7 +52104,7 @@
struct mpic *mpic;
mpic_node = NULL;
-@@ -213,13 +221,26 @@
+@@ -213,13 +221,26 @@ static __init void pas_init_IRQ(void)
openpic_addr = of_read_number(opprop, naddr);
printk(KERN_DEBUG "OpenPIC addr: %lx\n", openpic_addr);
@@ -52133,7 +52133,7 @@
of_node_put(mpic_node);
of_node_put(root);
}
-@@ -239,6 +260,14 @@
+@@ -239,6 +260,14 @@ static int pas_machine_check_handler(str
srr0 = regs->nip;
srr1 = regs->msr;
@@ -52148,7 +52148,7 @@
dsisr = mfspr(SPRN_DSISR);
printk(KERN_ERR "Machine Check on CPU %d\n", cpu);
printk(KERN_ERR "SRR0 0x%016lx SRR1 0x%016lx\n", srr0, srr1);
-@@ -295,14 +324,14 @@
+@@ -295,14 +324,14 @@ static int pas_machine_check_handler(str
int i;
printk(KERN_ERR "slb contents:\n");
@@ -52165,7 +52165,7 @@
/* SRR1[62] is from MSR[62] if recoverable, so pass that back */
return !!(srr1 & 0x2);
}
-@@ -362,16 +391,17 @@
+@@ -362,16 +391,17 @@ static inline void pasemi_pcmcia_init(vo
static struct of_device_id pasemi_bus_ids[] = {
@@ -52186,7 +52186,7 @@
pasemi_pcmcia_init();
/* Publish OF platform devices for SDC and other non-PCI devices */
-@@ -379,7 +409,7 @@
+@@ -379,7 +409,7 @@ static int __init pasemi_publish_devices
return 0;
}
@@ -52195,7 +52195,7 @@
/*
-@@ -389,7 +419,8 @@
+@@ -389,7 +419,8 @@ static int __init pas_probe(void)
{
unsigned long root = of_get_flat_dt_root();
@@ -52205,7 +52205,7 @@
return 0;
hpte_init_native();
-@@ -400,7 +431,7 @@
+@@ -400,7 +431,7 @@ static int __init pas_probe(void)
}
define_machine(pasemi) {
@@ -52216,7 +52216,7 @@
.init_early = pas_init_early,
--- a/arch/powerpc/platforms/powermac/low_i2c.c
+++ b/arch/powerpc/platforms/powermac/low_i2c.c
-@@ -585,8 +585,7 @@
+@@ -585,8 +585,7 @@ static void __init kw_i2c_probe(void)
struct device_node *np, *child, *parent;
/* Probe keywest-i2c busses */
@@ -52226,7 +52226,7 @@
struct pmac_i2c_host_kw *host;
int multibus, chans, i;
-@@ -1462,9 +1461,6 @@
+@@ -1462,9 +1461,6 @@ int __init pmac_i2c_init(void)
return 0;
i2c_inited = 1;
@@ -52236,7 +52236,7 @@
/* Probe keywest-i2c busses */
kw_i2c_probe();
-@@ -1483,7 +1479,7 @@
+@@ -1483,7 +1479,7 @@ int __init pmac_i2c_init(void)
return 0;
}
@@ -52245,7 +52245,7 @@
/* Since pmac_i2c_init can be called too early for the platform device
* registration, we need to do it at a later time. In our case, subsys
-@@ -1515,4 +1511,4 @@
+@@ -1515,4 +1511,4 @@ static int __init pmac_i2c_create_platfo
return 0;
}
@@ -52262,7 +52262,7 @@
#else
static int has_second_ohare;
#endif /* CONFIG_PPC64 */
-@@ -314,12 +312,15 @@
+@@ -314,12 +312,15 @@ static int u3_ht_skip_device(struct pci_
/* We only allow config cycles to devices that are in OF device-tree
* as we are apparently having some weird things going on with some
@@ -52280,7 +52280,7 @@
for (dn = busdn->child; dn; dn = dn->sibling)
if (PCI_DN(dn) && PCI_DN(dn)->devfn == devfn)
break;
-@@ -344,14 +345,15 @@
+@@ -344,14 +345,15 @@ static int u3_ht_skip_device(struct pci_
+ (((unsigned int)bus) << 16) \
+ 0x01000000UL)
@@ -52302,7 +52302,7 @@
} else
return hose->cfg_data + U3_HT_CFA1(bus, devfn, offset);
}
-@@ -360,14 +362,15 @@
+@@ -360,14 +362,15 @@ static int u3_ht_read_config(struct pci_
int offset, int len, u32 *val)
{
struct pci_controller *hose;
@@ -52320,7 +52320,7 @@
if (!addr)
return PCIBIOS_DEVICE_NOT_FOUND;
-@@ -397,10 +400,10 @@
+@@ -397,10 +400,10 @@ static int u3_ht_read_config(struct pci_
*val = in_8(addr);
break;
case 2:
@@ -52333,7 +52333,7 @@
break;
}
return PCIBIOS_SUCCESSFUL;
-@@ -410,14 +413,15 @@
+@@ -410,14 +413,15 @@ static int u3_ht_write_config(struct pci
int offset, int len, u32 val)
{
struct pci_controller *hose;
@@ -52351,7 +52351,7 @@
if (!addr)
return PCIBIOS_DEVICE_NOT_FOUND;
-@@ -439,10 +443,10 @@
+@@ -439,10 +443,10 @@ static int u3_ht_write_config(struct pci
out_8(addr, val);
break;
case 2:
@@ -52364,7 +52364,7 @@
break;
}
return PCIBIOS_SUCCESSFUL;
-@@ -725,7 +729,7 @@
+@@ -725,7 +729,7 @@ static void __init setup_bandit(struct p
static int __init setup_uninorth(struct pci_controller *hose,
struct resource *addr)
{
@@ -52373,7 +52373,7 @@
has_uninorth = 1;
hose->ops = &macrisc_pci_ops;
hose->cfg_addr = ioremap(addr->start + 0x800000, 0x1000);
-@@ -773,31 +777,72 @@
+@@ -773,31 +777,72 @@ static void __init setup_u4_pcie(struct
*/
hose->first_busno = 0x00;
hose->last_busno = 0xff;
@@ -52461,7 +52461,7 @@
*/
hose->io_base_phys = 0xf4000000;
hose->pci_io_size = 0x00400000;
-@@ -808,76 +853,33 @@
+@@ -808,76 +853,33 @@ static void __init setup_u3_ht(struct pc
hose->pci_mem_offset = 0;
hose->first_busno = 0;
hose->last_busno = 0xef;
@@ -52563,7 +52563,7 @@
}
#endif /* CONFIG_PPC64 */
-@@ -994,6 +996,8 @@
+@@ -994,6 +996,8 @@ void __init pmac_pci_init(void)
struct device_node *np, *root;
struct device_node *ht = NULL;
@@ -52572,7 +52572,7 @@
root = of_find_node_by_path("/");
if (root == NULL) {
printk(KERN_CRIT "pmac_pci_init: can't find root "
-@@ -1032,15 +1036,15 @@
+@@ -1032,15 +1036,15 @@ void __init pmac_pci_init(void)
* future though
*/
if (u3_agp) {
@@ -52591,7 +52591,7 @@
#else /* CONFIG_PPC64 */
init_p2pbridge();
-@@ -1051,13 +1055,13 @@
+@@ -1051,13 +1055,13 @@ void __init pmac_pci_init(void)
* some offset between bus number and domains for now when we
* assign all busses should help for now
*/
@@ -52608,7 +52608,7 @@
{
struct device_node* node;
int updatecfg = 0;
-@@ -1099,24 +1103,21 @@
+@@ -1099,24 +1103,21 @@ pmac_pci_enable_device_hook(struct pci_d
updatecfg = 1;
}
@@ -52640,7 +52640,7 @@
pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE,
L1_CACHE_BYTES >> 2);
}
-@@ -1124,6 +1125,18 @@
+@@ -1124,6 +1125,18 @@ pmac_pci_enable_device_hook(struct pci_d
return 0;
}
@@ -52659,7 +52659,7 @@
/* We power down some devices after they have been probed. They'll
* be powered back on later on
*/
-@@ -1171,7 +1184,6 @@
+@@ -1171,7 +1184,6 @@ void __init pmac_pcibios_after_init(void
of_node_put(nd);
}
@@ -52667,7 +52667,7 @@
void pmac_pci_fixup_cardbus(struct pci_dev* dev)
{
if (!machine_is(powermac))
-@@ -1259,7 +1271,7 @@
+@@ -1259,7 +1271,7 @@ void pmac_pci_fixup_pciata(struct pci_de
}
}
DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, pmac_pci_fixup_pciata);
@@ -52678,7 +52678,7 @@
* Disable second function on K2-SATA, it's broken
--- a/arch/powerpc/platforms/powermac/pfunc_base.c
+++ b/arch/powerpc/platforms/powermac/pfunc_base.c
-@@ -363,8 +363,7 @@
+@@ -363,8 +363,7 @@ int __init pmac_pfunc_base_install(void)
return 0;
}
@@ -52690,7 +52690,7 @@
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
-@@ -690,6 +690,5 @@
+@@ -690,6 +690,5 @@ static int __init init_pmacpic_sysfs(voi
sysdev_driver_register(&pmacpic_sysclass, &driver_pmacpic);
return 0;
}
@@ -52700,7 +52700,7 @@
--- a/arch/powerpc/platforms/powermac/pmac.h
+++ b/arch/powerpc/platforms/powermac/pmac.h
-@@ -26,7 +26,7 @@
+@@ -26,7 +26,7 @@ extern void pmac_pci_init(void);
extern void pmac_nvram_update(void);
extern unsigned char pmac_nvram_read_byte(int addr);
extern void pmac_nvram_write_byte(int addr, unsigned char val);
@@ -52729,7 +52729,7 @@
#include <asm/mmu_context.h>
#include <asm/iommu.h>
#include <asm/smu.h>
-@@ -94,7 +94,6 @@
+@@ -94,7 +94,6 @@ extern struct machdep_calls pmac_md;
#define DEFAULT_ROOT_DEVICE Root_SDA1 /* sda1 - slightly silly choice */
#ifdef CONFIG_PPC64
@@ -52737,7 +52737,7 @@
int sccdbg;
#endif
-@@ -398,17 +397,13 @@
+@@ -398,17 +397,13 @@ static int initializing = 1;
static int pmac_late_init(void)
{
@@ -52756,7 +52756,7 @@
/*
* This is __init_refok because we check for "initializing" before
-@@ -535,9 +530,6 @@
+@@ -535,9 +530,6 @@ static int __init pmac_declare_of_platfo
if (machine_is(chrp))
return -1;
@@ -52766,7 +52766,7 @@
np = of_find_node_by_name(NULL, "valkyrie");
if (np)
of_platform_device_create(np, "valkyrie", NULL);
-@@ -552,8 +544,7 @@
+@@ -552,8 +544,7 @@ static int __init pmac_declare_of_platfo
return 0;
}
@@ -52776,7 +52776,7 @@
/*
* Called very early, MMU is off, device-tree isn't unflattened
-@@ -613,9 +604,11 @@
+@@ -613,9 +604,11 @@ static int pmac_pci_probe_mode(struct pc
/* We need to use normal PCI probing for the AGP bus,
* since the device for the AGP bridge isn't in the tree.
@@ -52791,7 +52791,7 @@
}
--- a/arch/powerpc/platforms/powermac/time.c
+++ b/arch/powerpc/platforms/powermac/time.c
-@@ -84,12 +84,14 @@
+@@ -84,12 +84,14 @@ long __init pmac_time_init(void)
return delta;
}
@@ -52808,7 +52808,7 @@
{
--- a/arch/powerpc/platforms/ps3/Kconfig
+++ b/arch/powerpc/platforms/ps3/Kconfig
-@@ -61,17 +61,6 @@
+@@ -61,17 +61,6 @@ config PS3_DYNAMIC_DMA
This support is mainly for Linux kernel development. If unsure,
say N.
@@ -52826,7 +52826,7 @@
config PS3_VUART
depends on PPC_PS3
tristate
-@@ -138,4 +127,17 @@
+@@ -138,4 +127,17 @@ config PS3_FLASH
be disabled on the kernel command line using "ps3flash=off", to
not allocate this fixed buffer.
@@ -52944,7 +52944,7 @@
/**
* ps3_setup_gelic_device - Setup and register a gelic device instance.
*
-@@ -238,166 +322,6 @@
+@@ -238,166 +322,6 @@ static int __init ps3_setup_vuart_device
return result;
}
@@ -53111,7 +53111,7 @@
static int ps3_setup_storage_dev(const struct ps3_repository_device *repo,
enum ps3_match_id match_id)
{
-@@ -449,16 +373,6 @@
+@@ -449,16 +373,6 @@ static int ps3_setup_storage_dev(const s
goto fail_find_interrupt;
}
@@ -53128,7 +53128,7 @@
for (i = 0; i < num_regions; i++) {
unsigned int id;
u64 start, size;
-@@ -494,7 +408,6 @@
+@@ -494,7 +408,6 @@ static int ps3_setup_storage_dev(const s
fail_device_register:
fail_read_region:
@@ -53136,7 +53136,7 @@
fail_find_interrupt:
kfree(p);
fail_malloc:
-@@ -659,62 +572,268 @@
+@@ -659,62 +572,268 @@ static int ps3_register_repository_devic
return result;
}
@@ -53433,7 +53433,7 @@
* ps3_start_probe_thread - Starts the background probe thread.
*
*/
-@@ -723,7 +842,7 @@
+@@ -723,7 +842,7 @@ static int __init ps3_start_probe_thread
{
int result;
struct task_struct *task;
@@ -53442,7 +53442,7 @@
pr_debug(" -> %s:%d\n", __func__, __LINE__);
-@@ -746,7 +865,8 @@
+@@ -746,7 +865,8 @@ static int __init ps3_start_probe_thread
return -ENODEV;
}
@@ -53452,7 +53452,7 @@
if (IS_ERR(task)) {
result = PTR_ERR(task);
-@@ -755,6 +875,9 @@
+@@ -755,6 +875,9 @@ static int __init ps3_start_probe_thread
return result;
}
@@ -53462,7 +53462,7 @@
pr_debug(" <- %s:%d\n", __func__, __LINE__);
return 0;
}
-@@ -787,6 +910,8 @@
+@@ -787,6 +910,8 @@ static int __init ps3_register_devices(v
ps3_register_sound_devices();
@@ -53485,7 +53485,7 @@
#if defined(CONFIG_PS3_DYNAMIC_DMA)
USE_DYNAMIC_DMA = 1,
#else
-@@ -137,11 +132,8 @@
+@@ -137,11 +132,8 @@ static struct map map;
unsigned long ps3_mm_phys_to_lpar(unsigned long phys_addr)
{
BUG_ON(is_kernel_addr(phys_addr));
@@ -53499,7 +53499,7 @@
}
EXPORT_SYMBOL(ps3_mm_phys_to_lpar);
-@@ -309,7 +301,7 @@
+@@ -309,7 +301,7 @@ static int __init ps3_mm_add_memory(void
BUG_ON(!mem_init_done);
@@ -53508,7 +53508,7 @@
start_pfn = start_addr >> PAGE_SHIFT;
nr_pages = (map.r1.size + PAGE_SIZE - 1) >> PAGE_SHIFT;
-@@ -359,7 +351,7 @@
+@@ -359,7 +351,7 @@ static unsigned long dma_sb_lpar_to_bus(
static void __maybe_unused _dma_dump_region(const struct ps3_dma_region *r,
const char *func, int line)
{
@@ -53517,7 +53517,7 @@
r->dev->dev_id);
DBG("%s:%d: page_size %u\n", func, line, r->page_size);
DBG("%s:%d: bus_addr %lxh\n", func, line, r->bus_addr);
-@@ -394,7 +386,7 @@
+@@ -394,7 +386,7 @@ struct dma_chunk {
static void _dma_dump_chunk (const struct dma_chunk* c, const char* func,
int line)
{
@@ -53526,7 +53526,7 @@
c->region->dev->bus_id, c->region->dev->dev_id);
DBG("%s:%d: r.bus_addr %lxh\n", func, line, c->region->bus_addr);
DBG("%s:%d: r.page_size %u\n", func, line, c->region->page_size);
-@@ -658,7 +650,7 @@
+@@ -658,7 +650,7 @@ static int dma_sb_region_create(struct p
BUG_ON(!r);
if (!r->dev->bus_id) {
@@ -53535,7 +53535,7 @@
r->dev->bus_id, r->dev->dev_id);
return 0;
}
-@@ -724,7 +716,7 @@
+@@ -724,7 +716,7 @@ static int dma_sb_region_free(struct ps3
BUG_ON(!r);
if (!r->dev->bus_id) {
@@ -53544,7 +53544,7 @@
r->dev->bus_id, r->dev->dev_id);
return 0;
}
-@@ -1007,7 +999,7 @@
+@@ -1007,7 +999,7 @@ static int dma_sb_region_create_linear(s
if (r->offset + r->len > map.rm.size) {
/* Map (part of) 2nd RAM chunk */
@@ -53555,7 +53555,7 @@
virt_addr += r->offset - map.rm.size;
--- a/arch/powerpc/platforms/ps3/platform.h
+++ b/arch/powerpc/platforms/ps3/platform.h
-@@ -89,13 +89,11 @@
+@@ -89,13 +89,11 @@ enum ps3_dev_type {
PS3_DEV_TYPE_STOR_ROM = TYPE_ROM, /* 5 */
PS3_DEV_TYPE_SB_GPIO = 6,
PS3_DEV_TYPE_STOR_FLASH = TYPE_RBC, /* 14 */
@@ -53570,7 +53570,7 @@
int ps3_repository_read_bus_type(unsigned int bus_index,
enum ps3_bus_type *bus_type);
int ps3_repository_read_bus_num_dev(unsigned int bus_index,
-@@ -119,7 +117,7 @@
+@@ -119,7 +117,7 @@ enum ps3_reg_type {
int ps3_repository_read_dev_str(unsigned int bus_index,
unsigned int dev_index, const char *dev_str, u64 *value);
int ps3_repository_read_dev_id(unsigned int bus_index, unsigned int dev_index,
@@ -53579,7 +53579,7 @@
int ps3_repository_read_dev_type(unsigned int bus_index,
unsigned int dev_index, enum ps3_dev_type *dev_type);
int ps3_repository_read_dev_intr(unsigned int bus_index,
-@@ -138,21 +136,17 @@
+@@ -138,21 +136,17 @@ int ps3_repository_read_dev_reg(unsigned
/* repository bus enumerators */
struct ps3_repository_device {
@@ -53607,7 +53607,7 @@
int ps3_repository_find_devices(enum ps3_bus_type bus_type,
int (*callback)(const struct ps3_repository_device *repo));
int ps3_repository_find_bus(enum ps3_bus_type bus_type, unsigned int from,
-@@ -186,10 +180,10 @@
+@@ -186,10 +180,10 @@ int ps3_repository_read_stor_dev_region(
unsigned int dev_index, unsigned int region_index,
unsigned int *region_id, u64 *region_start, u64 *region_size);
@@ -53621,7 +53621,7 @@
int ps3_repository_read_rm_base(unsigned int ppe_id, u64 *rm_base);
int ps3_repository_read_rm_size(unsigned int ppe_id, u64 *rm_size);
int ps3_repository_read_region_total(u64 *region_total);
-@@ -200,9 +194,15 @@
+@@ -200,9 +194,15 @@ int ps3_repository_read_mm_info(u64 *rm_
int ps3_repository_read_num_be(unsigned int *num_be);
int ps3_repository_read_be_node_id(unsigned int be_index, u64 *node_id);
@@ -53639,7 +53639,7 @@
int ps3_repository_read_boot_dat_addr(u64 *lpar_addr);
--- a/arch/powerpc/platforms/ps3/repository.c
+++ b/arch/powerpc/platforms/ps3/repository.c
-@@ -33,7 +33,7 @@
+@@ -33,7 +33,7 @@ enum ps3_lpar_id {
};
#define dump_field(_a, _b) _dump_field(_a, _b, __func__, __LINE__)
@@ -53648,7 +53648,7 @@
{
#if defined(DEBUG)
char s[16];
-@@ -50,8 +50,8 @@
+@@ -50,8 +50,8 @@ static void _dump_field(const char *hdr,
#define dump_node_name(_a, _b, _c, _d, _e) \
_dump_node_name(_a, _b, _c, _d, _e, __func__, __LINE__)
@@ -53659,7 +53659,7 @@
{
pr_debug("%s:%d: lpar: %u\n", func, line, lpar_id);
_dump_field("n1: ", n1, func, line);
-@@ -63,7 +63,7 @@
+@@ -63,7 +63,7 @@ static void _dump_node_name (unsigned in
#define dump_node(_a, _b, _c, _d, _e, _f, _g) \
_dump_node(_a, _b, _c, _d, _e, _f, _g, __func__, __LINE__)
static void _dump_node(unsigned int lpar_id, u64 n1, u64 n2, u64 n3, u64 n4,
@@ -53668,7 +53668,7 @@
{
pr_debug("%s:%d: lpar: %u\n", func, line, lpar_id);
_dump_field("n1: ", n1, func, line);
-@@ -165,21 +165,18 @@
+@@ -165,21 +165,18 @@ int ps3_repository_read_bus_str(unsigned
make_first_field("bus", bus_index),
make_field(bus_str, 0),
0, 0,
@@ -53693,7 +53693,7 @@
return result;
}
-@@ -193,7 +190,7 @@
+@@ -193,7 +190,7 @@ int ps3_repository_read_bus_type(unsigne
make_first_field("bus", bus_index),
make_field("type", 0),
0, 0,
@@ -53702,7 +53702,7 @@
*bus_type = v1;
return result;
}
-@@ -208,7 +205,7 @@
+@@ -208,7 +205,7 @@ int ps3_repository_read_bus_num_dev(unsi
make_first_field("bus", bus_index),
make_field("num_dev", 0),
0, 0,
@@ -53711,7 +53711,7 @@
*num_dev = v1;
return result;
}
-@@ -221,22 +218,20 @@
+@@ -221,22 +218,20 @@ int ps3_repository_read_dev_str(unsigned
make_field("dev", dev_index),
make_field(dev_str, 0),
0,
@@ -53737,7 +53737,7 @@
return result;
}
-@@ -251,14 +246,14 @@
+@@ -251,14 +246,14 @@ int ps3_repository_read_dev_type(unsigne
make_field("dev", dev_index),
make_field("type", 0),
0,
@@ -53754,7 +53754,7 @@
{
int result;
u64 v1;
-@@ -287,7 +282,7 @@
+@@ -287,7 +282,7 @@ int ps3_repository_read_dev_reg_type(uns
make_field("dev", dev_index),
make_field("reg", reg_index),
make_field("type", 0),
@@ -53763,7 +53763,7 @@
*reg_type = v1;
return result;
}
-@@ -332,7 +327,7 @@
+@@ -332,7 +327,7 @@ int ps3_repository_find_device(struct ps
return result;
}
@@ -53772,7 +53772,7 @@
__func__, __LINE__, tmp.bus_type, tmp.bus_index, tmp.bus_id,
num_dev);
-@@ -349,47 +344,95 @@
+@@ -349,47 +344,95 @@ int ps3_repository_find_device(struct ps
return result;
}
@@ -53896,7 +53896,7 @@
*repo = tmp;
return 0;
}
-@@ -402,50 +445,34 @@
+@@ -402,50 +445,34 @@ int __devinit ps3_repository_find_device
pr_debug(" -> %s:%d: find bus_type %u\n", __func__, __LINE__, bus_type);
@@ -53969,7 +53969,7 @@
}
pr_debug(" <- %s:%d\n", __func__, __LINE__);
-@@ -561,7 +588,7 @@
+@@ -561,7 +588,7 @@ int ps3_repository_read_stor_dev_port(un
make_first_field("bus", bus_index),
make_field("dev", dev_index),
make_field("port", 0),
@@ -53978,7 +53978,7 @@
}
int ps3_repository_read_stor_dev_blk_size(unsigned int bus_index,
-@@ -571,7 +598,7 @@
+@@ -571,7 +598,7 @@ int ps3_repository_read_stor_dev_blk_siz
make_first_field("bus", bus_index),
make_field("dev", dev_index),
make_field("blk_size", 0),
@@ -53987,7 +53987,7 @@
}
int ps3_repository_read_stor_dev_num_blocks(unsigned int bus_index,
-@@ -581,7 +608,7 @@
+@@ -581,7 +608,7 @@ int ps3_repository_read_stor_dev_num_blo
make_first_field("bus", bus_index),
make_field("dev", dev_index),
make_field("n_blocks", 0),
@@ -53996,7 +53996,7 @@
}
int ps3_repository_read_stor_dev_num_regions(unsigned int bus_index,
-@@ -594,7 +621,7 @@
+@@ -594,7 +621,7 @@ int ps3_repository_read_stor_dev_num_reg
make_first_field("bus", bus_index),
make_field("dev", dev_index),
make_field("n_regs", 0),
@@ -54005,7 +54005,7 @@
*num_regions = v1;
return result;
}
-@@ -611,7 +638,7 @@
+@@ -611,7 +638,7 @@ int ps3_repository_read_stor_dev_region_
make_field("dev", dev_index),
make_field("region", region_index),
make_field("id", 0),
@@ -54014,7 +54014,7 @@
*region_id = v1;
return result;
}
-@@ -624,7 +651,7 @@
+@@ -624,7 +651,7 @@ int ps3_repository_read_stor_dev_region_
make_field("dev", dev_index),
make_field("region", region_index),
make_field("size", 0),
@@ -54023,7 +54023,7 @@
}
int ps3_repository_read_stor_dev_region_start(unsigned int bus_index,
-@@ -635,7 +662,7 @@
+@@ -635,7 +662,7 @@ int ps3_repository_read_stor_dev_region_
make_field("dev", dev_index),
make_field("region", region_index),
make_field("start", 0),
@@ -54032,7 +54032,7 @@
}
int ps3_repository_read_stor_dev_info(unsigned int bus_index,
-@@ -684,6 +711,35 @@
+@@ -684,6 +711,35 @@ int ps3_repository_read_stor_dev_region(
return result;
}
@@ -54068,7 +54068,7 @@
int ps3_repository_read_rm_size(unsigned int ppe_id, u64 *rm_size)
{
return read_node(PS3_LPAR_ID_CURRENT,
-@@ -691,7 +747,7 @@
+@@ -691,7 +747,7 @@ int ps3_repository_read_rm_size(unsigned
make_field("pu", 0),
ppe_id,
make_field("rm_size", 0),
@@ -54077,7 +54077,7 @@
}
int ps3_repository_read_region_total(u64 *region_total)
-@@ -700,7 +756,7 @@
+@@ -700,7 +756,7 @@ int ps3_repository_read_region_total(u64
make_first_field("bi", 0),
make_field("rgntotal", 0),
0, 0,
@@ -54086,7 +54086,7 @@
}
/**
-@@ -736,7 +792,7 @@
+@@ -736,7 +792,7 @@ int ps3_repository_read_num_spu_reserved
make_first_field("bi", 0),
make_field("spun", 0),
0, 0,
@@ -54095,7 +54095,7 @@
*num_spu_reserved = v1;
return result;
}
-@@ -755,7 +811,7 @@
+@@ -755,7 +811,7 @@ int ps3_repository_read_num_spu_resource
make_first_field("bi", 0),
make_field("spursvn", 0),
0, 0,
@@ -54104,7 +54104,7 @@
*num_resource_id = v1;
return result;
}
-@@ -768,7 +824,7 @@
+@@ -768,7 +824,7 @@ int ps3_repository_read_num_spu_resource
*/
int ps3_repository_read_spu_resource_id(unsigned int res_index,
@@ -54113,7 +54113,7 @@
{
int result;
u64 v1;
-@@ -785,14 +841,14 @@
+@@ -785,14 +841,14 @@ int ps3_repository_read_spu_resource_id(
return result;
}
@@ -54130,7 +54130,7 @@
}
int ps3_repository_read_boot_dat_size(unsigned int *size)
-@@ -805,7 +861,7 @@
+@@ -805,7 +861,7 @@ int ps3_repository_read_boot_dat_size(un
make_field("boot_dat", 0),
make_field("size", 0),
0,
@@ -54139,7 +54139,7 @@
*size = v1;
return result;
}
-@@ -820,7 +876,7 @@
+@@ -820,7 +876,7 @@ int ps3_repository_read_vuart_av_port(un
make_field("vir_uart", 0),
make_field("port", 0),
make_field("avset", 0),
@@ -54148,7 +54148,7 @@
*port = v1;
return result;
}
-@@ -835,7 +891,7 @@
+@@ -835,7 +891,7 @@ int ps3_repository_read_vuart_sysmgr_por
make_field("vir_uart", 0),
make_field("port", 0),
make_field("sysmgr", 0),
@@ -54157,7 +54157,7 @@
*port = v1;
return result;
}
-@@ -856,6 +912,10 @@
+@@ -856,6 +912,10 @@ int ps3_repository_read_boot_dat_info(u6
: ps3_repository_read_boot_dat_size(size);
}
@@ -54168,7 +54168,7 @@
int ps3_repository_read_num_be(unsigned int *num_be)
{
int result;
-@@ -866,11 +926,17 @@
+@@ -866,11 +926,17 @@ int ps3_repository_read_num_be(unsigned
0,
0,
0,
@@ -54187,7 +54187,7 @@
int ps3_repository_read_be_node_id(unsigned int be_index, u64 *node_id)
{
return read_node(PS3_LPAR_ID_PME,
-@@ -878,7 +944,23 @@
+@@ -878,7 +944,23 @@ int ps3_repository_read_be_node_id(unsig
0,
0,
0,
@@ -54212,7 +54212,7 @@
}
int ps3_repository_read_tb_freq(u64 node_id, u64 *tb_freq)
-@@ -888,7 +970,7 @@
+@@ -888,7 +970,7 @@ int ps3_repository_read_tb_freq(u64 node
node_id,
make_field("clock", 0),
0,
@@ -54221,7 +54221,7 @@
}
int ps3_repository_read_be_tb_freq(unsigned int be_index, u64 *tb_freq)
-@@ -897,11 +979,29 @@
+@@ -897,11 +979,29 @@ int ps3_repository_read_be_tb_freq(unsig
u64 node_id;
*tb_freq = 0;
@@ -54252,7 +54252,7 @@
#if defined(DEBUG)
int ps3_repository_dump_resource_info(const struct ps3_repository_device *repo)
-@@ -1034,7 +1134,7 @@
+@@ -1034,7 +1134,7 @@ static int dump_device_info(struct ps3_r
continue;
}
@@ -54261,7 +54261,7 @@
__LINE__, repo->bus_index, repo->dev_index,
repo->dev_type, repo->dev_id);
-@@ -1091,7 +1191,7 @@
+@@ -1091,7 +1191,7 @@ int ps3_repository_dump_bus_info(void)
continue;
}
@@ -54280,7 +54280,7 @@
#include "platform.h"
/* spu_management_ops */
-@@ -419,10 +420,34 @@
+@@ -419,10 +420,34 @@ static int ps3_init_affinity(void)
return 0;
}
@@ -54315,7 +54315,7 @@
.init_affinity = ps3_init_affinity,
};
-@@ -505,8 +530,6 @@
+@@ -505,8 +530,6 @@ static void mfc_sr1_set(struct spu *spu,
static const u64 allowed = ~(MFC_STATE1_LOCAL_STORAGE_DECODE_MASK
| MFC_STATE1_PROBLEM_STATE_MASK);
@@ -54326,7 +54326,7 @@
spu_pdata(spu)->cache.sr1 = sr1;
--- a/arch/powerpc/platforms/ps3/system-bus.c
+++ b/arch/powerpc/platforms/ps3/system-bus.c
-@@ -42,8 +42,8 @@
+@@ -42,8 +42,8 @@ struct {
int gpu;
} static usage_hack;
@@ -54337,7 +54337,7 @@
{
return dev->bus_id == bus_id && dev->dev_id == dev_id;
}
-@@ -182,8 +182,8 @@
+@@ -182,8 +182,8 @@ int ps3_open_hv_device(struct ps3_system
case PS3_MATCH_ID_SYSTEM_MANAGER:
pr_debug("%s:%d: unsupported match_id: %u\n", __func__,
__LINE__, dev->match_id);
@@ -54348,7 +54348,7 @@
BUG();
return -EINVAL;
-@@ -220,8 +220,8 @@
+@@ -220,8 +220,8 @@ int ps3_close_hv_device(struct ps3_syste
case PS3_MATCH_ID_SYSTEM_MANAGER:
pr_debug("%s:%d: unsupported match_id: %u\n", __func__,
__LINE__, dev->match_id);
@@ -54359,7 +54359,7 @@
BUG();
return -EINVAL;
-@@ -240,7 +240,7 @@
+@@ -240,7 +240,7 @@ EXPORT_SYMBOL_GPL(ps3_close_hv_device);
static void _dump_mmio_region(const struct ps3_mmio_region* r,
const char* func, int line)
{
@@ -54368,7 +54368,7 @@
r->dev->dev_id);
pr_debug("%s:%d: bus_addr %lxh\n", func, line, r->bus_addr);
pr_debug("%s:%d: len %lxh\n", func, line, r->len);
-@@ -715,6 +715,7 @@
+@@ -715,6 +715,7 @@ int ps3_system_bus_device_register(struc
static unsigned int dev_ioc0_count;
static unsigned int dev_sb_count;
static unsigned int dev_vuart_count;
@@ -54376,7 +54376,7 @@
if (!dev->core.parent)
dev->core.parent = &ps3_system_bus;
-@@ -737,6 +738,10 @@
+@@ -737,6 +738,10 @@ int ps3_system_bus_device_register(struc
snprintf(dev->core.bus_id, sizeof(dev->core.bus_id),
"vuart_%02x", ++dev_vuart_count);
break;
@@ -54398,7 +54398,7 @@
#include <asm/atomic.h>
#include <asm/eeh.h>
#include <asm/eeh_event.h>
-@@ -169,7 +171,6 @@
+@@ -169,7 +171,6 @@ static void rtas_slot_error_detail(struc
*/
static size_t gather_pci_data(struct pci_dn *pdn, char * buf, size_t len)
{
@@ -54406,7 +54406,7 @@
struct pci_dev *dev = pdn->pcidev;
u32 cfg;
int cap, i;
-@@ -243,12 +244,12 @@
+@@ -243,12 +244,12 @@ static size_t gather_pci_data(struct pci
/* Gather status on devices under the bridge */
if (dev->class >> 16 == PCI_BASE_CLASS_BRIDGE) {
@@ -54422,7 +54422,7 @@
}
}
-@@ -372,7 +373,7 @@
+@@ -372,7 +373,7 @@ struct device_node * find_device_pe(stru
return dn;
}
@@ -54431,7 +54431,7 @@
* Mark the device driver too, so that it can see the failure
* immediately; this is critical, since some drivers poll
* status registers in interrupts ... If a driver is polling,
-@@ -380,9 +381,11 @@
+@@ -380,9 +381,11 @@ struct device_node * find_device_pe(stru
* an interrupt context, which is bad.
*/
@@ -54445,7 +54445,7 @@
if (PCI_DN(dn)) {
/* Mark the pci device driver too */
struct pci_dev *dev = PCI_DN(dn)->pcidev;
-@@ -392,10 +395,8 @@
+@@ -392,10 +395,8 @@ static void __eeh_mark_slot (struct devi
if (dev && dev->driver)
dev->error_state = pci_channel_io_frozen;
@@ -54457,7 +54457,7 @@
}
}
-@@ -415,19 +416,19 @@
+@@ -415,19 +416,19 @@ void eeh_mark_slot (struct device_node *
if (dev)
dev->error_state = pci_channel_io_frozen;
@@ -54483,7 +54483,7 @@
}
}
-@@ -444,7 +445,7 @@
+@@ -444,7 +445,7 @@ void eeh_clear_slot (struct device_node
PCI_DN(dn)->eeh_mode &= ~mode_flag;
PCI_DN(dn)->eeh_check_count = 0;
@@ -54492,7 +54492,7 @@
spin_unlock_irqrestore(&confirm_error_lock, flags);
}
-@@ -480,6 +481,7 @@
+@@ -480,6 +481,7 @@ int eeh_dn_check_failure(struct device_n
no_dn++;
return 0;
}
@@ -54500,7 +54500,7 @@
pdn = PCI_DN(dn);
/* Access to IO BARs might get this far and still not want checking. */
-@@ -545,7 +547,7 @@
+@@ -545,7 +547,7 @@ int eeh_dn_check_failure(struct device_n
/* Note that config-io to empty slots may fail;
* they are empty when they don't have children. */
@@ -54509,7 +54509,7 @@
false_positives++;
pdn->eeh_false_positives ++;
rc = 0;
-@@ -848,11 +850,8 @@
+@@ -848,11 +850,8 @@ void eeh_restore_bars(struct pci_dn *pdn
if ((pdn->eeh_mode & EEH_MODE_SUPPORTED) && !IS_BRIDGE(pdn->class_code))
__restore_bars (pdn);
@@ -54522,7 +54522,7 @@
}
/**
-@@ -1130,7 +1129,8 @@
+@@ -1130,7 +1129,8 @@ static void eeh_add_device_early(struct
void eeh_add_device_tree_early(struct device_node *dn)
{
struct device_node *sib;
@@ -54534,7 +54534,7 @@
}
--- a/arch/powerpc/platforms/pseries/eeh_driver.c
+++ b/arch/powerpc/platforms/pseries/eeh_driver.c
-@@ -310,8 +310,6 @@
+@@ -310,8 +310,6 @@ struct pci_dn * handle_eeh_events (struc
const char *location, *pci_str, *drv_str;
frozen_dn = find_device_pe(event->dn);
@@ -54543,7 +54543,7 @@
if (!frozen_dn) {
location = of_get_property(event->dn, "ibm,loc-code", NULL);
-@@ -321,6 +319,8 @@
+@@ -321,6 +319,8 @@ struct pci_dn * handle_eeh_events (struc
location, pci_name(event->dev));
return NULL;
}
@@ -54552,7 +54552,7 @@
location = of_get_property(frozen_dn, "ibm,loc-code", NULL);
location = location ? location : "unknown";
-@@ -354,13 +354,6 @@
+@@ -354,13 +354,6 @@ struct pci_dn * handle_eeh_events (struc
if (frozen_pdn->eeh_freeze_count > EEH_MAX_ALLOWED_FREEZES)
goto excess_failures;
@@ -54566,7 +54566,7 @@
printk(KERN_WARNING
"EEH: This PCI device has failed %d times in the last hour:\n",
frozen_pdn->eeh_freeze_count);
-@@ -376,6 +369,14 @@
+@@ -376,6 +369,14 @@ struct pci_dn * handle_eeh_events (struc
*/
pci_walk_bus(frozen_bus, eeh_report_error, &result);
@@ -54583,7 +54583,7 @@
* have been informed.
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
-@@ -251,7 +251,7 @@
+@@ -251,7 +251,7 @@ static void iommu_table_setparms(struct
const unsigned long *basep;
const u32 *sizep;
@@ -54592,7 +54592,7 @@
basep = of_get_property(node, "linux,tce-base", NULL);
sizep = of_get_property(node, "linux,tce-size", NULL);
-@@ -296,11 +296,12 @@
+@@ -296,11 +296,12 @@ static void iommu_table_setparms(struct
static void iommu_table_setparms_lpar(struct pci_controller *phb,
struct device_node *dn,
struct iommu_table *tbl,
@@ -54607,7 +54607,7 @@
of_parse_dma_window(dn, dma_window, &tbl->it_index, &offset, &size);
tbl->it_base = 0;
-@@ -420,17 +421,10 @@
+@@ -420,17 +421,10 @@ static void pci_dma_bus_setup_pSeriesLP(
pdn->full_name, ppci->iommu_table);
if (!ppci->iommu_table) {
@@ -54627,7 +54627,7 @@
ppci->iommu_table = iommu_init_table(tbl, ppci->phb->node);
DBG(" created table: %p\n", ppci->iommu_table);
}
-@@ -523,14 +517,10 @@
+@@ -523,14 +517,10 @@ static void pci_dma_dev_setup_pSeriesLP(
pci = PCI_DN(pdn);
if (!pci->iommu_table) {
@@ -54644,7 +54644,7 @@
pci->iommu_table = iommu_init_table(tbl, pci->phb->node);
DBG(" created table: %p\n", pci->iommu_table);
} else {
-@@ -556,7 +546,7 @@
+@@ -556,7 +546,7 @@ static int iommu_reconfig_notifier(struc
case PSERIES_RECONFIG_REMOVE:
if (pci && pci->iommu_table &&
of_get_property(np, "ibm,dma-window", NULL))
@@ -54655,7 +54655,7 @@
err = NOTIFY_DONE;
--- a/arch/powerpc/platforms/pseries/pci_dlpar.c
+++ b/arch/powerpc/platforms/pseries/pci_dlpar.c
-@@ -83,7 +83,7 @@
+@@ -83,7 +83,7 @@ EXPORT_SYMBOL_GPL(pcibios_remove_pci_dev
/* Must be called before pci_bus_add_devices */
void
@@ -54664,7 +54664,7 @@
{
struct pci_dev *dev;
-@@ -98,8 +98,6 @@
+@@ -98,8 +98,6 @@ pcibios_fixup_new_pci_devices(struct pci
/* Fill device archdata and setup iommu table */
pcibios_setup_new_device(dev);
@@ -54673,7 +54673,7 @@
pci_read_irq_line(dev);
for (i = 0; i < PCI_NUM_RESOURCES; i++) {
struct resource *r = &dev->resource[i];
-@@ -132,8 +130,8 @@
+@@ -132,8 +130,8 @@ pcibios_pci_config_bridge(struct pci_dev
pci_scan_child_bus(child_bus);
@@ -54684,7 +54684,7 @@
/* Make the discovered devices available */
pci_bus_add_devices(child_bus);
-@@ -169,7 +167,7 @@
+@@ -169,7 +167,7 @@ pcibios_add_pci_devices(struct pci_bus *
/* use ofdt-based probe */
of_scan_bus(dn, bus);
if (!list_empty(&bus->devices)) {
@@ -54693,7 +54693,7 @@
pci_bus_add_devices(bus);
eeh_add_device_tree_late(bus);
}
-@@ -178,7 +176,7 @@
+@@ -178,7 +176,7 @@ pcibios_add_pci_devices(struct pci_bus *
slotno = PCI_SLOT(PCI_DN(dn->child)->devfn);
num = pci_scan_slot(bus, PCI_DEVFN(slotno, 0));
if (num) {
@@ -54702,7 +54702,7 @@
pci_bus_add_devices(bus);
eeh_add_device_tree_late(bus);
}
-@@ -208,7 +206,7 @@
+@@ -208,7 +206,7 @@ struct pci_controller * __devinit init_p
eeh_add_device_tree_early(dn);
scan_phb(phb);
@@ -54713,7 +54713,7 @@
--- a/arch/powerpc/platforms/pseries/plpar_wrappers.h
+++ b/arch/powerpc/platforms/pseries/plpar_wrappers.h
-@@ -8,11 +8,6 @@
+@@ -8,11 +8,6 @@ static inline long poll_pending(void)
return plpar_hcall_norets(H_POLL_PENDING);
}
@@ -54735,7 +54735,7 @@
#include "plpar_wrappers.h"
#include "pseries.h"
-@@ -202,7 +203,7 @@
+@@ -202,7 +203,7 @@ static int smp_pSeries_cpu_bootable(unsi
*/
if (system_state < SYSTEM_RUNNING &&
cpu_has_feature(CPU_FTR_SMT) &&
@@ -54746,7 +54746,7 @@
return 1;
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
-@@ -87,19 +87,25 @@
+@@ -87,19 +87,25 @@ static int ibm_int_off;
/* Direct HW low level accessors */
@@ -54778,7 +54778,7 @@
}
static inline void direct_qirr_info(int n_cpu, u8 value)
-@@ -111,7 +117,7 @@
+@@ -111,7 +117,7 @@ static inline void direct_qirr_info(int
/* LPAR low level accessors */
@@ -54787,7 +54787,7 @@
{
unsigned long lpar_rc;
unsigned long return_value;
-@@ -122,7 +128,7 @@
+@@ -122,7 +128,7 @@ static inline unsigned int lpar_xirr_inf
return (unsigned int)return_value;
}
@@ -54796,7 +54796,7 @@
{
unsigned long lpar_rc;
unsigned long val64 = value & 0xffffffff;
-@@ -133,7 +139,7 @@
+@@ -133,7 +139,7 @@ static inline void lpar_xirr_info_set(in
val64);
}
@@ -54805,7 +54805,7 @@
{
unsigned long lpar_rc;
-@@ -275,21 +281,19 @@
+@@ -275,21 +281,19 @@ static unsigned int xics_startup(unsigne
static void xics_eoi_direct(unsigned int virq)
{
@@ -54829,7 +54829,7 @@
}
static inline unsigned int xics_remap_irq(unsigned int vec)
-@@ -312,16 +316,12 @@
+@@ -312,16 +316,12 @@ static inline unsigned int xics_remap_ir
static unsigned int xics_get_irq_direct(void)
{
@@ -54848,7 +54848,7 @@
}
#ifdef CONFIG_SMP
-@@ -387,12 +387,12 @@
+@@ -387,12 +387,12 @@ void xics_cause_IPI(int cpu)
#endif /* CONFIG_SMP */
@@ -54864,7 +54864,7 @@
iosync();
}
-@@ -440,9 +440,7 @@
+@@ -440,9 +440,7 @@ static void xics_set_affinity(unsigned i
void xics_setup_cpu(void)
{
@@ -54875,7 +54875,7 @@
/*
* Put the calling processor into the GIQ. This is really only
-@@ -783,7 +781,7 @@
+@@ -783,7 +781,7 @@ void xics_teardown_cpu(int secondary)
unsigned int ipi;
struct irq_desc *desc;
@@ -54884,7 +54884,7 @@
/*
* Clear IPI
-@@ -824,10 +822,11 @@
+@@ -824,10 +822,11 @@ void xics_teardown_cpu(int secondary)
void xics_migrate_irqs_away(void)
{
int status;
@@ -54898,7 +54898,7 @@
/* remove ourselves from the global interrupt queue */
status = rtas_set_indicator_fast(GLOBAL_INTERRUPT_QUEUE,
-@@ -835,7 +834,7 @@
+@@ -835,7 +834,7 @@ void xics_migrate_irqs_away(void)
WARN_ON(status < 0);
/* Allow IPIs again... */
@@ -54907,7 +54907,7 @@
for_each_irq(virq) {
struct irq_desc *desc;
-@@ -874,7 +873,7 @@
+@@ -874,7 +873,7 @@ void xics_migrate_irqs_away(void)
* The irq has to be migrated only in the single cpu
* case.
*/
@@ -54918,7 +54918,7 @@
printk(KERN_WARNING "IRQ %u affinity broken off cpu %u\n",
--- a/arch/powerpc/platforms/pseries/xics.h
+++ b/arch/powerpc/platforms/pseries/xics.h
-@@ -21,9 +21,6 @@
+@@ -21,9 +21,6 @@ extern void xics_cause_IPI(int cpu);
extern void xics_request_IPIs(void);
extern void xics_migrate_irqs_away(void);
@@ -54941,7 +54941,7 @@
+ default n
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
-@@ -2,7 +2,7 @@
+@@ -2,7 +2,7 @@ ifeq ($(CONFIG_PPC64),y)
EXTRA_CFLAGS += -mno-minimal-toc
endif
@@ -54950,7 +54950,7 @@
obj-$(CONFIG_MPIC) += mpic.o $(mpic-msi-obj-y)
obj-$(CONFIG_PPC_MPC106) += grackle.o
-@@ -12,6 +12,7 @@
+@@ -12,6 +12,7 @@ obj-$(CONFIG_U3_DART) += dart_iommu.o
obj-$(CONFIG_MMIO_NVRAM) += mmio_nvram.o
obj-$(CONFIG_FSL_SOC) += fsl_soc.o
obj-$(CONFIG_FSL_PCI) += fsl_pci.o
@@ -54958,7 +54958,7 @@
obj-$(CONFIG_TSI108_BRIDGE) += tsi108_pci.o tsi108_dev.o
obj-$(CONFIG_QUICC_ENGINE) += qe_lib/
obj-$(CONFIG_PPC_BESTCOMM) += bestcomm/
-@@ -24,9 +25,13 @@
+@@ -24,9 +25,13 @@ obj-$(CONFIG_AXON_RAM) += axonram.o
ifeq ($(CONFIG_PPC_MERGE),y)
obj-$(CONFIG_PPC_INDIRECT_PCI) += indirect_pci.o
obj-$(CONFIG_PPC_I8259) += i8259.o
@@ -54989,7 +54989,7 @@
--- a/arch/powerpc/sysdev/bestcomm/bestcomm.h
+++ b/arch/powerpc/sysdev/bestcomm/bestcomm.h
-@@ -20,7 +20,7 @@
+@@ -20,7 +20,7 @@ struct bcom_bd; /* defined later on ...
/* ======================================================================== */
@@ -55000,7 +55000,7 @@
/**
--- a/arch/powerpc/sysdev/commproc.c
+++ b/arch/powerpc/sysdev/commproc.c
-@@ -240,6 +240,34 @@
+@@ -240,6 +240,34 @@ void __init cpm_reset(void)
#endif
}
@@ -55035,7 +55035,7 @@
/* We used to do this earlier, but have to postpone as long as possible
* to ensure the kernel VM is now running.
*/
-@@ -408,7 +436,7 @@
+@@ -408,7 +436,7 @@ EXPORT_SYMBOL(cpm_dpram_phys);
#endif /* !CONFIG_PPC_CPM_NEW_BINDING */
struct cpm_ioport16 {
@@ -55044,7 +55044,7 @@
__be16 res[3];
};
-@@ -438,6 +466,13 @@
+@@ -438,6 +466,13 @@ static void cpm1_set_pin32(int port, int
else
clrbits32(&iop->par, pin);
@@ -55058,7 +55058,7 @@
if (port == CPM_PORTE) {
if (flags & CPM_PIN_SECONDARY)
setbits32(&iop->sor, pin);
-@@ -471,11 +506,17 @@
+@@ -471,11 +506,17 @@ static void cpm1_set_pin16(int port, int
else
clrbits16(&iop->par, pin);
@@ -55080,7 +55080,7 @@
--- a/arch/powerpc/sysdev/cpm2_common.c
+++ b/arch/powerpc/sysdev/cpm2_common.c
-@@ -82,6 +82,31 @@
+@@ -82,6 +82,31 @@ void __init cpm2_reset(void)
cpmp = &cpm2_immr->im_cpm;
}
@@ -55114,7 +55114,7 @@
* as clocks. The BRGs are in two different block of internal
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
-@@ -33,8 +33,8 @@
+@@ -33,8 +33,8 @@ void __init setup_pci_atmu(struct pci_co
struct ccsr_pci __iomem *pci;
int i;
@@ -55125,7 +55125,7 @@
pci = ioremap(rsrc->start, rsrc->end - rsrc->start + 1);
/* Disable all windows (except powar0 since its ignored) */
-@@ -46,17 +46,17 @@
+@@ -46,17 +46,17 @@ void __init setup_pci_atmu(struct pci_co
/* Setup outbound MEM window */
for(i = 0; i < 3; i++)
if (hose->mem_resources[i].flags & IORESOURCE_MEM){
@@ -55152,7 +55152,7 @@
/* Enable, Mem R/W */
out_be32(&pci->pow[i+1].powar, 0x80044000
| (__ilog2(hose->mem_resources[i].end
-@@ -65,15 +65,14 @@
+@@ -65,15 +65,14 @@ void __init setup_pci_atmu(struct pci_co
/* Setup outbound IO window */
if (hose->io_resource.flags & IORESOURCE_IO){
@@ -55175,7 +55175,7 @@
/* Enable, IO R/W */
out_be32(&pci->pow[i+1].powar, 0x80088000
| (__ilog2(hose->io_resource.end
-@@ -107,55 +106,17 @@
+@@ -107,55 +106,17 @@ void __init setup_pci_cmd(struct pci_con
}
}
@@ -55237,7 +55237,7 @@
}
int __init fsl_pcie_check_link(struct pci_controller *hose)
-@@ -172,11 +133,24 @@
+@@ -172,11 +133,24 @@ void fsl_pcibios_fixup_bus(struct pci_bu
struct pci_controller *hose = (struct pci_controller *) bus->sysdata;
int i;
@@ -55267,7 +55267,7 @@
}
}
}
-@@ -202,7 +176,7 @@
+@@ -202,7 +176,7 @@ int __init fsl_add_bridge(struct device_
printk(KERN_WARNING "Can't get bus-range for %s, assume"
" bus 0\n", dev->full_name);
@@ -55276,7 +55276,7 @@
hose = pcibios_alloc_controller(dev);
if (!hose)
return -ENOMEM;
-@@ -222,7 +196,7 @@
+@@ -222,7 +196,7 @@ int __init fsl_add_bridge(struct device_
hose->indirect_type |= PPC_INDIRECT_TYPE_NO_PCIE_LINK;
}
@@ -55285,7 +55285,7 @@
"Firmware bus number: %d->%d\n",
(unsigned long long)rsrc.start, hose->first_busno,
hose->last_busno);
-@@ -240,23 +214,23 @@
+@@ -240,23 +214,23 @@ int __init fsl_add_bridge(struct device_
return 0;
}
@@ -56297,7 +56297,7 @@
#include <linux/spi/spi.h>
#include <linux/fsl_devices.h>
#include <linux/fs_enet_pd.h>
-@@ -54,10 +55,18 @@
+@@ -54,10 +55,18 @@ phys_addr_t get_immrbase(void)
soc = of_find_node_by_type(NULL, "soc");
if (soc) {
int size;
@@ -56318,7 +56318,7 @@
of_node_put(soc);
}
-@@ -130,17 +139,51 @@
+@@ -130,17 +139,51 @@ u32 get_baudrate(void)
EXPORT_SYMBOL(get_baudrate);
#endif /* CONFIG_CPM2 */
@@ -56375,7 +56375,7 @@
int k;
struct device_node *child = NULL;
struct gianfar_mdio_data mdio_data;
-@@ -179,11 +222,13 @@
+@@ -179,11 +222,13 @@ static int __init gfar_mdio_of_init(void
goto unreg;
}
@@ -56389,7 +56389,7 @@
return ret;
}
-@@ -193,7 +238,6 @@
+@@ -193,7 +238,6 @@ static const char *gfar_tx_intr = "tx";
static const char *gfar_rx_intr = "rx";
static const char *gfar_err_intr = "error";
@@ -56397,7 +56397,7 @@
static int __init gfar_of_init(void)
{
struct device_node *np;
-@@ -277,29 +321,43 @@
+@@ -277,29 +321,43 @@ static int __init gfar_of_init(void)
gfar_data.interface = PHY_INTERFACE_MODE_MII;
ph = of_get_property(np, "phy-handle", NULL);
@@ -56457,7 +56457,7 @@
ret =
platform_device_add_data(gfar_dev, &gfar_data,
sizeof(struct
-@@ -390,13 +448,11 @@
+@@ -390,13 +448,11 @@ static void __init of_register_i2c_devic
static int __init fsl_i2c_of_init(void)
{
struct device_node *np;
@@ -56473,7 +56473,7 @@
struct resource r[2];
struct fsl_i2c_platform_data i2c_data;
const unsigned char *flags = NULL;
-@@ -432,7 +488,7 @@
+@@ -432,7 +488,7 @@ static int __init fsl_i2c_of_init(void)
if (ret)
goto unreg;
@@ -56482,7 +56482,7 @@
}
return 0;
-@@ -528,14 +584,12 @@
+@@ -528,14 +584,12 @@ static enum fsl_usb2_phy_modes determine
static int __init fsl_usb_of_init(void)
{
struct device_node *np;
@@ -56499,7 +56499,7 @@
struct resource r[2];
struct fsl_usb2_platform_data usb_data;
const unsigned char *prop = NULL;
-@@ -578,11 +632,10 @@
+@@ -578,11 +632,10 @@ static int __init fsl_usb_of_init(void)
fsl_usb2_platform_data));
if (ret)
goto unreg_mph;
@@ -56513,7 +56513,7 @@
struct resource r[2];
struct fsl_usb2_platform_data usb_data;
const unsigned char *prop = NULL;
-@@ -654,6 +707,7 @@
+@@ -654,6 +707,7 @@ static int __init fsl_usb_of_init(void)
fsl_usb2_platform_data))))
goto unreg_dr;
}
@@ -56521,7 +56521,7 @@
}
return 0;
-@@ -1125,13 +1179,12 @@
+@@ -1125,13 +1179,12 @@ arch_initcall(fs_enet_of_init);
static int __init fsl_pcmcia_of_init(void)
{
@@ -56540,7 +56540,7 @@
--- a/arch/powerpc/sysdev/grackle.c
+++ b/arch/powerpc/sysdev/grackle.c
-@@ -57,7 +57,7 @@
+@@ -57,7 +57,7 @@ void __init setup_grackle(struct pci_con
{
setup_indirect_pci(hose, 0xfec00000, 0xfee00000, 0);
if (machine_is_compatible("PowerMac1,1"))
@@ -56620,7 +56620,7 @@
.mask = IPIC_SIMSR_H,
.prio = IPIC_SIPRR_D,
.force = IPIC_SIFCR_H,
-@@ -42,7 +98,6 @@
+@@ -42,7 +98,6 @@ static struct ipic_info ipic_info[] = {
.prio_mask = 0,
},
[10] = {
@@ -56628,7 +56628,7 @@
.mask = IPIC_SIMSR_H,
.prio = IPIC_SIPRR_D,
.force = IPIC_SIFCR_H,
-@@ -50,15 +105,27 @@
+@@ -50,15 +105,27 @@ static struct ipic_info ipic_info[] = {
.prio_mask = 1,
},
[11] = {
@@ -56658,7 +56658,7 @@
.mask = IPIC_SIMSR_H,
.prio = IPIC_SIPRR_D,
.force = IPIC_SIFCR_H,
-@@ -66,7 +133,6 @@
+@@ -66,7 +133,6 @@ static struct ipic_info ipic_info[] = {
.prio_mask = 5,
},
[15] = {
@@ -56666,7 +56666,7 @@
.mask = IPIC_SIMSR_H,
.prio = IPIC_SIPRR_D,
.force = IPIC_SIFCR_H,
-@@ -74,7 +140,6 @@
+@@ -74,7 +140,6 @@ static struct ipic_info ipic_info[] = {
.prio_mask = 6,
},
[16] = {
@@ -56674,7 +56674,7 @@
.mask = IPIC_SIMSR_H,
.prio = IPIC_SIPRR_D,
.force = IPIC_SIFCR_H,
-@@ -82,7 +147,7 @@
+@@ -82,7 +147,7 @@ static struct ipic_info ipic_info[] = {
.prio_mask = 7,
},
[17] = {
@@ -56683,7 +56683,7 @@
.mask = IPIC_SEMSR,
.prio = IPIC_SMPRR_A,
.force = IPIC_SEFCR,
-@@ -90,7 +155,7 @@
+@@ -90,7 +155,7 @@ static struct ipic_info ipic_info[] = {
.prio_mask = 5,
},
[18] = {
@@ -56692,7 +56692,7 @@
.mask = IPIC_SEMSR,
.prio = IPIC_SMPRR_A,
.force = IPIC_SEFCR,
-@@ -98,7 +163,7 @@
+@@ -98,7 +163,7 @@ static struct ipic_info ipic_info[] = {
.prio_mask = 6,
},
[19] = {
@@ -56701,7 +56701,7 @@
.mask = IPIC_SEMSR,
.prio = IPIC_SMPRR_A,
.force = IPIC_SEFCR,
-@@ -106,7 +171,7 @@
+@@ -106,7 +171,7 @@ static struct ipic_info ipic_info[] = {
.prio_mask = 7,
},
[20] = {
@@ -56710,7 +56710,7 @@
.mask = IPIC_SEMSR,
.prio = IPIC_SMPRR_B,
.force = IPIC_SEFCR,
-@@ -114,7 +179,7 @@
+@@ -114,7 +179,7 @@ static struct ipic_info ipic_info[] = {
.prio_mask = 4,
},
[21] = {
@@ -56719,7 +56719,7 @@
.mask = IPIC_SEMSR,
.prio = IPIC_SMPRR_B,
.force = IPIC_SEFCR,
-@@ -122,7 +187,7 @@
+@@ -122,7 +187,7 @@ static struct ipic_info ipic_info[] = {
.prio_mask = 5,
},
[22] = {
@@ -56728,7 +56728,7 @@
.mask = IPIC_SEMSR,
.prio = IPIC_SMPRR_B,
.force = IPIC_SEFCR,
-@@ -130,7 +195,7 @@
+@@ -130,7 +195,7 @@ static struct ipic_info ipic_info[] = {
.prio_mask = 6,
},
[23] = {
@@ -56737,7 +56737,7 @@
.mask = IPIC_SEMSR,
.prio = IPIC_SMPRR_B,
.force = IPIC_SEFCR,
-@@ -138,7 +203,6 @@
+@@ -138,7 +203,6 @@ static struct ipic_info ipic_info[] = {
.prio_mask = 7,
},
[32] = {
@@ -56745,7 +56745,7 @@
.mask = IPIC_SIMSR_H,
.prio = IPIC_SIPRR_A,
.force = IPIC_SIFCR_H,
-@@ -146,7 +210,6 @@
+@@ -146,7 +210,6 @@ static struct ipic_info ipic_info[] = {
.prio_mask = 0,
},
[33] = {
@@ -56753,7 +56753,7 @@
.mask = IPIC_SIMSR_H,
.prio = IPIC_SIPRR_A,
.force = IPIC_SIFCR_H,
-@@ -154,7 +217,6 @@
+@@ -154,7 +217,6 @@ static struct ipic_info ipic_info[] = {
.prio_mask = 1,
},
[34] = {
@@ -56761,7 +56761,7 @@
.mask = IPIC_SIMSR_H,
.prio = IPIC_SIPRR_A,
.force = IPIC_SIFCR_H,
-@@ -162,7 +224,6 @@
+@@ -162,7 +224,6 @@ static struct ipic_info ipic_info[] = {
.prio_mask = 2,
},
[35] = {
@@ -56769,7 +56769,7 @@
.mask = IPIC_SIMSR_H,
.prio = IPIC_SIPRR_A,
.force = IPIC_SIFCR_H,
-@@ -170,7 +231,6 @@
+@@ -170,7 +231,6 @@ static struct ipic_info ipic_info[] = {
.prio_mask = 3,
},
[36] = {
@@ -56777,7 +56777,7 @@
.mask = IPIC_SIMSR_H,
.prio = IPIC_SIPRR_A,
.force = IPIC_SIFCR_H,
-@@ -178,7 +238,6 @@
+@@ -178,7 +238,6 @@ static struct ipic_info ipic_info[] = {
.prio_mask = 4,
},
[37] = {
@@ -56785,7 +56785,7 @@
.mask = IPIC_SIMSR_H,
.prio = IPIC_SIPRR_A,
.force = IPIC_SIFCR_H,
-@@ -186,7 +245,6 @@
+@@ -186,7 +245,6 @@ static struct ipic_info ipic_info[] = {
.prio_mask = 5,
},
[38] = {
@@ -56793,7 +56793,7 @@
.mask = IPIC_SIMSR_H,
.prio = IPIC_SIPRR_A,
.force = IPIC_SIFCR_H,
-@@ -194,15 +252,69 @@
+@@ -194,15 +252,69 @@ static struct ipic_info ipic_info[] = {
.prio_mask = 6,
},
[39] = {
@@ -56865,7 +56865,7 @@
.mask = IPIC_SEMSR,
.prio = IPIC_SMPRR_A,
.force = IPIC_SEFCR,
-@@ -210,7 +322,6 @@
+@@ -210,7 +322,6 @@ static struct ipic_info ipic_info[] = {
.prio_mask = 4,
},
[64] = {
@@ -56873,7 +56873,7 @@
.mask = IPIC_SIMSR_L,
.prio = IPIC_SMPRR_A,
.force = IPIC_SIFCR_L,
-@@ -218,7 +329,6 @@
+@@ -218,7 +329,6 @@ static struct ipic_info ipic_info[] = {
.prio_mask = 0,
},
[65] = {
@@ -56881,7 +56881,7 @@
.mask = IPIC_SIMSR_L,
.prio = IPIC_SMPRR_A,
.force = IPIC_SIFCR_L,
-@@ -226,7 +336,6 @@
+@@ -226,7 +336,6 @@ static struct ipic_info ipic_info[] = {
.prio_mask = 1,
},
[66] = {
@@ -56889,7 +56889,7 @@
.mask = IPIC_SIMSR_L,
.prio = IPIC_SMPRR_A,
.force = IPIC_SIFCR_L,
-@@ -234,7 +343,6 @@
+@@ -234,7 +343,6 @@ static struct ipic_info ipic_info[] = {
.prio_mask = 2,
},
[67] = {
@@ -56897,7 +56897,7 @@
.mask = IPIC_SIMSR_L,
.prio = IPIC_SMPRR_A,
.force = IPIC_SIFCR_L,
-@@ -242,7 +350,6 @@
+@@ -242,7 +350,6 @@ static struct ipic_info ipic_info[] = {
.prio_mask = 3,
},
[68] = {
@@ -56905,7 +56905,7 @@
.mask = IPIC_SIMSR_L,
.prio = IPIC_SMPRR_B,
.force = IPIC_SIFCR_L,
-@@ -250,7 +357,6 @@
+@@ -250,7 +357,6 @@ static struct ipic_info ipic_info[] = {
.prio_mask = 0,
},
[69] = {
@@ -56913,7 +56913,7 @@
.mask = IPIC_SIMSR_L,
.prio = IPIC_SMPRR_B,
.force = IPIC_SIFCR_L,
-@@ -258,7 +364,6 @@
+@@ -258,7 +364,6 @@ static struct ipic_info ipic_info[] = {
.prio_mask = 1,
},
[70] = {
@@ -56921,7 +56921,7 @@
.mask = IPIC_SIMSR_L,
.prio = IPIC_SMPRR_B,
.force = IPIC_SIFCR_L,
-@@ -266,7 +371,6 @@
+@@ -266,7 +371,6 @@ static struct ipic_info ipic_info[] = {
.prio_mask = 2,
},
[71] = {
@@ -56929,7 +56929,7 @@
.mask = IPIC_SIMSR_L,
.prio = IPIC_SMPRR_B,
.force = IPIC_SIFCR_L,
-@@ -274,91 +378,120 @@
+@@ -274,91 +378,120 @@ static struct ipic_info ipic_info[] = {
.prio_mask = 3,
},
[72] = {
@@ -57063,7 +57063,7 @@
.mask = IPIC_SIMSR_L,
.prio = 0,
.force = IPIC_SIFCR_L,
-@@ -412,6 +545,10 @@
+@@ -412,6 +545,10 @@ static void ipic_mask_irq(unsigned int v
temp &= ~(1 << (31 - ipic_info[src].bit));
ipic_write(ipic->regs, ipic_info[src].mask, temp);
@@ -57074,7 +57074,7 @@
spin_unlock_irqrestore(&ipic_lock, flags);
}
-@@ -424,9 +561,13 @@
+@@ -424,9 +561,13 @@ static void ipic_ack_irq(unsigned int vi
spin_lock_irqsave(&ipic_lock, flags);
@@ -57090,7 +57090,7 @@
spin_unlock_irqrestore(&ipic_lock, flags);
}
-@@ -444,9 +585,13 @@
+@@ -444,9 +585,13 @@ static void ipic_mask_irq_and_ack(unsign
temp &= ~(1 << (31 - ipic_info[src].bit));
ipic_write(ipic->regs, ipic_info[src].mask, temp);
@@ -57106,7 +57106,7 @@
spin_unlock_irqrestore(&ipic_lock, flags);
}
-@@ -468,14 +613,22 @@
+@@ -468,14 +613,22 @@ static int ipic_set_irq_type(unsigned in
flow_type);
return -EINVAL;
}
@@ -57129,7 +57129,7 @@
}
/* only EXT IRQ senses are programmable on ipic
-@@ -500,7 +653,16 @@
+@@ -500,7 +653,16 @@ static int ipic_set_irq_type(unsigned in
return 0;
}
@@ -57147,7 +57147,7 @@
.typename = " IPIC ",
.unmask = ipic_unmask_irq,
.mask = ipic_mask_irq,
-@@ -519,13 +681,9 @@
+@@ -519,13 +681,9 @@ static int ipic_host_map(struct irq_host
irq_hw_number_t hw)
{
struct ipic *ipic = h->host_data;
@@ -57162,7 +57162,7 @@
/* Set default irq type */
set_irq_type(virq, IRQ_TYPE_NONE);
-@@ -584,7 +742,6 @@
+@@ -584,7 +742,6 @@ struct ipic * __init ipic_init(struct de
ipic->regs = ioremap(res.start, res.end - res.start + 1);
ipic->irqhost->host_data = ipic;
@@ -57170,7 +57170,7 @@
/* init hw */
ipic_write(ipic->regs, IPIC_SICNR, 0x0);
-@@ -593,6 +750,10 @@
+@@ -593,6 +750,10 @@ struct ipic * __init ipic_init(struct de
* configure SICFR accordingly */
if (flags & IPIC_SPREADMODE_GRP_A)
temp |= SICFR_IPSA;
@@ -57181,7 +57181,7 @@
if (flags & IPIC_SPREADMODE_GRP_D)
temp |= SICFR_IPSD;
if (flags & IPIC_SPREADMODE_MIX_A)
-@@ -600,7 +761,7 @@
+@@ -600,7 +761,7 @@ struct ipic * __init ipic_init(struct de
if (flags & IPIC_SPREADMODE_MIX_B)
temp |= SICFR_MPSB;
@@ -57190,7 +57190,7 @@
/* handle MCP route */
temp = 0;
-@@ -672,10 +833,12 @@
+@@ -672,10 +833,12 @@ void ipic_set_highest_priority(unsigned
void ipic_set_default_priority(void)
{
@@ -57226,7 +57226,7 @@
#define SICFR_IPSD 0x00080000
#define SICFR_MPSA 0x00200000
#define SICFR_MPSB 0x00400000
-@@ -45,13 +44,11 @@
+@@ -45,13 +44,11 @@ struct ipic {
/* The remapper for this IPIC */
struct irq_host *irqhost;
@@ -57244,7 +57244,7 @@
u8 force; /* force register offset from base */
--- a/arch/powerpc/sysdev/mmio_nvram.c
+++ b/arch/powerpc/sysdev/mmio_nvram.c
-@@ -99,7 +99,7 @@
+@@ -99,7 +99,7 @@ int __init mmio_nvram_init(void)
nvram_addr = r.start;
mmio_nvram_len = r.end - r.start + 1;
if ( (!mmio_nvram_len) || (!nvram_addr) ) {
@@ -57255,7 +57255,7 @@
}
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
-@@ -83,6 +83,7 @@
+@@ -83,6 +83,7 @@ static u32 mpic_infos[][MPIC_IDX_END] =
MPIC_CPU_WHOAMI,
MPIC_CPU_INTACK,
MPIC_CPU_EOI,
@@ -57263,7 +57263,7 @@
MPIC_IRQ_BASE,
MPIC_IRQ_STRIDE,
-@@ -121,6 +122,7 @@
+@@ -121,6 +122,7 @@ static u32 mpic_infos[][MPIC_IDX_END] =
TSI108_CPU_WHOAMI,
TSI108_CPU_INTACK,
TSI108_CPU_EOI,
@@ -57271,7 +57271,7 @@
TSI108_IRQ_BASE,
TSI108_IRQ_STRIDE,
-@@ -265,7 +267,7 @@
+@@ -265,7 +267,7 @@ static inline void _mpic_irq_write(struc
*/
@@ -57280,7 +57280,7 @@
struct mpic_reg_bank *rb, unsigned int offset,
unsigned int size)
{
-@@ -285,7 +287,7 @@
+@@ -285,7 +287,7 @@ static void _mpic_map_dcr(struct mpic *m
BUG_ON(!DCR_MAP_OK(rb->dhost));
}
@@ -57289,7 +57289,7 @@
struct mpic_reg_bank *rb, unsigned int offset,
unsigned int size)
{
-@@ -612,12 +614,11 @@
+@@ -612,12 +614,11 @@ static inline void mpic_eoi(struct mpic
}
#ifdef CONFIG_SMP
@@ -57305,7 +57305,7 @@
return IRQ_HANDLED;
}
-@@ -842,6 +843,24 @@
+@@ -842,6 +843,24 @@ int mpic_set_irq_type(unsigned int virq,
return 0;
}
@@ -57330,7 +57330,7 @@
static struct irq_chip mpic_irq_chip = {
.mask = mpic_mask_irq,
.unmask = mpic_unmask_irq,
-@@ -1109,6 +1128,11 @@
+@@ -1109,6 +1128,11 @@ struct mpic * __init mpic_alloc(struct d
mb();
}
@@ -57342,7 +57342,7 @@
/* Read feature register, calculate num CPUs and, for non-ISU
* MPICs, num sources as well. On ISU MPICs, sources are counted
* as ISUs are added
-@@ -1230,6 +1254,8 @@
+@@ -1230,6 +1254,8 @@ void __init mpic_init(struct mpic *mpic)
mpic_u3msi_init(mpic);
}
@@ -57351,7 +57351,7 @@
for (i = 0; i < mpic->num_sources; i++) {
/* start with vector = source number, and masked */
u32 vecpri = MPIC_VECPRI_MASK | i |
-@@ -1253,6 +1279,11 @@
+@@ -1253,6 +1279,11 @@ void __init mpic_init(struct mpic *mpic)
mpic_read(mpic->gregs, MPIC_INFO(GREG_GLOBAL_CONF_0))
| MPIC_GREG_GCONF_8259_PTHROU_DIS);
@@ -57363,7 +57363,7 @@
/* Set current processor priority to 0 */
mpic_cpu_write(MPIC_INFO(CPU_CURRENT_TASK_PRI), 0);
-@@ -1419,13 +1450,13 @@
+@@ -1419,13 +1450,13 @@ void mpic_send_ipi(unsigned int ipi_no,
mpic_physmask(cpu_mask & cpus_addr(cpu_online_map)[0]));
}
@@ -57380,7 +57380,7 @@
#endif
if (unlikely(src == mpic->spurious_vec)) {
if (mpic->flags & MPIC_SPV_EOI)
-@@ -1443,6 +1474,11 @@
+@@ -1443,6 +1474,11 @@ unsigned int mpic_get_one_irq(struct mpi
return irq_linear_revmap(mpic->irqhost, src);
}
@@ -57392,7 +57392,7 @@
unsigned int mpic_get_irq(void)
{
struct mpic *mpic = mpic_primary;
-@@ -1452,12 +1488,20 @@
+@@ -1452,12 +1488,20 @@ unsigned int mpic_get_irq(void)
return mpic_get_one_irq(mpic);
}
@@ -57414,7 +57414,7 @@
static char *ipi_names[] = {
"IPI0 (call function)",
"IPI1 (reschedule)",
-@@ -1472,14 +1516,14 @@
+@@ -1472,14 +1516,14 @@ void mpic_request_ipis(void)
unsigned int vipi = irq_create_mapping(mpic->irqhost,
mpic->ipi_vecs[0] + i);
if (vipi == NO_IRQ) {
@@ -57434,7 +57434,7 @@
}
--- a/arch/powerpc/sysdev/mpic.h
+++ b/arch/powerpc/sysdev/mpic.h
-@@ -17,6 +17,7 @@
+@@ -17,6 +17,7 @@ extern int mpic_msi_init_allocator(struc
extern irq_hw_number_t mpic_msi_alloc_hwirqs(struct mpic *mpic, int num);
extern void mpic_msi_free_hwirqs(struct mpic *mpic, int offset, int num);
extern int mpic_u3msi_init(struct mpic *mpic);
@@ -57442,7 +57442,7 @@
#else
static inline void mpic_msi_reserve_hwirq(struct mpic *mpic,
irq_hw_number_t hwirq)
-@@ -28,12 +29,15 @@
+@@ -28,12 +29,15 @@ static inline int mpic_u3msi_init(struct
{
return -1;
}
@@ -57638,7 +57638,7 @@
+}
--- a/arch/powerpc/sysdev/mv64x60_dev.c
+++ b/arch/powerpc/sysdev/mv64x60_dev.c
-@@ -241,7 +241,7 @@
+@@ -241,7 +241,7 @@ static int __init mv64x60_eth_device_set
/* only register the shared platform device the first time through */
if (id == 0 && (err = eth_register_shared_pdev(np)))
@@ -57647,7 +57647,7 @@
memset(r, 0, sizeof(r));
of_irq_to_resource(np, 0, &r[0]);
-@@ -451,22 +451,19 @@
+@@ -451,22 +451,19 @@ static int __init mv64x60_device_setup(v
int id;
int err;
@@ -57679,7 +57679,7 @@
goto error;
/* support up to one watchdog timer */
-@@ -477,7 +474,6 @@
+@@ -477,7 +474,6 @@ static int __init mv64x60_device_setup(v
of_node_put(np);
}
@@ -57689,7 +57689,7 @@
error:
--- a/arch/powerpc/sysdev/mv64x60_pci.c
+++ b/arch/powerpc/sysdev/mv64x60_pci.c
-@@ -164,8 +164,8 @@
+@@ -164,8 +164,8 @@ static int __init mv64x60_add_bridge(str
void __init mv64x60_pci_init(void)
{
@@ -57702,7 +57702,7 @@
}
--- a/arch/powerpc/sysdev/mv64x60_udbg.c
+++ b/arch/powerpc/sysdev/mv64x60_udbg.c
-@@ -85,10 +85,10 @@
+@@ -85,10 +85,10 @@ static void mv64x60_udbg_init(void)
if (!stdout)
return;
@@ -59715,7 +59715,7 @@
#include <asm/irq.h>
#include <asm/page.h>
#include <asm/pgtable.h>
-@@ -167,19 +168,20 @@
+@@ -167,19 +168,20 @@ unsigned int get_brg_clk(void)
/* Program the BRG to the given sampling rate and multiplier
*
@@ -59740,7 +59740,7 @@
divisor = get_brg_clk() / (rate * multiplier);
if (divisor > QE_BRGC_DIVISOR_MAX + 1) {
-@@ -196,8 +198,43 @@
+@@ -196,8 +198,43 @@ void qe_setbrg(unsigned int brg, unsigne
tempval = ((divisor - 1) << QE_BRGC_DIVISOR_SHIFT) |
QE_BRGC_ENABLE | div16;
@@ -59785,7 +59785,7 @@
/* Initialize SNUMs (thread serial numbers) according to
* QE Module Control chapter, SNUM table
-@@ -358,3 +395,249 @@
+@@ -358,3 +395,249 @@ void *qe_muram_addr(unsigned long offset
return (void *)&qe_immr->muram[offset];
}
EXPORT_SYMBOL(qe_muram_addr);
@@ -60045,7 +60045,7 @@
#include <asm/io.h>
#include <asm/immap_qe.h>
-@@ -41,6 +42,7 @@
+@@ -41,6 +42,7 @@ u32 ucc_slow_get_qe_cr_subblock(int uccs
default: return QE_CR_SUBBLOCK_INVALID;
}
}
@@ -60053,7 +60053,7 @@
void ucc_slow_poll_transmitter_now(struct ucc_slow_private * uccs)
{
-@@ -56,6 +58,7 @@
+@@ -56,6 +58,7 @@ void ucc_slow_graceful_stop_tx(struct uc
qe_issue_cmd(QE_GRACEFUL_STOP_TX, id,
QE_CR_PROTOCOL_UNSPECIFIED, 0);
}
@@ -60061,7 +60061,7 @@
void ucc_slow_stop_tx(struct ucc_slow_private * uccs)
{
-@@ -65,6 +68,7 @@
+@@ -65,6 +68,7 @@ void ucc_slow_stop_tx(struct ucc_slow_pr
id = ucc_slow_get_qe_cr_subblock(us_info->ucc_num);
qe_issue_cmd(QE_STOP_TX, id, QE_CR_PROTOCOL_UNSPECIFIED, 0);
}
@@ -60069,7 +60069,7 @@
void ucc_slow_restart_tx(struct ucc_slow_private * uccs)
{
-@@ -74,6 +78,7 @@
+@@ -74,6 +78,7 @@ void ucc_slow_restart_tx(struct ucc_slow
id = ucc_slow_get_qe_cr_subblock(us_info->ucc_num);
qe_issue_cmd(QE_RESTART_TX, id, QE_CR_PROTOCOL_UNSPECIFIED, 0);
}
@@ -60077,7 +60077,7 @@
void ucc_slow_enable(struct ucc_slow_private * uccs, enum comm_dir mode)
{
-@@ -94,6 +99,7 @@
+@@ -94,6 +99,7 @@ void ucc_slow_enable(struct ucc_slow_pri
}
out_be32(&us_regs->gumr_l, gumr_l);
}
@@ -60085,7 +60085,7 @@
void ucc_slow_disable(struct ucc_slow_private * uccs, enum comm_dir mode)
{
-@@ -114,6 +120,7 @@
+@@ -114,6 +120,7 @@ void ucc_slow_disable(struct ucc_slow_pr
}
out_be32(&us_regs->gumr_l, gumr_l);
}
@@ -60093,7 +60093,7 @@
/* Initialize the UCC for Slow operations
*
-@@ -347,6 +354,7 @@
+@@ -347,6 +354,7 @@ int ucc_slow_init(struct ucc_slow_info *
*uccs_ret = uccs;
return 0;
}
@@ -60101,7 +60101,7 @@
void ucc_slow_free(struct ucc_slow_private * uccs)
{
-@@ -366,5 +374,5 @@
+@@ -366,5 +374,5 @@ void ucc_slow_free(struct ucc_slow_priva
kfree(uccs);
}
@@ -60110,7 +60110,7 @@
--- a/arch/powerpc/sysdev/tsi108_dev.c
+++ b/arch/powerpc/sysdev/tsi108_dev.c
-@@ -66,14 +66,12 @@
+@@ -66,14 +66,12 @@ EXPORT_SYMBOL(get_vir_csrbase);
static int __init tsi108_eth_of_init(void)
{
struct device_node *np;
@@ -60127,7 +60127,7 @@
struct resource r[2];
struct device_node *phy, *mdio;
hw_info tsi_eth_data;
-@@ -98,7 +96,7 @@
+@@ -98,7 +96,7 @@ static int __init tsi108_eth_of_init(voi
__FUNCTION__,r[1].name, r[1].start, r[1].end);
tsi_eth_dev =
@@ -60136,7 +60136,7 @@
1);
if (IS_ERR(tsi_eth_dev)) {
-@@ -154,6 +152,7 @@
+@@ -154,6 +152,7 @@ static int __init tsi108_eth_of_init(voi
unreg:
platform_device_unregister(tsi_eth_dev);
err:
@@ -60146,7 +60146,7 @@
--- a/arch/powerpc/sysdev/uic.c
+++ b/arch/powerpc/sysdev/uic.c
-@@ -53,21 +53,23 @@
+@@ -53,21 +53,23 @@ struct uic {
/* The remapper for this UIC */
struct irq_host *irqhost;
@@ -60175,7 +60175,7 @@
mtdcr(uic->dcrbase + UIC_ER, er);
spin_unlock_irqrestore(&uic->lock, flags);
}
-@@ -99,6 +101,7 @@
+@@ -99,6 +101,7 @@ static void uic_ack_irq(unsigned int vir
static void uic_mask_ack_irq(unsigned int virq)
{
@@ -60183,7 +60183,7 @@
struct uic *uic = get_irq_chip_data(virq);
unsigned int src = uic_irq_to_hw(virq);
unsigned long flags;
-@@ -109,7 +112,16 @@
+@@ -109,7 +112,16 @@ static void uic_mask_ack_irq(unsigned in
er = mfdcr(uic->dcrbase + UIC_ER);
er &= ~sr;
mtdcr(uic->dcrbase + UIC_ER, er);
@@ -60201,7 +60201,7 @@
spin_unlock_irqrestore(&uic->lock, flags);
}
-@@ -173,64 +185,6 @@
+@@ -173,64 +185,6 @@ static struct irq_chip uic_irq_chip = {
.set_type = uic_set_irq_type,
};
@@ -60266,7 +60266,7 @@
static int uic_host_map(struct irq_host *h, unsigned int virq,
irq_hw_number_t hw)
{
-@@ -239,7 +193,7 @@
+@@ -239,7 +193,7 @@ static int uic_host_map(struct irq_host
set_irq_chip_data(virq, uic);
/* Despite the name, handle_level_irq() works for both level
* and edge irqs on UIC. FIXME: check this is correct */
@@ -60275,7 +60275,7 @@
/* Set default irq type */
set_irq_type(virq, IRQ_TYPE_NONE);
-@@ -264,23 +218,36 @@
+@@ -264,23 +218,36 @@ static struct irq_host_ops uic_host_ops
.xlate = uic_host_xlate,
};
@@ -60316,7 +60316,7 @@
}
static struct uic * __init uic_init_one(struct device_node *node)
-@@ -342,33 +309,27 @@
+@@ -342,33 +309,27 @@ void __init uic_init_tree(void)
const u32 *interrupts;
/* First locate and initialize the top-level UIC */
@@ -60354,7 +60354,7 @@
uic = uic_init_one(np);
if (! uic)
-@@ -377,20 +338,11 @@
+@@ -377,20 +338,11 @@ void __init uic_init_tree(void)
cascade_virq = irq_of_parse_and_map(np, 0);
@@ -60379,7 +60379,7 @@
--- a/arch/powerpc/sysdev/xilinx_intc.c
+++ b/arch/powerpc/sysdev/xilinx_intc.c
-@@ -135,10 +135,16 @@
+@@ -135,10 +135,16 @@ void __init xilinx_intc_init_tree(void)
struct device_node *np;
/* find top level interrupt controller */
@@ -60477,7 +60477,7 @@
#ifdef CONFIG_PPC64
#include <asm/hvcall.h>
-@@ -71,12 +72,9 @@
+@@ -71,12 +72,9 @@ static unsigned long ncsum = 4096;
static int termch;
static char tmpstr[128];
@@ -60490,7 +60490,7 @@
/* Breakpoint stuff */
struct bpt {
-@@ -153,13 +151,15 @@
+@@ -153,13 +151,15 @@ static const char *getvecname(unsigned l
static int do_spu_cmd(void);
@@ -60508,7 +60508,7 @@
extern void xmon_save_regs(struct pt_regs *);
#ifdef CONFIG_PPC64
-@@ -231,6 +231,9 @@
+@@ -231,6 +231,9 @@ Commands:\n\
#ifdef CONFIG_PPC_STD_MMU_32
" u dump segment registers\n"
#endif
@@ -60518,7 +60518,7 @@
" ? help\n"
" zr reboot\n\
zh halt\n"
-@@ -856,6 +859,11 @@
+@@ -856,6 +859,11 @@ cmds(struct pt_regs *excp)
dump_segments();
break;
#endif
@@ -60530,7 +60530,7 @@
default:
printf("Unrecognized command: ");
do {
-@@ -2527,16 +2535,33 @@
+@@ -2527,16 +2535,33 @@ static void xmon_print_symbol(unsigned l
static void dump_slb(void)
{
int i;
@@ -60571,7 +60571,7 @@
}
}
-@@ -2581,6 +2606,32 @@
+@@ -2581,6 +2606,32 @@ void dump_segments(void)
}
#endif
@@ -60606,7 +60606,7 @@
#ifdef CONFIG_PPC_ISERIES
--- a/arch/ppc/kernel/Makefile
+++ b/arch/ppc/kernel/Makefile
-@@ -13,7 +13,6 @@
+@@ -13,7 +13,6 @@ obj-y := entry.o traps.o time.o misc.
ppc_htab.o
obj-$(CONFIG_MODULES) += ppc_ksyms.o
obj-$(CONFIG_PCI) += pci.o
@@ -60616,7 +60616,7 @@
obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o
--- a/arch/ppc/kernel/head_44x.S
+++ b/arch/ppc/kernel/head_44x.S
-@@ -195,7 +195,7 @@
+@@ -195,7 +195,7 @@ skpinv: addi r4,r4,1 /* Increment */
li r5,0
ori r5,r5,(PPC44x_TLB_SW | PPC44x_TLB_SR | PPC44x_TLB_I | PPC44x_TLB_G)
@@ -60692,7 +60692,7 @@
defined(CONFIG_MPC10X_BRIDGE) || defined(CONFIG_8260) || \
--- a/arch/ppc/kernel/traps.c
+++ b/arch/ppc/kernel/traps.c
-@@ -231,39 +231,25 @@
+@@ -231,39 +231,25 @@ platform_machine_check(struct pt_regs *r
{
}
@@ -60742,7 +60742,7 @@
printk("Machine check in kernel mode.\n");
if (reason & ESR_IMCP){
printk("Instruction Synchronous Machine Check exception\n");
-@@ -293,7 +279,13 @@
+@@ -293,7 +279,13 @@ void machine_check_exception(struct pt_r
/* Clear MCSR */
mtspr(SPRN_MCSR, mcsr);
}
@@ -60757,7 +60757,7 @@
printk("Machine check in kernel mode.\n");
printk("Caused by (from MCSR=%lx): ", reason);
-@@ -305,8 +297,6 @@
+@@ -305,8 +297,6 @@ void machine_check_exception(struct pt_r
printk("Data Cache Push Parity Error\n");
if (reason & MCSR_DCPERR)
printk("Data Cache Parity Error\n");
@@ -60766,7 +60766,7 @@
if (reason & MCSR_BUS_IAERR)
printk("Bus - Instruction Address Error\n");
if (reason & MCSR_BUS_RAERR)
-@@ -318,12 +308,19 @@
+@@ -318,12 +308,19 @@ void machine_check_exception(struct pt_r
if (reason & MCSR_BUS_RBERR)
printk("Bus - Read Data Bus Error\n");
if (reason & MCSR_BUS_WBERR)
@@ -60788,7 +60788,7 @@
printk("Machine check in kernel mode.\n");
printk("Caused by (from MCSR=%lx): ", reason);
-@@ -341,7 +338,14 @@
+@@ -341,7 +338,14 @@ void machine_check_exception(struct pt_r
printk("Bus - Read Bus Error on data load\n");
if (reason & MCSR_BUS_WRERR)
printk("Bus - Write Bus Error on buffered store or cache line push\n");
@@ -60804,7 +60804,7 @@
printk("Machine check in kernel mode.\n");
printk("Caused by (from SRR1=%lx): ", reason);
switch (reason & 0x601F0000) {
-@@ -371,7 +375,39 @@
+@@ -371,7 +375,39 @@ void machine_check_exception(struct pt_r
default:
printk("Unknown values in msr\n");
}
@@ -60847,7 +60847,7 @@
* Optional platform-provided routine to print out
--- a/arch/ppc/mm/44x_mmu.c
+++ b/arch/ppc/mm/44x_mmu.c
-@@ -60,38 +60,28 @@
+@@ -60,38 +60,28 @@ extern char etext[], _stext[];
* Just needed it declared someplace.
*/
unsigned int tlb_44x_index = 0;
@@ -60896,7 +60896,7 @@
void __init MMU_init_hw(void)
{
flush_instruction_cache();
-@@ -99,22 +89,13 @@
+@@ -99,22 +89,13 @@ void __init MMU_init_hw(void)
unsigned long __init mmu_mapin_ram(void)
{
@@ -60936,7 +60936,7 @@
#include <platforms/85xx/mpc85xx_ads_common.h>
#ifndef CONFIG_PCI
-@@ -190,6 +188,7 @@
+@@ -190,6 +188,7 @@ mpc85xx_exclude_device(u_char bus, u_cha
#endif /* CONFIG_PCI */
#ifdef CONFIG_RAPIDIO
@@ -60959,7 +60959,7 @@
unsigned char __res[sizeof(bd_t)];
-@@ -271,6 +269,7 @@
+@@ -271,6 +269,7 @@ int mpc85xx_exclude_device(u_char bus, u
#endif /* CONFIG_PCI */
#ifdef CONFIG_RAPIDIO
@@ -60977,7 +60977,7 @@
#ifndef CONFIG_PCI
unsigned long isa_io_base = 0;
-@@ -309,6 +308,7 @@
+@@ -309,6 +308,7 @@ int mpc85xx_exclude_device(u_char bus, u
#endif /* CONFIG_PCI */
#ifdef CONFIG_RAPIDIO
@@ -60987,7 +60987,7 @@
/* 512MB RIO LAW at 0xc0000000 */
--- a/arch/ppc/platforms/ev64260.c
+++ b/arch/ppc/platforms/ev64260.c
-@@ -336,7 +336,7 @@
+@@ -336,7 +336,7 @@ ev64260_early_serial_map(void)
#endif
if (early_serial_setup(&port) != 0)
@@ -60996,7 +60996,7 @@
"failed\n");
first_time = 0;
-@@ -388,7 +388,7 @@
+@@ -388,7 +388,7 @@ ev64260_setup_arch(void)
ev64260_early_serial_map();
#endif
@@ -61007,7 +61007,7 @@
if (ppc_md.progress)
--- a/arch/ppc/platforms/prep_pci.c
+++ b/arch/ppc/platforms/prep_pci.c
-@@ -1099,7 +1099,6 @@
+@@ -1099,7 +1099,6 @@ prep_pib_init(void)
pci_write_config_byte(dev, 0x43, reg);
}
}
@@ -61017,7 +61017,7 @@
if ((dev = pci_get_device(PCI_VENDOR_ID_WINBOND,
--- a/arch/ppc/syslib/Makefile
+++ b/arch/ppc/syslib/Makefile
-@@ -93,7 +93,6 @@
+@@ -93,7 +93,6 @@ obj-$(CONFIG_85xx) += open_pic.o ppc85x
ifeq ($(CONFIG_85xx),y)
obj-$(CONFIG_PCI) += pci_auto.o
endif
@@ -61057,7 +61057,7 @@
#include <linux/interrupt.h>
--- a/arch/ppc/syslib/ocp.c
+++ b/arch/ppc/syslib/ocp.c
-@@ -376,7 +376,7 @@
+@@ -376,7 +376,7 @@ ocp_remove_one_device(unsigned int vendo
down_write(&ocp_devices_sem);
dev = __ocp_find_device(vendor, function, index);
@@ -62036,7 +62036,7 @@
-#endif /* __PPC_SYSLIB_PPC85XX_RIO_H */
--- a/arch/ppc/syslib/ppc8xx_pic.c
+++ b/arch/ppc/syslib/ppc8xx_pic.c
-@@ -16,7 +16,7 @@
+@@ -16,7 +16,7 @@ extern int cpm_get_irq(void);
* the only interrupt controller. Some boards, like the MBX and
* Sandpoint have the 8259 as a secondary controller. Depending
* upon the processor type, the internal controller can have as
@@ -62047,7 +62047,7 @@
*/
--- a/arch/ppc/syslib/ppc_sys.c
+++ b/arch/ppc/syslib/ppc_sys.c
-@@ -185,7 +185,7 @@
+@@ -185,7 +185,7 @@ void platform_notify_map(const struct pl
*/
/*
@@ -62068,7 +62068,7 @@
#include <asm/delay.h>
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
-@@ -607,13 +607,23 @@
+@@ -607,13 +607,23 @@ config PATA_WINBOND_VLB
config PATA_PLATFORM
tristate "Generic platform device PATA support"
@@ -62095,7 +62095,7 @@
depends on ARM && ARCH_ACORN
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
-@@ -67,6 +67,7 @@
+@@ -67,6 +67,7 @@ obj-$(CONFIG_PATA_IXP4XX_CF) += pata_ixp
obj-$(CONFIG_PATA_SCC) += pata_scc.o
obj-$(CONFIG_PATA_BF54X) += pata_bf54x.o
obj-$(CONFIG_PATA_PLATFORM) += pata_platform.o
@@ -62222,7 +62222,7 @@
+MODULE_LICENSE("GPL");
--- a/drivers/ata/pata_platform.c
+++ b/drivers/ata/pata_platform.c
-@@ -93,14 +93,9 @@
+@@ -93,14 +93,9 @@ static struct ata_port_operations pata_p
};
static void pata_platform_setup_port(struct ata_ioports *ioaddr,
@@ -62238,7 +62238,7 @@
ioaddr->data_addr = ioaddr->cmd_addr + (ATA_REG_DATA << shift);
ioaddr->error_addr = ioaddr->cmd_addr + (ATA_REG_ERR << shift);
ioaddr->feature_addr = ioaddr->cmd_addr + (ATA_REG_FEATURE << shift);
-@@ -114,8 +109,13 @@
+@@ -114,8 +109,13 @@ static void pata_platform_setup_port(str
}
/**
@@ -62254,7 +62254,7 @@
*
* Register a platform bus IDE interface. Such interfaces are PIO and we
* assume do not support IRQ sharing.
-@@ -135,42 +135,18 @@
+@@ -135,42 +135,18 @@ static void pata_platform_setup_port(str
*
* If no IRQ resource is present, PIO polling mode is used instead.
*/
@@ -62305,7 +62305,7 @@
/*
* Check for MMIO
-@@ -181,20 +157,21 @@
+@@ -181,20 +157,21 @@ static int __devinit pata_platform_probe
/*
* And the IRQ
*/
@@ -62332,7 +62332,7 @@
ap->flags |= ATA_FLAG_SLAVE_POSS;
/*
-@@ -209,25 +186,24 @@
+@@ -209,25 +186,24 @@ static int __devinit pata_platform_probe
* Handle the MMIO case
*/
if (mmio) {
@@ -62364,7 +62364,7 @@
ata_port_desc(ap, "%s cmd 0x%llx ctl 0x%llx", mmio ? "mmio" : "ioport",
(unsigned long long)io_res->start,
-@@ -235,26 +211,78 @@
+@@ -235,26 +211,78 @@ static int __devinit pata_platform_probe
/* activate */
return ata_host_activate(host, irq, irq ? ata_interrupt : NULL,
@@ -62451,7 +62451,7 @@
.probe = pata_platform_probe,
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
-@@ -98,7 +98,7 @@
+@@ -98,7 +98,7 @@ config HW_RANDOM_PASEMI
default HW_RANDOM
---help---
This driver provides kernel-side support for the Random Number
@@ -62462,7 +62462,7 @@
module will be called pasemi-rng.
--- a/drivers/char/hw_random/pasemi-rng.c
+++ b/drivers/char/hw_random/pasemi-rng.c
-@@ -126,10 +126,9 @@
+@@ -126,10 +126,9 @@ static int __devexit rng_remove(struct o
}
static struct of_device_id rng_match[] = {
@@ -62478,7 +62478,7 @@
static struct of_platform_driver rng_driver = {
--- a/drivers/edac/pasemi_edac.c
+++ b/drivers/edac/pasemi_edac.c
-@@ -225,7 +225,7 @@
+@@ -225,7 +225,7 @@ static int __devinit pasemi_edac_probe(s
EDAC_FLAG_NONE;
mci->mod_name = MODULE_NAME;
mci->dev_name = pci_name(pdev);
@@ -62487,7 +62487,7 @@
mci->edac_check = pasemi_edac_check;
mci->ctl_page_to_phys = NULL;
pci_read_config_dword(pdev, MCCFG_SCRUB, &scrub);
-@@ -297,4 +297,4 @@
+@@ -297,4 +297,4 @@ module_exit(pasemi_edac_exit);
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Egor Martovetsky <egor@pasemi.com>");
@@ -62503,7 +62503,7 @@
#include <asm/uaccess.h>
#include <asm/semaphore.h>
-@@ -82,21 +83,11 @@
+@@ -82,21 +83,11 @@ struct adb_driver *adb_controller;
BLOCKING_NOTIFIER_HEAD(adb_client_list);
static int adb_got_sleep;
static int adb_inited;
@@ -62525,7 +62525,7 @@
static int adb_scan_bus(void);
static int do_adb_reset_bus(void);
static void adbdev_init(void);
-@@ -134,16 +125,6 @@
+@@ -134,16 +125,6 @@ static void printADBreply(struct adb_req
}
#endif
@@ -62542,7 +62542,7 @@
static int adb_scan_bus(void)
{
int i, highFree=0, noMovement;
-@@ -248,13 +229,10 @@
+@@ -248,13 +229,10 @@ static int adb_scan_bus(void)
static int
adb_probe_task(void *x)
{
@@ -62556,7 +62556,7 @@
up(&adb_probe_mutex);
return 0;
-@@ -263,7 +241,7 @@
+@@ -263,7 +241,7 @@ adb_probe_task(void *x)
static void
__adb_probe_task(struct work_struct *bullshit)
{
@@ -62565,7 +62565,7 @@
}
static DECLARE_WORK(adb_reset_work, __adb_probe_task);
-@@ -281,6 +259,36 @@
+@@ -281,6 +259,36 @@ adb_reset_bus(void)
return 0;
}
@@ -62602,7 +62602,7 @@
int __init adb_init(void)
{
struct adb_driver *driver;
-@@ -313,15 +321,12 @@
+@@ -313,15 +321,12 @@ int __init adb_init(void)
printk(KERN_WARNING "Warning: no ADB interface detected\n");
adb_controller = NULL;
} else {
@@ -62619,7 +62619,7 @@
adbdev_init();
adb_reset_bus();
}
-@@ -330,33 +335,6 @@
+@@ -330,33 +335,6 @@ int __init adb_init(void)
__initcall(adb_init);
@@ -62653,7 +62653,7 @@
static int
do_adb_reset_bus(void)
{
-@@ -373,7 +351,7 @@
+@@ -373,7 +351,7 @@ do_adb_reset_bus(void)
if (sleepy_trackpad) {
/* Let the trackpad settle down */
@@ -62662,7 +62662,7 @@
}
down(&adb_handler_sem);
-@@ -389,7 +367,7 @@
+@@ -389,7 +367,7 @@ do_adb_reset_bus(void)
if (sleepy_trackpad) {
/* Let the trackpad settle down */
@@ -62671,7 +62671,7 @@
}
if (!ret) {
-@@ -413,41 +391,27 @@
+@@ -413,41 +391,27 @@ adb_poll(void)
adb_controller->poll();
}
@@ -62720,7 +62720,7 @@
req->nbytes = nbytes+1;
req->done = done;
req->reply_expected = flags & ADBREQ_REPLY;
-@@ -460,25 +424,18 @@
+@@ -460,25 +424,18 @@ adb_request(struct adb_request *req, voi
if (flags & ADBREQ_NOSEND)
return 0;
@@ -62758,7 +62758,7 @@
return rc;
}
-@@ -864,7 +821,29 @@
+@@ -864,7 +821,29 @@ static const struct file_operations adb_
.release = adb_release,
};
@@ -62789,7 +62789,7 @@
adbdev_init(void)
{
if (register_chrdev(ADB_MAJOR, "adb", &adb_fops)) {
-@@ -876,4 +855,7 @@
+@@ -876,4 +855,7 @@ adbdev_init(void)
if (IS_ERR(adb_dev_class))
return;
class_device_create(adb_dev_class, NULL, MKDEV(ADB_MAJOR, 0), NULL, "adb");
@@ -62815,7 +62815,7 @@
#ifdef MB_DEBUG
#define MBDBG(fmt, arg...) printk(KERN_INFO fmt , ## arg)
-@@ -622,12 +622,7 @@
+@@ -622,12 +622,7 @@ static int media_bay_task(void *x)
{
int i;
@@ -62829,7 +62829,7 @@
for (i = 0; i < media_bay_count; ++i) {
down(&media_bays[i].lock);
if (!media_bays[i].sleeping)
-@@ -636,9 +631,8 @@
+@@ -636,9 +631,8 @@ static int media_bay_task(void *x)
}
msleep_interruptible(MB_POLL_DELAY);
@@ -62840,7 +62840,7 @@
}
static int __devinit media_bay_attach(struct macio_dev *mdev, const struct of_device_id *match)
-@@ -699,7 +693,7 @@
+@@ -699,7 +693,7 @@ static int __devinit media_bay_attach(st
/* Startup kernel thread */
if (i == 0)
@@ -62851,7 +62851,7 @@
--- a/drivers/macintosh/therm_adt746x.c
+++ b/drivers/macintosh/therm_adt746x.c
-@@ -553,6 +553,7 @@
+@@ -553,6 +553,7 @@ thermostat_init(void)
struct device_node* np;
const u32 *prop;
int i = 0, offset = 0;
@@ -62859,7 +62859,7 @@
np = of_find_node_by_name(NULL, "fan");
if (!np)
-@@ -612,17 +613,20 @@
+@@ -612,17 +613,20 @@ thermostat_init(void)
return -ENODEV;
}
@@ -62900,7 +62900,7 @@
#include <asm/prom.h>
#include <asm/machdep.h>
#include <asm/io.h>
-@@ -161,7 +162,7 @@
+@@ -161,7 +162,7 @@ static struct slots_pid_state slots_sta
static int state;
static int cpu_count;
static int cpu_pid_type;
@@ -62909,7 +62909,7 @@
static struct completion ctrl_complete;
static int critical_state;
static int rackmac;
-@@ -1156,6 +1157,8 @@
+@@ -1156,6 +1157,8 @@ static void do_monitor_cpu_rack(struct c
*/
static int init_cpu_state(struct cpu_pid_state *state, int index)
{
@@ -62918,7 +62918,7 @@
state->index = index;
state->first = 1;
state->rpm = (cpu_pid_type == CPU_PID_TYPE_RACKMAC) ? 4000 : 1000;
-@@ -1181,18 +1184,21 @@
+@@ -1181,18 +1184,21 @@ static int init_cpu_state(struct cpu_pid
DBG("CPU %d Using %d power history entries\n", index, state->count_power);
if (index == 0) {
@@ -62951,7 +62951,7 @@
return 0;
fail:
-@@ -1328,6 +1334,7 @@
+@@ -1328,6 +1334,7 @@ static int init_backside_state(struct ba
{
struct device_node *u3;
int u3h = 1; /* conservative by default */
@@ -62959,7 +62959,7 @@
/*
* There are different PID params for machines with U3 and machines
-@@ -1379,8 +1386,11 @@
+@@ -1379,8 +1386,11 @@ static int init_backside_state(struct ba
if (state->monitor == NULL)
return -ENODEV;
@@ -62973,7 +62973,7 @@
return 0;
}
-@@ -1491,6 +1501,8 @@
+@@ -1491,6 +1501,8 @@ static void do_monitor_drives(struct dri
*/
static int init_drives_state(struct drives_pid_state *state)
{
@@ -62982,7 +62982,7 @@
state->ticks = 1;
state->first = 1;
state->rpm = 1000;
-@@ -1499,8 +1511,11 @@
+@@ -1499,8 +1511,11 @@ static int init_drives_state(struct driv
if (state->monitor == NULL)
return -ENODEV;
@@ -62996,7 +62996,7 @@
return 0;
}
-@@ -1621,7 +1636,9 @@
+@@ -1621,7 +1636,9 @@ static int init_dimms_state(struct dimm_
if (state->monitor == NULL)
return -ENODEV;
@@ -63007,7 +63007,7 @@
return 0;
}
-@@ -1731,6 +1748,8 @@
+@@ -1731,6 +1748,8 @@ static void do_monitor_slots(struct slot
*/
static int init_slots_state(struct slots_pid_state *state)
{
@@ -63016,7 +63016,7 @@
state->ticks = 1;
state->first = 1;
state->pwm = 50;
-@@ -1739,8 +1758,11 @@
+@@ -1739,8 +1758,11 @@ static int init_slots_state(struct slots
if (state->monitor == NULL)
return -ENODEV;
@@ -63030,7 +63030,7 @@
return 0;
}
-@@ -1779,8 +1801,6 @@
+@@ -1779,8 +1801,6 @@ static int call_critical_overtemp(void)
*/
static int main_control_loop(void *x)
{
@@ -63039,7 +63039,7 @@
DBG("main_control_loop started\n");
down(&driver_lock);
-@@ -1956,7 +1976,7 @@
+@@ -1956,7 +1976,7 @@ static void start_control_loops(void)
{
init_completion(&ctrl_complete);
@@ -63048,7 +63048,7 @@
}
/*
-@@ -1964,7 +1984,7 @@
+@@ -1964,7 +1984,7 @@ static void start_control_loops(void)
*/
static void stop_control_loops(void)
{
@@ -63067,7 +63067,7 @@
#include <asm/prom.h>
#include <asm/machdep.h>
-@@ -61,8 +62,7 @@
+@@ -61,8 +62,7 @@ I2C_CLIENT_INSMOD;
static struct {
volatile int running;
@@ -63077,7 +63077,7 @@
struct semaphore lock;
struct of_device *of_dev;
-@@ -223,6 +223,7 @@
+@@ -223,6 +223,7 @@ static void
setup_hardware( void )
{
int val;
@@ -63085,7 +63085,7 @@
/* save registers (if we unload the module) */
x.r0 = read_reg( x.fan, 0x00, 1 );
-@@ -265,8 +266,11 @@
+@@ -265,8 +266,11 @@ setup_hardware( void )
x.upind = -1;
/* tune_fan( fan_up_table[x.upind].fan_setting ); */
@@ -63099,7 +63099,7 @@
}
static void
-@@ -282,27 +286,27 @@
+@@ -282,27 +286,27 @@ restore_regs( void )
write_reg( x.fan, 0x00, x.r0, 1 );
}
@@ -63139,7 +63139,7 @@
}
-@@ -322,8 +326,7 @@
+@@ -322,8 +326,7 @@ do_attach( struct i2c_adapter *adapter )
ret = i2c_probe( adapter, &addr_data, &do_probe );
if( x.thermostat && x.fan ) {
x.running = 1;
@@ -63149,7 +63149,7 @@
}
}
return ret;
-@@ -339,7 +342,8 @@
+@@ -339,7 +342,8 @@ do_detach( struct i2c_client *client )
else {
if( x.running ) {
x.running = 0;
@@ -63161,7 +63161,7 @@
x.thermostat = NULL;
--- a/drivers/macintosh/via-pmu-backlight.c
+++ b/drivers/macintosh/via-pmu-backlight.c
-@@ -22,7 +22,7 @@
+@@ -22,7 +22,7 @@ static u8 bl_curve[FB_BACKLIGHT_LEVELS];
static void pmu_backlight_init_curve(u8 off, u8 min, u8 max)
{
@@ -63170,7 +63170,7 @@
bl_curve[0] = off;
-@@ -68,17 +68,11 @@
+@@ -68,17 +68,11 @@ static int pmu_backlight_get_level_brigh
return pmulevel;
}
@@ -63189,7 +63189,7 @@
if (bd->props.power != FB_BLANK_UNBLANK ||
bd->props.fb_blank != FB_BLANK_UNBLANK)
-@@ -99,12 +93,23 @@
+@@ -99,12 +93,23 @@ static int pmu_backlight_update_status(s
pmu_wait_complete(&req);
}
@@ -63216,7 +63216,7 @@
static int pmu_backlight_get_brightness(struct backlight_device *bd)
{
return bd->props.brightness;
-@@ -123,6 +128,16 @@
+@@ -123,6 +128,16 @@ void pmu_backlight_set_sleep(int sleep)
spin_lock_irqsave(&pmu_backlight_lock, flags);
sleeping = sleep;
@@ -63233,7 +63233,7 @@
spin_unlock_irqrestore(&pmu_backlight_lock, flags);
}
#endif /* CONFIG_PM */
-@@ -148,8 +163,8 @@
+@@ -148,8 +163,8 @@ void __init pmu_backlight_init()
bd = backlight_device_register(name, NULL, NULL, &pmu_backlight_data);
if (IS_ERR(bd)) {
@@ -63244,7 +63244,7 @@
}
bd->props.max_brightness = FB_BACKLIGHT_LEVELS - 1;
pmu_backlight_init_curve(0x7F, 0x46, 0x0E);
-@@ -171,10 +186,5 @@
+@@ -171,10 +186,5 @@ void __init pmu_backlight_init()
bd->props.power = FB_BLANK_UNBLANK;
backlight_update_status(bd);
@@ -63292,7 +63292,7 @@
/* Misc minor number allocated for /dev/pmu */
#define PMU_MINOR 154
-@@ -152,12 +147,9 @@
+@@ -152,12 +147,9 @@ static spinlock_t pmu_lock;
static u8 pmu_intr_mask;
static int pmu_version;
static int drop_interrupts;
@@ -63307,7 +63307,7 @@
static unsigned long async_req_locks;
static unsigned int pmu_irq_stats[11];
-@@ -177,7 +169,6 @@
+@@ -177,7 +169,6 @@ static struct proc_dir_entry *proc_pmu_b
int __fake_sleep;
int asleep;
@@ -63315,7 +63315,7 @@
#ifdef CONFIG_ADB
static int adb_dev_map;
-@@ -224,7 +215,7 @@
+@@ -224,7 +215,7 @@ extern void enable_kernel_fp(void);
#ifdef DEBUG_SLEEP
int pmu_polled_request(struct adb_request *req);
@@ -63324,7 +63324,7 @@
#endif
/*
-@@ -875,7 +866,7 @@
+@@ -875,7 +866,7 @@ proc_read_options(char *page, char **sta
{
char *p = page;
@@ -63333,7 +63333,7 @@
if (pmu_kind == PMU_KEYLARGO_BASED &&
pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,-1) >= 0)
p += sprintf(p, "lid_wakeup=%d\n", option_lid_wakeup);
-@@ -916,7 +907,7 @@
+@@ -916,7 +907,7 @@ proc_write_options(struct file *file, co
*(val++) = 0;
while(*val == ' ')
val++;
@@ -63342,7 +63342,7 @@
if (pmu_kind == PMU_KEYLARGO_BASED &&
pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,-1) >= 0)
if (!strcmp(label, "lid_wakeup"))
-@@ -1256,9 +1247,7 @@
+@@ -1256,9 +1247,7 @@ void
pmu_suspend(void)
{
unsigned long flags;
@@ -63353,7 +63353,7 @@
if (!via)
return;
-@@ -1276,17 +1265,10 @@
+@@ -1276,17 +1265,10 @@ pmu_suspend(void)
via_pmu_interrupt(0, NULL);
spin_lock_irqsave(&pmu_lock, flags);
if (!adb_int_pending && pmu_state == idle && !req_awaiting_reply) {
@@ -63371,7 +63371,7 @@
break;
}
} while (1);
-@@ -1307,18 +1289,11 @@
+@@ -1307,18 +1289,11 @@ pmu_resume(void)
return;
}
adb_int_pending = 1;
@@ -63390,7 +63390,7 @@
}
/* Interrupt data could be the result data from an ADB cmd */
-@@ -1738,228 +1713,7 @@
+@@ -1738,228 +1713,7 @@ pmu_present(void)
return via != 0;
}
@@ -63620,7 +63620,7 @@
/*
* Put the powerbook to sleep.
*/
-@@ -1994,134 +1748,6 @@
+@@ -1994,134 +1748,6 @@ restore_via_state(void)
out_8(&via[IER], IER_SET | SR_INT | CB1_INT);
}
@@ -63755,7 +63755,7 @@
#define GRACKLE_PM (1<<7)
#define GRACKLE_DOZE (1<<5)
#define GRACKLE_NAP (1<<4)
-@@ -2132,19 +1758,12 @@
+@@ -2132,19 +1758,12 @@ static int powerbook_sleep_grackle(void)
unsigned long save_l2cr;
unsigned short pmcr1;
struct adb_request req;
@@ -63775,7 +63775,7 @@
/* Turn off various things. Darwin does some retry tests here... */
pmu_request(&req, NULL, 2, PMU_POWER_CTRL0, PMU_POW0_OFF|PMU_POW0_HARD_DRIVE);
pmu_wait_complete(&req);
-@@ -2207,8 +1826,6 @@
+@@ -2207,8 +1826,6 @@ static int powerbook_sleep_grackle(void)
PMU_POW_ON|PMU_POW_BACKLIGHT|PMU_POW_CHARGER|PMU_POW_IRLED|PMU_POW_MEDIABAY);
pmu_wait_complete(&req);
@@ -63784,7 +63784,7 @@
return 0;
}
-@@ -2218,7 +1835,6 @@
+@@ -2218,7 +1835,6 @@ powerbook_sleep_Core99(void)
unsigned long save_l2cr;
unsigned long save_l3cr;
struct adb_request req;
@@ -63792,7 +63792,7 @@
if (pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,-1) < 0) {
printk(KERN_ERR "Sleep mode not supported on this machine\n");
-@@ -2228,12 +1844,6 @@
+@@ -2228,12 +1844,6 @@ powerbook_sleep_Core99(void)
if (num_online_cpus() > 1 || cpu_is_offline(0))
return -EAGAIN;
@@ -63805,7 +63805,7 @@
/* Stop environment and ADB interrupts */
pmu_request(&req, NULL, 2, PMU_SET_INTR_MASK, 0);
pmu_wait_complete(&req);
-@@ -2304,45 +1914,33 @@
+@@ -2304,45 +1914,33 @@ powerbook_sleep_Core99(void)
/* Restore LPJ, cpufreq will adjust the cpu frequency */
loops_per_jiffy /= 2;
@@ -63866,7 +63866,7 @@
/* Set the memory controller to keep the memory refreshed
while we're asleep */
-@@ -2357,41 +1955,34 @@
+@@ -2357,41 +1955,34 @@ powerbook_sleep_3400(void)
/* Ask the PMU to put us to sleep */
pmu_request(&sleep_req, NULL, 5, PMU_SLEEP, 'M', 'A', 'T', 'T');
@@ -63921,7 +63921,7 @@
/*
* Support for /dev/pmu device
-@@ -2548,7 +2139,6 @@
+@@ -2548,7 +2139,6 @@ pmu_release(struct inode *inode, struct
struct pmu_private *pp = file->private_data;
unsigned long flags;
@@ -63929,7 +63929,7 @@
if (pp != 0) {
file->private_data = NULL;
spin_lock_irqsave(&all_pvt_lock, flags);
-@@ -2562,10 +2152,96 @@
+@@ -2562,10 +2152,96 @@ pmu_release(struct inode *inode, struct
kfree(pp);
}
@@ -64027,7 +64027,7 @@
static int
pmu_ioctl(struct inode * inode, struct file *filp,
u_int cmd, u_long arg)
-@@ -2574,35 +2250,15 @@
+@@ -2574,35 +2250,15 @@ pmu_ioctl(struct inode * inode, struct f
int error = -EINVAL;
switch (cmd) {
@@ -64065,7 +64065,7 @@
#ifdef CONFIG_PMAC_BACKLIGHT_LEGACY
/* Compatibility ioctl's for backlight */
-@@ -2610,9 +2266,6 @@
+@@ -2610,9 +2266,6 @@ pmu_ioctl(struct inode * inode, struct f
{
int brightness;
@@ -64075,7 +64075,7 @@
brightness = pmac_backlight_get_legacy_brightness();
if (brightness < 0)
return brightness;
-@@ -2624,9 +2277,6 @@
+@@ -2624,9 +2277,6 @@ pmu_ioctl(struct inode * inode, struct f
{
int brightness;
@@ -64085,7 +64085,7 @@
error = get_user(brightness, argp);
if (error)
return error;
-@@ -2751,15 +2401,43 @@
+@@ -2751,15 +2401,43 @@ pmu_polled_request(struct adb_request *r
local_irq_restore(flags);
return 0;
}
@@ -64134,7 +64134,7 @@
int pmu_sys_suspended;
static int pmu_sys_suspend(struct sys_device *sysdev, pm_message_t state)
-@@ -2767,10 +2445,15 @@
+@@ -2767,10 +2445,15 @@ static int pmu_sys_suspend(struct sys_de
if (state.event != PM_EVENT_SUSPEND || pmu_sys_suspended)
return 0;
@@ -64152,7 +64152,7 @@
return 0;
}
-@@ -2785,15 +2468,18 @@
+@@ -2785,15 +2468,18 @@ static int pmu_sys_resume(struct sys_dev
pmu_request(&req, NULL, 2, PMU_SYSTEM_READY, 2);
pmu_wait_complete(&req);
@@ -64173,7 +64173,7 @@
static struct sysdev_class pmu_sysclass = {
set_kset_name("pmu"),
-@@ -2804,10 +2490,10 @@
+@@ -2804,10 +2490,10 @@ static struct sys_device device_pmu = {
};
static struct sysdev_driver driver_pmu = {
@@ -64186,7 +64186,7 @@
};
static int __init init_pmu_sysfs(void)
-@@ -2842,10 +2528,10 @@
+@@ -2842,10 +2528,10 @@ EXPORT_SYMBOL(pmu_wait_complete);
EXPORT_SYMBOL(pmu_suspend);
EXPORT_SYMBOL(pmu_resume);
EXPORT_SYMBOL(pmu_unlock);
@@ -64201,7 +64201,7 @@
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
-@@ -1178,8 +1178,15 @@
+@@ -1178,8 +1178,15 @@ static int __devinit find_phy(struct dev
struct device_node *phynode, *mdionode;
struct resource res;
int ret = 0, len;
@@ -64275,7 +64275,7 @@
#include <asm/io.h>
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -61,34 +61,12 @@
+@@ -61,34 +61,12 @@ config ICPLUS_PHY
Currently supports the IP175C PHY.
config FIXED_PHY
@@ -64850,7 +64850,7 @@
+MODULE_LICENSE("GPL");
--- a/drivers/net/ps3_gelic_net.c
+++ b/drivers/net/ps3_gelic_net.c
-@@ -58,11 +58,11 @@
+@@ -58,11 +58,11 @@ static inline struct device *ctodev(stru
{
return &card->dev->core;
}
@@ -64866,7 +64866,7 @@
}
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
-@@ -3822,6 +3822,7 @@
+@@ -3822,6 +3822,7 @@ static int ucc_geth_probe(struct of_devi
int err, ucc_num, max_speed = 0;
const phandle *ph;
const unsigned int *prop;
@@ -64874,7 +64874,7 @@
const void *mac_addr;
phy_interface_t phy_interface;
static const int enet_to_speed[] = {
-@@ -3854,10 +3855,56 @@
+@@ -3854,10 +3855,56 @@ static int ucc_geth_probe(struct of_devi
ug_info->uf_info.ucc_num = ucc_num;
@@ -64937,7 +64937,7 @@
return -EINVAL;
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
-@@ -273,3 +273,61 @@
+@@ -273,3 +273,61 @@ struct device_node *of_find_compatible_n
return np;
}
EXPORT_SYMBOL(of_find_compatible_node);
@@ -65039,7 +65039,7 @@
* @ids: array of of device match structures to search in
--- a/drivers/ps3/Makefile
+++ b/drivers/ps3/Makefile
-@@ -4,3 +4,4 @@
+@@ -4,3 +4,4 @@ ps3av_mod-objs += ps3av.o ps3av_cmd.o
obj-$(CONFIG_PPC_PS3) += sys-manager-core.o
obj-$(CONFIG_PS3_SYS_MANAGER) += ps3-sys-manager.o
obj-$(CONFIG_PS3_STORAGE) += ps3stor_lib.o
@@ -66297,7 +66297,7 @@
+MODULE_ALIAS(PS3_MODULE_ALIAS_LPM);
--- a/drivers/ps3/ps3-sys-manager.c
+++ b/drivers/ps3/ps3-sys-manager.c
-@@ -452,7 +452,7 @@
+@@ -452,7 +452,7 @@ static int ps3_sys_manager_handle_event(
case PS3_SM_EVENT_THERMAL_ALERT:
dev_dbg(&dev->core, "%s:%d: THERMAL_ALERT (zone %u)\n",
__func__, __LINE__, event.value);
@@ -66306,7 +66306,7 @@
break;
case PS3_SM_EVENT_THERMAL_CLEARED:
dev_dbg(&dev->core, "%s:%d: THERMAL_CLEARED (zone %u)\n",
-@@ -488,7 +488,7 @@
+@@ -488,7 +488,7 @@ static int ps3_sys_manager_handle_cmd(st
result = ps3_vuart_read(dev, &cmd, sizeof(cmd));
BUG_ON(result && "need to retry here");
@@ -66315,7 +66315,7 @@
return result;
if (cmd.version != 1) {
-@@ -521,7 +521,7 @@
+@@ -521,7 +521,7 @@ static int ps3_sys_manager_handle_msg(st
result = ps3_vuart_read(dev, &header,
sizeof(struct ps3_sys_manager_header));
@@ -66324,7 +66324,7 @@
return result;
if (header.version != 1) {
-@@ -589,9 +589,9 @@
+@@ -589,9 +589,9 @@ static void ps3_sys_manager_final_power_
PS3_SM_WAKE_DEFAULT);
ps3_sys_manager_send_request_shutdown(dev);
@@ -66336,7 +66336,7 @@
ps3_sys_manager_handle_msg(dev);
}
-@@ -626,9 +626,9 @@
+@@ -626,9 +626,9 @@ static void ps3_sys_manager_final_restar
PS3_SM_WAKE_DEFAULT);
ps3_sys_manager_send_request_shutdown(dev);
@@ -66350,7 +66350,7 @@
--- a/drivers/ps3/ps3-vuart.c
+++ b/drivers/ps3/ps3-vuart.c
-@@ -108,18 +108,18 @@
+@@ -108,18 +108,18 @@ static struct ps3_vuart_port_priv *to_po
struct ports_bmp {
u64 status;
u64 unused[3];
@@ -66372,7 +66372,7 @@
{
#if defined(DEBUG)
static const char *strings[] = {
-@@ -363,7 +363,7 @@
+@@ -363,7 +363,7 @@ int ps3_vuart_disable_interrupt_disconne
*/
static int ps3_vuart_raw_write(struct ps3_system_bus_device *dev,
@@ -66381,7 +66381,7 @@
{
int result;
struct ps3_vuart_port_priv *priv = to_port_priv(dev);
-@@ -431,7 +431,7 @@
+@@ -431,7 +431,7 @@ void ps3_vuart_clear_rx_bytes(struct ps3
int result;
struct ps3_vuart_port_priv *priv = to_port_priv(dev);
u64 bytes_waiting;
@@ -66390,7 +66390,7 @@
result = ps3_vuart_get_rx_bytes_waiting(dev, &bytes_waiting);
-@@ -526,9 +526,8 @@
+@@ -526,9 +526,8 @@ int ps3_vuart_write(struct ps3_system_bu
lb = kmalloc(sizeof(struct list_buffer) + bytes, GFP_KERNEL);
@@ -66401,7 +66401,7 @@
memcpy(lb->data, buf, bytes);
lb->head = lb->data;
-@@ -878,7 +877,7 @@
+@@ -878,7 +877,7 @@ static int ps3_vuart_handle_port_interru
struct vuart_bus_priv {
struct ports_bmp *bmp;
unsigned int virq;
@@ -66410,7 +66410,7 @@
int use_count;
struct ps3_system_bus_device *devices[PORT_COUNT];
} static vuart_bus_priv;
-@@ -926,9 +925,8 @@
+@@ -926,9 +925,8 @@ static int ps3_vuart_bus_interrupt_get(v
BUG_ON(vuart_bus_priv.use_count > 2);
@@ -66421,7 +66421,7 @@
BUG_ON(vuart_bus_priv.bmp);
-@@ -1017,7 +1015,7 @@
+@@ -1017,7 +1015,7 @@ static int ps3_vuart_probe(struct ps3_sy
return -EINVAL;
}
@@ -66430,7 +66430,7 @@
result = ps3_vuart_bus_interrupt_get();
-@@ -1077,7 +1075,7 @@
+@@ -1077,7 +1075,7 @@ static int ps3_vuart_probe(struct ps3_sy
goto fail_probe;
}
@@ -66439,7 +66439,7 @@
return result;
-@@ -1090,7 +1088,7 @@
+@@ -1090,7 +1088,7 @@ fail_dev_malloc:
fail_busy:
ps3_vuart_bus_interrupt_put();
fail_setup_interrupt:
@@ -66448,7 +66448,7 @@
dev_dbg(&dev->core, "%s:%d: failed\n", __func__, __LINE__);
return result;
}
-@@ -1129,7 +1127,7 @@
+@@ -1129,7 +1127,7 @@ static int ps3_vuart_remove(struct ps3_s
BUG_ON(!dev);
@@ -66457,7 +66457,7 @@
dev_dbg(&dev->core, " -> %s:%d: match_id %d\n", __func__, __LINE__,
dev->match_id);
-@@ -1137,7 +1135,7 @@
+@@ -1137,7 +1135,7 @@ static int ps3_vuart_remove(struct ps3_s
if (!dev->core.driver) {
dev_dbg(&dev->core, "%s:%d: no driver bound\n", __func__,
__LINE__);
@@ -66466,7 +66466,7 @@
return 0;
}
-@@ -1160,7 +1158,7 @@
+@@ -1160,7 +1158,7 @@ static int ps3_vuart_remove(struct ps3_s
priv = NULL;
dev_dbg(&dev->core, " <- %s:%d\n", __func__, __LINE__);
@@ -66475,7 +66475,7 @@
return 0;
}
-@@ -1180,7 +1178,7 @@
+@@ -1180,7 +1178,7 @@ static int ps3_vuart_shutdown(struct ps3
BUG_ON(!dev);
@@ -66484,7 +66484,7 @@
dev_dbg(&dev->core, " -> %s:%d: match_id %d\n", __func__, __LINE__,
dev->match_id);
-@@ -1188,7 +1186,7 @@
+@@ -1188,7 +1186,7 @@ static int ps3_vuart_shutdown(struct ps3
if (!dev->core.driver) {
dev_dbg(&dev->core, "%s:%d: no driver bound\n", __func__,
__LINE__);
@@ -66493,7 +66493,7 @@
return 0;
}
-@@ -1212,7 +1210,7 @@
+@@ -1212,7 +1210,7 @@ static int ps3_vuart_shutdown(struct ps3
dev_dbg(&dev->core, " <- %s:%d\n", __func__, __LINE__);
@@ -66502,7 +66502,7 @@
return 0;
}
-@@ -1223,7 +1221,7 @@
+@@ -1223,7 +1221,7 @@ static int __init ps3_vuart_bus_init(voi
if (!firmware_has_feature(FW_FEATURE_PS3_LV1))
return -ENODEV;
@@ -66513,7 +66513,7 @@
}
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
-@@ -1284,4 +1284,14 @@
+@@ -1284,4 +1284,14 @@ config SERIAL_OF_PLATFORM
Currently, only 8250 compatible ports are supported, but
others can easily be added.
@@ -66530,7 +66530,7 @@
endmenu
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
-@@ -64,3 +64,4 @@
+@@ -64,3 +64,4 @@ obj-$(CONFIG_SERIAL_UARTLITE) += uartlit
obj-$(CONFIG_SERIAL_NETX) += netx-serial.o
obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o
obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
@@ -66567,7 +66567,7 @@
}
#else
void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd)
-@@ -171,9 +165,9 @@
+@@ -171,9 +165,9 @@ void scc2_lineif(struct uart_cpm_port *p
* really has to get out of the driver so boards can
* be supported in a sane fashion.
*/
@@ -66605,7 +66605,7 @@
#else
#include <linux/platform_device.h>
#endif
-@@ -111,16 +112,18 @@
+@@ -111,16 +112,18 @@ static void mpc52xx_uart_of_enumerate(vo
#endif
#define PSC(port) ((struct mpc52xx_psc __iomem *)((port)->membase))
@@ -66626,7 +66626,7 @@
#else
#define uart_console(port) (0)
#endif
-@@ -162,7 +165,7 @@
+@@ -162,7 +165,7 @@ mpc52xx_uart_stop_tx(struct uart_port *p
{
/* port->lock taken by caller */
port->read_status_mask &= ~MPC52xx_PSC_IMR_TXRDY;
@@ -66635,7 +66635,7 @@
}
static void
-@@ -170,7 +173,7 @@
+@@ -170,7 +173,7 @@ mpc52xx_uart_start_tx(struct uart_port *
{
/* port->lock taken by caller */
port->read_status_mask |= MPC52xx_PSC_IMR_TXRDY;
@@ -66644,7 +66644,7 @@
}
static void
-@@ -184,7 +187,7 @@
+@@ -184,7 +187,7 @@ mpc52xx_uart_send_xchar(struct uart_port
/* Make sure tx interrupts are on */
/* Truly necessary ??? They should be anyway */
port->read_status_mask |= MPC52xx_PSC_IMR_TXRDY;
@@ -66653,7 +66653,7 @@
}
spin_unlock_irqrestore(&port->lock, flags);
-@@ -195,7 +198,7 @@
+@@ -195,7 +198,7 @@ mpc52xx_uart_stop_rx(struct uart_port *p
{
/* port->lock taken by caller */
port->read_status_mask &= ~MPC52xx_PSC_IMR_RXRDY;
@@ -66662,7 +66662,7 @@
}
static void
-@@ -210,10 +213,10 @@
+@@ -210,10 +213,10 @@ mpc52xx_uart_break_ctl(struct uart_port
unsigned long flags;
spin_lock_irqsave(&port->lock, flags);
@@ -66676,7 +66676,7 @@
spin_unlock_irqrestore(&port->lock, flags);
}
-@@ -222,6 +225,7 @@
+@@ -222,6 +225,7 @@ static int
mpc52xx_uart_startup(struct uart_port *port)
{
struct mpc52xx_psc __iomem *psc = PSC(port);
@@ -66684,7 +66684,7 @@
int ret;
/* Request IRQ */
-@@ -231,23 +235,23 @@
+@@ -231,23 +235,23 @@ mpc52xx_uart_startup(struct uart_port *p
return ret;
/* Reset/activate the port, clear and enable interrupts */
@@ -66718,7 +66718,7 @@
return 0;
}
-@@ -258,12 +262,12 @@
+@@ -258,12 +262,12 @@ mpc52xx_uart_shutdown(struct uart_port *
struct mpc52xx_psc __iomem *psc = PSC(port);
/* Shut down the port. Leave TX active if on a console port */
@@ -66734,7 +66734,7 @@
/* Release interrupt */
free_irq(port->irq, port);
-@@ -271,7 +275,7 @@
+@@ -271,7 +275,7 @@ mpc52xx_uart_shutdown(struct uart_port *
static void
mpc52xx_uart_set_termios(struct uart_port *port, struct ktermios *new,
@@ -66743,7 +66743,7 @@
{
struct mpc52xx_psc __iomem *psc = PSC(port);
unsigned long flags;
-@@ -283,14 +287,14 @@
+@@ -283,14 +287,14 @@ mpc52xx_uart_set_termios(struct uart_por
mr1 = 0;
switch (new->c_cflag & CSIZE) {
@@ -66766,7 +66766,7 @@
}
if (new->c_cflag & PARENB) {
-@@ -332,24 +336,24 @@
+@@ -332,24 +336,24 @@ mpc52xx_uart_set_termios(struct uart_por
udelay(1);
if (!j)
@@ -66802,7 +66802,7 @@
/* We're all set, release the lock */
spin_unlock_irqrestore(&port->lock, flags);
-@@ -364,7 +368,8 @@
+@@ -364,7 +368,8 @@ mpc52xx_uart_type(struct uart_port *port
static void
mpc52xx_uart_release_port(struct uart_port *port)
{
@@ -66812,7 +66812,7 @@
iounmap(port->membase);
port->membase = NULL;
}
-@@ -379,7 +384,7 @@
+@@ -379,7 +384,7 @@ mpc52xx_uart_request_port(struct uart_po
if (port->flags & UPF_IOREMAP) /* Need to remap ? */
port->membase = ioremap(port->mapbase,
@@ -66821,7 +66821,7 @@
if (!port->membase)
return -EINVAL;
-@@ -398,22 +403,22 @@
+@@ -398,22 +403,22 @@ mpc52xx_uart_request_port(struct uart_po
static void
mpc52xx_uart_config_port(struct uart_port *port, int flags)
{
@@ -66853,7 +66853,7 @@
return -EINVAL;
return 0;
-@@ -455,8 +460,8 @@
+@@ -455,8 +460,8 @@ mpc52xx_uart_int_rx_chars(struct uart_po
unsigned short status;
/* While we can read, do so ! */
@@ -66864,7 +66864,7 @@
/* Get the char */
ch = in_8(&PSC(port)->mpc52xx_psc_buffer_8);
-@@ -474,9 +479,9 @@
+@@ -474,9 +479,9 @@ mpc52xx_uart_int_rx_chars(struct uart_po
flag = TTY_NORMAL;
port->icount.rx++;
@@ -66877,7 +66877,7 @@
if (status & MPC52xx_PSC_SR_RB) {
flag = TTY_BREAK;
-@@ -487,7 +492,7 @@
+@@ -487,7 +492,7 @@ mpc52xx_uart_int_rx_chars(struct uart_po
flag = TTY_FRAME;
/* Clear error condition */
@@ -66886,7 +66886,7 @@
}
tty_insert_flip_char(tty, ch, flag);
-@@ -568,16 +573,16 @@
+@@ -568,16 +573,16 @@ mpc52xx_uart_int(int irq, void *dev_id)
/* Do we need to receive chars ? */
/* For this RX interrupts must be on and some chars waiting */
@@ -66906,7 +66906,7 @@
keepgoing = 0;
} while (keepgoing);
-@@ -596,7 +601,7 @@
+@@ -596,7 +601,7 @@ mpc52xx_uart_int(int irq, void *dev_id)
static void __init
mpc52xx_console_get_options(struct uart_port *port,
@@ -66915,7 +66915,7 @@
{
struct mpc52xx_psc __iomem *psc = PSC(port);
unsigned char mr1;
-@@ -604,7 +609,7 @@
+@@ -604,7 +609,7 @@ mpc52xx_console_get_options(struct uart_
pr_debug("mpc52xx_console_get_options(port=%p)\n", port);
/* Read the mode registers */
@@ -66924,7 +66924,7 @@
mr1 = in_8(&psc->mode);
/* CT{U,L}R are write-only ! */
-@@ -616,11 +621,18 @@
+@@ -616,11 +621,18 @@ mpc52xx_console_get_options(struct uart_
/* Parse them */
switch (mr1 & MPC52xx_PSC_MODE_BITS_MASK) {
@@ -66948,7 +66948,7 @@
}
if (mr1 & MPC52xx_PSC_MODE_PARNONE)
-@@ -657,7 +669,7 @@
+@@ -657,7 +669,7 @@ mpc52xx_console_write(struct console *co
/* Wait the TX buffer to be empty */
j = 20000; /* Maximum wait */
while (!(in_be16(&psc->mpc52xx_psc_status) &
@@ -66957,7 +66957,7 @@
udelay(1);
}
-@@ -730,16 +742,18 @@
+@@ -730,16 +742,18 @@ mpc52xx_console_setup(struct console *co
}
pr_debug("Console on ttyPSC%x is %s\n",
@@ -66979,7 +66979,7 @@
pr_debug("Could not find IPB bus frequency!\n");
return -EINVAL;
}
-@@ -757,7 +771,8 @@
+@@ -757,7 +771,8 @@ mpc52xx_console_setup(struct console *co
return -EINVAL;
pr_debug("mpc52xx-psc uart at %p, mapped to %p, irq=%x, freq=%i\n",
@@ -66989,7 +66989,7 @@
/* Setup the port parameters accoding to options */
if (options)
-@@ -766,7 +781,7 @@
+@@ -766,7 +781,7 @@ mpc52xx_console_setup(struct console *co
mpc52xx_console_get_options(port, &baud, &parity, &bits, &flow);
pr_debug("Setting console parameters: %i %i%c1 flow=%c\n",
@@ -66998,7 +66998,7 @@
return uart_set_options(port, co, baud, parity, bits, flow);
}
-@@ -781,7 +796,7 @@
+@@ -781,7 +796,7 @@ static struct console mpc52xx_console =
.device = uart_console_device,
.setup = mpc52xx_console_setup,
.flags = CON_PRINTBUFFER,
@@ -67007,7 +67007,7 @@
.data = &mpc52xx_uart_driver,
};
-@@ -809,7 +824,6 @@
+@@ -809,7 +824,6 @@ console_initcall(mpc52xx_console_init);
/* ======================================================================== */
static struct uart_driver mpc52xx_uart_driver = {
@@ -67015,7 +67015,7 @@
.driver_name = "mpc52xx_psc_uart",
.dev_name = "ttyPSC",
.major = SERIAL_PSC_MAJOR,
-@@ -837,7 +851,7 @@
+@@ -837,7 +851,7 @@ mpc52xx_uart_probe(struct platform_devic
if (idx < 0 || idx >= MPC52xx_PSC_MAXNUM)
return -EINVAL;
@@ -67024,7 +67024,7 @@
return -ENODEV;
/* Init the port structure */
-@@ -848,13 +862,13 @@
+@@ -848,13 +862,13 @@ mpc52xx_uart_probe(struct platform_devic
port->fifosize = 512;
port->iotype = UPIO_MEM;
port->flags = UPF_BOOT_AUTOCONF |
@@ -67040,7 +67040,7 @@
if (res->flags & IORESOURCE_MEM)
port->mapbase = res->start;
else if (res->flags & IORESOURCE_IRQ)
-@@ -866,7 +880,7 @@
+@@ -866,7 +880,7 @@ mpc52xx_uart_probe(struct platform_devic
/* Add the port to the uart sub-system */
ret = uart_add_one_port(&mpc52xx_uart_driver, port);
if (!ret)
@@ -67049,7 +67049,7 @@
return ret;
}
-@@ -917,6 +931,7 @@
+@@ -917,6 +931,7 @@ static struct platform_driver mpc52xx_ua
.resume = mpc52xx_uart_resume,
#endif
.driver = {
@@ -67057,7 +67057,7 @@
.name = "mpc52xx-psc",
},
};
-@@ -946,10 +961,11 @@
+@@ -946,10 +961,11 @@ mpc52xx_uart_of_probe(struct of_device *
if (idx >= MPC52xx_PSC_MAXNUM)
return -EINVAL;
pr_debug("Found %s assigned to ttyPSC%x\n",
@@ -67071,7 +67071,7 @@
dev_dbg(&op->dev, "Could not find IPB bus frequency!\n");
return -EINVAL;
}
-@@ -962,22 +978,23 @@
+@@ -962,22 +978,23 @@ mpc52xx_uart_of_probe(struct of_device *
port->fifosize = 512;
port->iotype = UPIO_MEM;
port->flags = UPF_BOOT_AUTOCONF |
@@ -67099,7 +67099,7 @@
printk(KERN_ERR "Could not allocate resources for PSC\n");
return -EINVAL;
}
-@@ -985,7 +1002,7 @@
+@@ -985,7 +1002,7 @@ mpc52xx_uart_of_probe(struct of_device *
/* Add the port to the uart sub-system */
ret = uart_add_one_port(&mpc52xx_uart_driver, port);
if (!ret)
@@ -67108,7 +67108,7 @@
return ret;
}
-@@ -1048,6 +1065,7 @@
+@@ -1048,6 +1065,7 @@ mpc52xx_uart_of_assign(struct device_nod
if (idx < 0)
return; /* No free slot; abort */
@@ -67116,7 +67116,7 @@
/* If the slot is already occupied, then swap slots */
if (mpc52xx_uart_nodes[idx] && (free_idx != -1))
mpc52xx_uart_nodes[free_idx] = mpc52xx_uart_nodes[idx];
-@@ -1057,7 +1075,7 @@
+@@ -1057,7 +1075,7 @@ mpc52xx_uart_of_assign(struct device_nod
static void
mpc52xx_uart_of_enumerate(void)
{
@@ -67125,7 +67125,7 @@
struct device_node *np;
const unsigned int *devno;
int i;
-@@ -1071,7 +1089,7 @@
+@@ -1071,7 +1089,7 @@ mpc52xx_uart_of_enumerate(void)
/* Is a particular device number requested? */
devno = of_get_property(np, "port-number", NULL);
@@ -67134,7 +67134,7 @@
}
enum_done = 1;
-@@ -1079,15 +1097,13 @@
+@@ -1079,15 +1097,13 @@ mpc52xx_uart_of_enumerate(void)
for (i = 0; i < MPC52xx_PSC_MAXNUM; i++) {
if (mpc52xx_uart_nodes[i])
pr_debug("%s assigned to ttyPSC%x\n",
@@ -67151,7 +67151,7 @@
.match_table = mpc52xx_uart_of_match,
.probe = mpc52xx_uart_of_probe,
.remove = mpc52xx_uart_of_remove,
-@@ -1113,7 +1129,8 @@
+@@ -1113,7 +1129,8 @@ mpc52xx_uart_init(void)
printk(KERN_INFO "Serial: MPC52xx PSC UART driver\n");
@@ -67163,7 +67163,7 @@
return ret;
--- a/drivers/serial/uartlite.c
+++ b/drivers/serial/uartlite.c
-@@ -539,7 +539,7 @@
+@@ -539,7 +539,7 @@ static int __devinit ulite_assign(struct
*
* @dev: pointer to device structure
*/
@@ -67172,7 +67172,7 @@
{
struct uart_port *port = dev_get_drvdata(dev);
int rc = 0;
-@@ -572,14 +572,14 @@
+@@ -572,14 +572,14 @@ static int __devinit ulite_probe(struct
return ulite_assign(&pdev->dev, pdev->id, res->start, res2->start);
}
@@ -68708,7 +68708,7 @@
+
--- a/drivers/spi/mpc52xx_psc_spi.c
+++ b/drivers/spi/mpc52xx_psc_spi.c
-@@ -330,6 +330,7 @@
+@@ -330,6 +330,7 @@ static void mpc52xx_psc_spi_cleanup(stru
static int mpc52xx_psc_spi_port_config(int psc_id, struct mpc52xx_psc_spi *mps)
{
@@ -68716,7 +68716,7 @@
struct mpc52xx_cdm __iomem *cdm;
struct mpc52xx_gpio __iomem *gpio;
struct mpc52xx_psc __iomem *psc = mps->psc;
-@@ -338,8 +339,12 @@
+@@ -338,8 +339,12 @@ static int mpc52xx_psc_spi_port_config(i
int ret = 0;
#if defined(CONFIG_PPC_MERGE)
@@ -68733,7 +68733,7 @@
gpio = ioremap(MPC52xx_PA(MPC52xx_GPIO_OFFSET), MPC52xx_GPIO_SIZE);
--- a/fs/openpromfs/inode.c
+++ b/fs/openpromfs/inode.c
-@@ -131,7 +131,7 @@
+@@ -131,7 +131,7 @@ static void property_stop(struct seq_fil
/* Nothing to do */
}
@@ -68744,7 +68744,7 @@
.stop = property_stop,
--- a/include/asm-powerpc/8xx_immap.h
+++ b/include/asm-powerpc/8xx_immap.h
-@@ -123,7 +123,7 @@
+@@ -123,7 +123,7 @@ typedef struct mem_ctlr {
#define OR_G5LA 0x00000400 /* Output #GPL5 on #GPL_A5 */
#define OR_G5LS 0x00000200 /* Drive #GPL high on falling edge of...*/
#define OR_BI 0x00000100 /* Burst inhibit */
@@ -68755,7 +68755,7 @@
#define OR_SCY_2_CLK 0x00000020 /* 2 clock cycles wait states */
--- a/include/asm-powerpc/commproc.h
+++ b/include/asm-powerpc/commproc.h
-@@ -693,7 +693,7 @@
+@@ -693,7 +693,7 @@ typedef struct risc_timer_pram {
#define CICR_SCC_SCC3 ((uint)0x00200000) /* SCC3 @ SCCc */
#define CICR_SCB_SCC2 ((uint)0x00040000) /* SCC2 @ SCCb */
#define CICR_SCA_SCC1 ((uint)0x00000000) /* SCC1 @ SCCa */
@@ -68766,7 +68766,7 @@
#define CICR_SPS ((uint)0x00000001) /* SCC Spread */
--- a/include/asm-powerpc/cpm.h
+++ b/include/asm-powerpc/cpm.h
-@@ -10,5 +10,6 @@
+@@ -10,5 +10,6 @@ int cpm_muram_free(unsigned long offset)
unsigned long cpm_muram_alloc_fixed(unsigned long offset, unsigned long size);
void __iomem *cpm_muram_addr(unsigned long offset);
dma_addr_t cpm_muram_dma(void __iomem *addr);
@@ -68775,7 +68775,7 @@
#endif
--- a/include/asm-powerpc/cputable.h
+++ b/include/asm-powerpc/cputable.h
-@@ -57,6 +57,14 @@
+@@ -57,6 +57,14 @@ enum powerpc_pmc_type {
PPC_PMC_PA6T = 2,
};
@@ -68790,7 +68790,7 @@
/* NOTE WELL: Update identify_cpu() if fields are added or removed! */
struct cpu_spec {
/* CPU is matched via (PVR & pvr_mask) == pvr_value */
-@@ -97,6 +105,11 @@
+@@ -97,6 +105,11 @@ struct cpu_spec {
/* Name of processor class, for the ELF AT_PLATFORM entry */
char *platform;
@@ -68887,7 +68887,7 @@
typedef struct {
unsigned int base;
} dcr_host_t;
-@@ -55,20 +57,28 @@
+@@ -55,20 +57,28 @@ do { \
} while (0)
/* R/W of indirect DCRs make use of standard naming conventions for DCRs */
@@ -69002,7 +69002,7 @@
+#endif /* __DCR_REGS_H__ */
--- a/include/asm-powerpc/dma-mapping.h
+++ b/include/asm-powerpc/dma-mapping.h
-@@ -87,6 +87,9 @@
+@@ -87,6 +87,9 @@ static inline int dma_supported(struct d
return dma_ops->dma_supported(dev, mask);
}
@@ -69012,7 +69012,7 @@
static inline int dma_set_mask(struct device *dev, u64 dma_mask)
{
struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
-@@ -186,8 +189,6 @@
+@@ -186,8 +189,6 @@ static inline void dma_unmap_sg(struct d
extern struct dma_mapping_ops dma_iommu_ops;
extern struct dma_mapping_ops dma_direct_ops;
@@ -69023,7 +69023,7 @@
#define dma_supported(dev, mask) (1)
--- a/include/asm-powerpc/firmware.h
+++ b/include/asm-powerpc/firmware.h
-@@ -64,7 +64,7 @@
+@@ -64,7 +64,7 @@ enum {
FW_FEATURE_PS3_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1,
FW_FEATURE_PS3_ALWAYS = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1,
FW_FEATURE_CELLEB_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_BEAT,
@@ -69034,7 +69034,7 @@
FW_FEATURE_POSSIBLE =
--- a/include/asm-powerpc/immap_86xx.h
+++ b/include/asm-powerpc/immap_86xx.h
-@@ -89,14 +89,14 @@
+@@ -89,14 +89,14 @@ struct ccsr_guts {
* them.
*
* guts: Pointer to GUTS structure
@@ -69051,7 +69051,7 @@
clrsetbits_be32(&guts->dmacr, 3 << shift, device << shift);
}
-@@ -118,6 +118,27 @@
+@@ -118,6 +118,27 @@ static inline void guts_set_dmacr(struct
#define CCSR_GUTS_PMUXCR_DMA1_0 0x00000002
#define CCSR_GUTS_PMUXCR_DMA1_3 0x00000001
@@ -69081,7 +69081,7 @@
#define CCSR_GUTS_CLKDVDR_PXCKINV 0x10000000
--- a/include/asm-powerpc/immap_qe.h
+++ b/include/asm-powerpc/immap_qe.h
-@@ -393,9 +393,39 @@
+@@ -393,9 +393,39 @@ struct dbg {
u8 res2[0x48];
} __attribute__ ((packed));
@@ -69125,7 +69125,7 @@
struct qe_immap {
--- a/include/asm-powerpc/io.h
+++ b/include/asm-powerpc/io.h
-@@ -50,15 +50,16 @@
+@@ -50,15 +50,16 @@ extern int check_legacy_ioport(unsigned
#define PCI_DRAM_OFFSET pci_dram_offset
#else
#define _IO_BASE pci_io_base
@@ -69146,7 +69146,7 @@
#endif
--- a/include/asm-powerpc/iommu.h
+++ b/include/asm-powerpc/iommu.h
-@@ -69,10 +69,9 @@
+@@ -69,10 +69,9 @@ struct iommu_table {
};
struct scatterlist;
@@ -69181,7 +69181,7 @@
#define IPIC_SICFR 0x00 /* System Global Interrupt Configuration Register */
--- a/include/asm-powerpc/iseries/hv_lp_event.h
+++ b/include/asm-powerpc/iseries/hv_lp_event.h
-@@ -78,7 +78,7 @@
+@@ -78,7 +78,7 @@ extern int HvLpEvent_openPath(HvLpEvent_
/*
* Close an Lp Event Path for a type and partition
@@ -69192,7 +69192,7 @@
--- a/include/asm-powerpc/kexec.h
+++ b/include/asm-powerpc/kexec.h
-@@ -123,6 +123,9 @@
+@@ -123,6 +123,9 @@ struct pt_regs;
extern void default_machine_kexec(struct kimage *image);
extern int default_machine_kexec_prepare(struct kimage *image);
extern void default_machine_crash_shutdown(struct pt_regs *regs);
@@ -69204,7 +69204,7 @@
extern void crash_kexec_secondary(struct pt_regs *regs);
--- a/include/asm-powerpc/lmb.h
+++ b/include/asm-powerpc/lmb.h
-@@ -51,6 +51,7 @@
+@@ -51,6 +51,7 @@ extern unsigned long __init __lmb_alloc_
extern unsigned long __init lmb_phys_mem_size(void);
extern unsigned long __init lmb_end_of_DRAM(void);
extern void __init lmb_enforce_memory_limit(unsigned long memory_limit);
@@ -69214,7 +69214,7 @@
--- a/include/asm-powerpc/machdep.h
+++ b/include/asm-powerpc/machdep.h
-@@ -204,6 +204,13 @@
+@@ -204,6 +204,13 @@ struct machdep_calls {
/*
* optional PCI "hooks"
*/
@@ -69228,7 +69228,7 @@
/* Called after PPC generic resource fixup to perform
machine specific fixups */
-@@ -212,18 +219,9 @@
+@@ -212,18 +219,9 @@ struct machdep_calls {
/* Called for each PCI bus in the system when it's probed */
void (*pcibios_fixup_bus)(struct pci_bus *);
@@ -69250,7 +69250,7 @@
/* Called to shutdown machine specific hardware not already controlled
* by other drivers.
-@@ -253,6 +251,16 @@
+@@ -253,6 +251,16 @@ struct machdep_calls {
*/
void (*machine_kexec)(struct kimage *image);
#endif /* CONFIG_KEXEC */
@@ -69267,7 +69267,7 @@
};
extern void power4_idle(void);
-@@ -326,5 +334,31 @@
+@@ -326,5 +334,31 @@ static inline void log_error(char *buf,
ppc_md.log_error(buf, err_type, fatal);
}
@@ -69301,7 +69301,7 @@
#endif /* _ASM_POWERPC_MACHDEP_H */
--- a/include/asm-powerpc/mmu-hash64.h
+++ b/include/asm-powerpc/mmu-hash64.h
-@@ -80,7 +80,7 @@
+@@ -80,7 +80,7 @@ extern char initial_stab[];
#define HPTE_V_AVPN_SHIFT 7
#define HPTE_V_AVPN ASM_CONST(0x3fffffffffffff80)
#define HPTE_V_AVPN_VAL(x) (((x) & HPTE_V_AVPN) >> HPTE_V_AVPN_SHIFT)
@@ -69310,7 +69310,7 @@
#define HPTE_V_BOLTED ASM_CONST(0x0000000000000010)
#define HPTE_V_LOCK ASM_CONST(0x0000000000000008)
#define HPTE_V_LARGE ASM_CONST(0x0000000000000004)
-@@ -180,6 +180,7 @@
+@@ -180,6 +180,7 @@ extern int mmu_vmalloc_psize;
extern int mmu_io_psize;
extern int mmu_kernel_ssize;
extern int mmu_highuser_ssize;
@@ -69318,7 +69318,7 @@
/*
* If the processor supports 64k normal pages but not 64k cache
-@@ -277,6 +278,7 @@
+@@ -277,6 +278,7 @@ extern int hash_huge_page(struct mm_stru
extern int htab_bolt_mapping(unsigned long vstart, unsigned long vend,
unsigned long pstart, unsigned long mode,
int psize, int ssize);
@@ -69328,7 +69328,7 @@
extern void htab_initialize_secondary(void);
--- a/include/asm-powerpc/mpc52xx.h
+++ b/include/asm-powerpc/mpc52xx.h
-@@ -248,8 +248,6 @@
+@@ -248,8 +248,6 @@ struct mpc52xx_cdm {
#ifndef __ASSEMBLY__
@@ -69337,7 +69337,7 @@
extern unsigned int mpc52xx_find_ipb_freq(struct device_node *node);
extern void mpc5200_setup_xlb_arbiter(void);
extern void mpc52xx_declare_of_platform_devices(void);
-@@ -257,7 +255,12 @@
+@@ -257,7 +255,12 @@ extern void mpc52xx_declare_of_platform_
extern void mpc52xx_init_irq(void);
extern unsigned int mpc52xx_get_irq(void);
@@ -69352,7 +69352,7 @@
extern void mpc52xx_restart(char *cmd);
--- a/include/asm-powerpc/mpc52xx_psc.h
+++ b/include/asm-powerpc/mpc52xx_psc.h
-@@ -153,6 +153,9 @@
+@@ -153,6 +153,9 @@ struct mpc52xx_psc {
u8 reserved16[3];
u8 irfdr; /* PSC + 0x54 */
u8 reserved17[3];
@@ -69400,7 +69400,7 @@
/*
* Per-source registers
-@@ -183,6 +187,7 @@
+@@ -183,6 +187,7 @@ enum {
MPIC_IDX_CPU_WHOAMI,
MPIC_IDX_CPU_INTACK,
MPIC_IDX_CPU_EOI,
@@ -69408,7 +69408,7 @@
MPIC_IDX_IRQ_BASE,
MPIC_IDX_IRQ_STRIDE,
-@@ -344,6 +349,10 @@
+@@ -344,6 +349,10 @@ struct mpic
#define MPIC_USES_DCR 0x00000080
/* MPIC has 11-bit vector fields (or larger) */
#define MPIC_LARGE_VECTORS 0x00000100
@@ -69419,7 +69419,7 @@
/* MPIC HW modification ID */
#define MPIC_REGSET_MASK 0xf0000000
-@@ -447,10 +456,19 @@
+@@ -447,10 +456,19 @@ extern void mpic_send_ipi(unsigned int i
/* Send a message (IPI) to a given target (cpu number or MSG_*) */
void smp_mpic_message_pass(int target, int msg);
@@ -69451,7 +69451,7 @@
#define NVRW_CNT 0x20
#define NVRAM_HEADER_LEN 16 /* sizeof(struct nvram_header) */
#define NVRAM_BLOCK_LEN 16
-@@ -71,7 +73,16 @@
+@@ -71,7 +73,16 @@ extern int nvram_clear_error_log(void);
extern struct nvram_partition *nvram_find_partition(int sig, const char *name);
extern int pSeries_nvram_init(void);
@@ -69487,7 +69487,7 @@
/* Platform devices and busses creation */
extern struct of_device *of_platform_device_create(struct device_node *np,
-@@ -26,9 +32,11 @@
+@@ -26,9 +32,11 @@ extern struct of_device *of_platform_dev
#define OF_NO_DEEP_PROBE ((struct of_device_id *)-1)
extern int of_platform_bus_probe(struct device_node *root,
@@ -69549,7 +69549,7 @@
/*
* Structure of a PCI controller (host bridge)
-@@ -17,26 +44,41 @@
+@@ -17,26 +44,41 @@ struct pci_controller;
struct pci_controller {
struct pci_bus *bus;
char is_dynamic;
@@ -69594,7 +69594,7 @@
/*
* Used for variants of PCI indirect handling and possible quirks:
* SET_CFG_TYPE - used on 4xx or any PHB that does explicit type0/1
-@@ -51,21 +93,30 @@
+@@ -51,21 +93,30 @@ struct pci_controller {
* set.
* BIG_ENDIAN - cfg_addr is a big endian register
*/
@@ -69631,7 +69631,7 @@
static inline struct pci_controller *pci_bus_to_host(struct pci_bus *bus)
{
return bus->sysdata;
-@@ -81,18 +132,18 @@
+@@ -81,18 +132,18 @@ static inline int isa_vaddr_is_ioport(vo
/* These are used for config access before all the PCI probing
has been done. */
@@ -69662,7 +69662,7 @@
extern int early_find_capability(struct pci_controller *hose, int bus,
int dev_fn, int cap);
-@@ -101,87 +152,33 @@
+@@ -101,87 +152,33 @@ extern void setup_indirect_pci(struct pc
resource_size_t cfg_addr,
resource_size_t cfg_data, u32 flags);
extern void setup_grackle(struct pci_controller *hose);
@@ -69756,7 +69756,7 @@
u32 config_space[16]; /* saved PCI config space */
#endif
};
-@@ -189,7 +186,7 @@
+@@ -189,7 +186,7 @@ struct pci_dn {
/* Get the pointer to a device_node's pci_dn */
#define PCI_DN(dn) ((struct pci_dn *) (dn)->data)
@@ -69765,7 +69765,7 @@
/* Get a device_node from a pci_dev. This code must be fast except
* in the case where the sysdata is incorrect and needs to be fixed
-@@ -227,14 +224,14 @@
+@@ -227,14 +224,14 @@ static inline struct device_node *pci_bu
}
/** Find the bus corresponding to the indicated device node */
@@ -69784,7 +69784,7 @@
extern int pcibios_remove_root_bus(struct pci_controller *phb);
-@@ -270,20 +267,18 @@
+@@ -270,20 +267,18 @@ extern int pcibios_map_io_space(struct p
#define PHB_SET_NODE(PHB, NODE) ((PHB)->node = -1)
#endif
@@ -69811,7 +69811,7 @@
extern void pcibios_free_controller(struct pci_controller *phb);
#ifdef CONFIG_PCI
-@@ -298,9 +293,7 @@
+@@ -298,9 +293,7 @@ static inline int pcibios_vaddr_is_iopor
{
return 0;
}
@@ -69826,7 +69826,7 @@
+#endif /* _ASM_POWERPC_PCI_BRIDGE_H */
--- a/include/asm-powerpc/pci.h
+++ b/include/asm-powerpc/pci.h
-@@ -36,11 +36,10 @@
+@@ -36,11 +36,10 @@ struct pci_dev;
/*
* Set this to 1 if you want the kernel to re-assign all PCI
@@ -69841,7 +69841,7 @@
#define pcibios_scan_all_fns(a, b) 0
static inline void pcibios_set_master(struct pci_dev *dev)
-@@ -95,9 +94,6 @@
+@@ -95,9 +94,6 @@ static inline void pci_dma_burst_advice(
#define get_pci_dma_ops() NULL
#endif
@@ -69851,7 +69851,7 @@
#else /* 32-bit */
#ifdef CONFIG_PCI
-@@ -109,17 +105,14 @@
+@@ -109,17 +105,14 @@ static inline void pci_dma_burst_advice(
*strategy_parameter = ~0UL;
}
#endif
@@ -69873,7 +69873,7 @@
struct vm_area_struct;
/* Map a range of PCI memory or I/O space for a device into user space */
int pci_mmap_page_range(struct pci_dev *pdev, struct vm_area_struct *vma,
-@@ -199,13 +192,12 @@
+@@ -199,13 +192,12 @@ static inline struct resource *pcibios_s
return root;
}
@@ -69889,7 +69889,7 @@
extern struct pci_controller *init_phb_dynamic(struct device_node *dn);
extern struct pci_dev *of_create_pci_dev(struct device_node *node,
-@@ -229,5 +221,8 @@
+@@ -229,5 +221,8 @@ extern void pci_resource_to_user(const s
const struct resource *rsrc,
resource_size_t *start, resource_size_t *end);
@@ -69900,7 +69900,7 @@
#endif /* __ASM_POWERPC_PCI_H */
--- a/include/asm-powerpc/ppc-pci.h
+++ b/include/asm-powerpc/ppc-pci.h
-@@ -22,7 +22,6 @@
+@@ -22,7 +22,6 @@ extern void pci_setup_phb_io_dynamic(str
extern struct list_head hose_list;
@@ -69908,7 +69908,7 @@
extern void find_and_init_phbs(void);
-@@ -47,9 +46,6 @@
+@@ -47,9 +46,6 @@ extern void init_pci_config_tokens (void
extern unsigned long get_phb_buid (struct device_node *);
extern int rtas_setup_phb(struct pci_controller *phb);
@@ -69920,7 +69920,7 @@
/* ---- EEH internal-use-only related routines ---- */
--- a/include/asm-powerpc/prom.h
+++ b/include/asm-powerpc/prom.h
-@@ -202,6 +202,10 @@
+@@ -202,6 +202,10 @@ static inline unsigned long of_read_ulon
*/
extern u64 of_translate_address(struct device_node *np, const u32 *addr);
@@ -69941,7 +69941,7 @@
union ps3_firmware_version {
u64 raw;
-@@ -317,6 +318,7 @@
+@@ -317,6 +318,7 @@ enum ps3_match_id {
PS3_MATCH_ID_STOR_FLASH = 8,
PS3_MATCH_ID_SOUND = 9,
PS3_MATCH_ID_GRAPHICS = 10,
@@ -69949,7 +69949,7 @@
};
#define PS3_MODULE_ALIAS_EHCI "ps3:1"
-@@ -329,11 +331,13 @@
+@@ -329,11 +331,13 @@ enum ps3_match_id {
#define PS3_MODULE_ALIAS_STOR_FLASH "ps3:8"
#define PS3_MODULE_ALIAS_SOUND "ps3:9"
#define PS3_MODULE_ALIAS_GRAPHICS "ps3:10"
@@ -69963,7 +69963,7 @@
};
/**
-@@ -344,12 +348,17 @@
+@@ -344,12 +348,17 @@ struct ps3_system_bus_device {
enum ps3_match_id match_id;
enum ps3_system_bus_device_type dev_type;
@@ -69983,7 +69983,7 @@
/* struct iommu_table *iommu_table; -- waiting for BenH's cleanups */
struct device core;
-@@ -438,5 +447,66 @@
+@@ -438,5 +447,66 @@ struct ps3_prealloc {
extern struct ps3_prealloc ps3fb_videomemory;
extern struct ps3_prealloc ps3flash_bounce_buffer;
@@ -70052,7 +70052,7 @@
#endif
--- a/include/asm-powerpc/ptrace.h
+++ b/include/asm-powerpc/ptrace.h
-@@ -106,7 +106,8 @@
+@@ -106,7 +106,8 @@ extern int ptrace_put_reg(struct task_st
*/
#define FULL_REGS(regs) (((regs)->trap & 1) == 0)
#ifndef __powerpc64__
@@ -70117,7 +70117,7 @@
/* Export QE common operations */
extern void qe_reset(void);
extern int par_io_init(struct device_node *np);
-@@ -38,7 +84,8 @@
+@@ -38,7 +84,8 @@ extern int par_io_data_set(u8 port, u8 p
/* QE internal API */
int qe_issue_cmd(u32 cmd, u32 device, u8 mcn_protocol, u32 cmd_input);
@@ -70127,7 +70127,7 @@
int qe_get_snum(void);
void qe_put_snum(u8 snum);
unsigned long qe_muram_alloc(int size, int align);
-@@ -47,6 +94,58 @@
+@@ -47,6 +94,58 @@ unsigned long qe_muram_alloc_fixed(unsig
void qe_muram_dump(void);
void *qe_muram_addr(unsigned long offset);
@@ -70186,7 +70186,7 @@
/* Buffer descriptors */
struct qe_bd {
__be16 status;
-@@ -129,52 +228,6 @@
+@@ -129,52 +228,6 @@ enum comm_dir {
COMM_DIR_RX_AND_TX = 3
};
@@ -70239,7 +70239,7 @@
/* QE CMXUCR Registers.
* There are two UCCs represented in each of the four CMXUCR registers.
* These values are for the UCC in the LSBs
-@@ -328,6 +381,15 @@
+@@ -328,6 +381,15 @@ enum qe_clock {
#define QE_SDEBCR_BA_MASK 0x01FFFFFF
@@ -70565,7 +70565,7 @@
/*
* - Kernel side interface -
-@@ -564,13 +688,13 @@
+@@ -564,13 +688,13 @@ struct smu_user_cmd_hdr
__u8 cmd; /* SMU command byte */
__u8 pad[3]; /* padding */
@@ -70607,7 +70607,7 @@
struct device_node;
enum spu_utilization_state {
-@@ -145,7 +146,6 @@
+@@ -145,7 +146,6 @@ struct spu {
void (* ibox_callback)(struct spu *spu);
void (* stop_callback)(struct spu *spu);
void (* mfc_callback)(struct spu *spu);
@@ -70615,7 +70615,7 @@
char irq_c0[8];
char irq_c1[8];
-@@ -196,10 +196,11 @@
+@@ -196,10 +196,11 @@ struct cbe_spu_info {
extern struct cbe_spu_info cbe_spu_info[];
void spu_init_channels(struct spu *spu);
@@ -70629,7 +70629,7 @@
#ifdef CONFIG_KEXEC
void crash_register_spus(struct list_head *list);
#else
-@@ -210,6 +211,7 @@
+@@ -210,6 +211,7 @@ static inline void crash_register_spus(s
extern void spu_invalidate_slbs(struct spu *spu);
extern void spu_associate_mm(struct spu *spu, struct mm_struct *mm);
@@ -70637,7 +70637,7 @@
/* Calls from the memory management to the SPU */
struct mm_struct;
-@@ -279,6 +281,8 @@
+@@ -279,6 +281,8 @@ void spu_remove_sysdev_attr(struct sysde
int spu_add_sysdev_attr_group(struct attribute_group *attrs);
void spu_remove_sysdev_attr_group(struct attribute_group *attrs);
@@ -70646,7 +70646,7 @@
/*
* Notifier blocks:
-@@ -303,7 +307,7 @@
+@@ -303,7 +307,7 @@ extern void notify_spus_active(void);
extern void do_notify_spus_active(void);
/*
@@ -70655,7 +70655,7 @@
*/
union mfc_tag_size_class_cmd {
-@@ -524,8 +528,24 @@
+@@ -524,8 +528,24 @@ struct spu_priv1 {
#define CLASS2_ENABLE_SPU_STOP_INTR 0x2L
#define CLASS2_ENABLE_SPU_HALT_INTR 0x4L
#define CLASS2_ENABLE_SPU_DMA_TAG_GROUP_COMPLETE_INTR 0x8L
@@ -70682,7 +70682,7 @@
--- a/include/asm-powerpc/spu_csa.h
+++ b/include/asm-powerpc/spu_csa.h
-@@ -194,7 +194,7 @@
+@@ -194,7 +194,7 @@ struct spu_priv1_collapsed {
};
/*
@@ -70691,7 +70691,7 @@
*/
struct spu_priv2_collapsed {
u64 slb_index_W;
-@@ -254,20 +254,11 @@
+@@ -254,20 +254,11 @@ struct spu_state {
u64 spu_chnldata_RW[32];
u32 spu_mailbox_data[4];
u32 pu_mailbox_data[1];
@@ -70723,7 +70723,7 @@
/* access to priv1 registers */
-@@ -178,6 +179,8 @@
+@@ -178,6 +179,8 @@ struct spu_management_ops {
int (*enumerate_spus)(int (*fn)(void *data));
int (*create_spu)(struct spu *spu, void *data);
int (*destroy_spu)(struct spu *spu);
@@ -70732,7 +70732,7 @@
int (*init_affinity)(void);
};
-@@ -207,6 +210,18 @@
+@@ -207,6 +210,18 @@ spu_init_affinity (void)
return spu_management_ops->init_affinity();
}
@@ -70753,7 +70753,7 @@
* and only intended to be used by the platform setup code.
--- a/include/asm-powerpc/system.h
+++ b/include/asm-powerpc/system.h
-@@ -169,6 +169,8 @@
+@@ -169,6 +169,8 @@ extern int do_page_fault(struct pt_regs
extern void bad_page_fault(struct pt_regs *, unsigned long, int);
extern int die(const char *, struct pt_regs *, long);
extern void _exception(int, struct pt_regs *, int, unsigned long);
@@ -70764,7 +70764,7 @@
extern u32 booke_wdt_period;
--- a/include/asm-powerpc/udbg.h
+++ b/include/asm-powerpc/udbg.h
-@@ -48,6 +48,7 @@
+@@ -48,6 +48,7 @@ extern void __init udbg_init_rtas_consol
extern void __init udbg_init_debug_beat(void);
extern void __init udbg_init_btext(void);
extern void __init udbg_init_44x_as1(void);
@@ -70774,7 +70774,7 @@
#endif /* __KERNEL__ */
--- a/include/asm-ppc/8xx_immap.h
+++ b/include/asm-ppc/8xx_immap.h
-@@ -123,7 +123,7 @@
+@@ -123,7 +123,7 @@ typedef struct mem_ctlr {
#define OR_G5LA 0x00000400 /* Output #GPL5 on #GPL_A5 */
#define OR_G5LS 0x00000200 /* Drive #GPL high on falling edge of...*/
#define OR_BI 0x00000100 /* Burst inhibit */
@@ -70785,7 +70785,7 @@
#define OR_SCY_2_CLK 0x00000020 /* 2 clock cycles wait states */
--- a/include/asm-ppc/commproc.h
+++ b/include/asm-ppc/commproc.h
-@@ -681,7 +681,7 @@
+@@ -681,7 +681,7 @@ typedef struct risc_timer_pram {
#define CICR_SCC_SCC3 ((uint)0x00200000) /* SCC3 @ SCCc */
#define CICR_SCB_SCC2 ((uint)0x00040000) /* SCC2 @ SCCb */
#define CICR_SCA_SCC1 ((uint)0x00000000) /* SCC1 @ SCCa */
@@ -70796,7 +70796,7 @@
#define CICR_SPS ((uint)0x00000001) /* SCC Spread */
--- a/include/asm-ppc/mmu.h
+++ b/include/asm-ppc/mmu.h
-@@ -383,6 +383,12 @@
+@@ -383,6 +383,12 @@ typedef struct _P601_BAT {
#define BOOKE_PAGESZ_256GB 14
#define BOOKE_PAGESZ_1TB 15
@@ -70811,7 +70811,7 @@
*/
--- a/include/asm-ppc/mpc52xx_psc.h
+++ b/include/asm-ppc/mpc52xx_psc.h
-@@ -159,6 +159,9 @@
+@@ -159,6 +159,9 @@ struct mpc52xx_psc {
u8 reserved16[3];
u8 irfdr; /* PSC + 0x54 */
u8 reserved17[3];
@@ -70851,7 +70851,7 @@
#include <asm/prom.h>
-@@ -41,11 +42,20 @@
+@@ -41,11 +42,20 @@ extern struct device_node *of_find_compa
#define for_each_compatible_node(dn, type, compatible) \
for (dn = of_find_compatible_node(NULL, type, compatible); dn; \
dn = of_find_compatible_node(dn, type, compatible))
@@ -70872,7 +70872,7 @@
extern struct property *of_find_property(const struct device_node *np,
const char *name,
int *lenp);
-@@ -56,5 +66,7 @@
+@@ -56,5 +66,7 @@ extern const void *of_get_property(const
int *lenp);
extern int of_n_addr_cells(struct device_node *np);
extern int of_n_size_cells(struct device_node *np);
@@ -70893,7 +70893,7 @@
--- a/include/linux/pata_platform.h
+++ b/include/linux/pata_platform.h
-@@ -15,4 +15,13 @@
+@@ -15,4 +15,13 @@ struct pata_platform_info {
unsigned int irq_flags;
};
@@ -70972,7 +70972,7 @@
#endif /* __PHY_FIXED_H */
--- a/include/linux/pmu.h
+++ b/include/linux/pmu.h
-@@ -159,41 +159,7 @@
+@@ -159,41 +159,7 @@ extern void pmu_unlock(void);
extern int pmu_present(void);
extern int pmu_get_model(void);
diff --git a/target/linux/generic-2.6/patches-2.6.24/801-usb_serial_endpoint_size.patch b/target/linux/generic-2.6/patches-2.6.24/801-usb_serial_endpoint_size.patch
index c2165cd..1c777d2 100644
--- a/target/linux/generic-2.6/patches-2.6.24/801-usb_serial_endpoint_size.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/801-usb_serial_endpoint_size.patch
@@ -1,6 +1,6 @@
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
-@@ -58,6 +58,7 @@
+@@ -58,6 +58,7 @@ static struct usb_driver usb_serial_driv
drivers depend on it.
*/
@@ -8,7 +8,7 @@
static int debug;
static struct usb_serial *serial_table[SERIAL_TTY_MINORS]; /* initially all NULL */
static DEFINE_MUTEX(table_lock);
-@@ -894,7 +895,7 @@
+@@ -894,7 +895,7 @@ int usb_serial_probe(struct usb_interfac
dev_err(&interface->dev, "No free urbs available\n");
goto probe_error;
}
@@ -17,7 +17,7 @@
port->bulk_in_size = buffer_size;
port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
port->bulk_in_buffer = kmalloc (buffer_size, GFP_KERNEL);
-@@ -1306,3 +1307,5 @@
+@@ -1306,3 +1307,5 @@ MODULE_LICENSE("GPL");
module_param(debug, bool, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(debug, "Debug enabled or not");
diff --git a/target/linux/generic-2.6/patches-2.6.24/840-unable_to_open_console.patch b/target/linux/generic-2.6/patches-2.6.24/840-unable_to_open_console.patch
index a74f2a8..dba2e27 100644
--- a/target/linux/generic-2.6/patches-2.6.24/840-unable_to_open_console.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/840-unable_to_open_console.patch
@@ -1,6 +1,6 @@
--- a/init/main.c
+++ b/init/main.c
-@@ -773,7 +773,7 @@
+@@ -773,7 +773,7 @@ static int noinline init_post(void)
numa_default_policy();
if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
diff --git a/target/linux/generic-2.6/patches-2.6.24/850-jffs2_erase_progress_indicator.patch b/target/linux/generic-2.6/patches-2.6.24/850-jffs2_erase_progress_indicator.patch
index 2d4eafd..20bf1ef 100644
--- a/target/linux/generic-2.6/patches-2.6.24/850-jffs2_erase_progress_indicator.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/850-jffs2_erase_progress_indicator.patch
@@ -1,6 +1,6 @@
--- a/fs/jffs2/erase.c
+++ b/fs/jffs2/erase.c
-@@ -35,6 +35,8 @@
+@@ -35,6 +35,8 @@ static void jffs2_erase_block(struct jff
{
int ret;
uint32_t bad_offset;
@@ -9,7 +9,7 @@
#ifdef __ECOS
ret = jffs2_flash_erase(c, jeb);
if (!ret) {
-@@ -47,6 +49,11 @@
+@@ -47,6 +49,11 @@ static void jffs2_erase_block(struct jff
D1(printk(KERN_DEBUG "jffs2_erase_block(): erase block %#08x (range %#08x-%#08x)\n",
jeb->offset, jeb->offset, jeb->offset + c->sector_size));
diff --git a/target/linux/generic-2.6/patches-2.6.24/900-headers_type_and_time.patch b/target/linux/generic-2.6/patches-2.6.24/900-headers_type_and_time.patch
index 691194d..dc6e542 100644
--- a/target/linux/generic-2.6/patches-2.6.24/900-headers_type_and_time.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/900-headers_type_and_time.patch
@@ -11,7 +11,7 @@
#include <linux/types.h>
#ifdef __KERNEL__
-@@ -231,4 +235,6 @@
+@@ -231,4 +235,6 @@ struct itimerval {
*/
#define TIMER_ABSTIME 0x01
@@ -35,7 +35,7 @@
#ifdef __KERNEL__
#define DECLARE_BITMAP(name,bits) \
-@@ -161,6 +169,8 @@
+@@ -161,6 +169,8 @@ typedef unsigned long blkcnt_t;
#endif /* __KERNEL_STRICT_NAMES */
diff --git a/target/linux/generic-2.6/patches-2.6.24/902-darwin_scripts_include.patch b/target/linux/generic-2.6/patches-2.6.24/902-darwin_scripts_include.patch
index e7f2263..621831e 100644
--- a/target/linux/generic-2.6/patches-2.6.24/902-darwin_scripts_include.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/902-darwin_scripts_include.patch
@@ -62,7 +62,7 @@
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
-@@ -90,6 +90,9 @@
+@@ -90,6 +90,9 @@ check-lxdialog := $(srctree)/$(src)/lxd
# we really need to do so. (Do not call gcc as part of make mrproper)
HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
HOST_LOADLIBES = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
diff --git a/target/linux/generic-2.6/patches-2.6.24/903-hostap_txpower.patch b/target/linux/generic-2.6/patches-2.6.24/903-hostap_txpower.patch
index 1998787..1cf439e 100644
--- a/target/linux/generic-2.6/patches-2.6.24/903-hostap_txpower.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/903-hostap_txpower.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/hostap/hostap_ap.c
+++ b/drivers/net/wireless/hostap/hostap_ap.c
-@@ -2358,13 +2358,13 @@
+@@ -2358,13 +2358,13 @@ int prism2_ap_get_sta_qual(local_info_t
addr[count].sa_family = ARPHRD_ETHER;
memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
if (sta->last_rx_silence == 0)
@@ -20,7 +20,7 @@
qual[count].updated = sta->last_rx_updated;
sta->last_rx_updated = IW_QUAL_DBM;
-@@ -2429,13 +2429,13 @@
+@@ -2429,13 +2429,13 @@ int prism2_ap_translate_scan(struct net_
memset(&iwe, 0, sizeof(iwe));
iwe.cmd = IWEVQUAL;
if (sta->last_rx_silence == 0)
@@ -54,7 +54,7 @@
#endif /* HOSTAP_CONFIG_H */
--- a/drivers/net/wireless/hostap/hostap.h
+++ b/drivers/net/wireless/hostap/hostap.h
-@@ -89,6 +89,7 @@
+@@ -89,6 +89,7 @@ extern const struct iw_handler_def hosta
extern const struct ethtool_ops prism2_ethtool_ops;
int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
@@ -64,7 +64,7 @@
#endif /* HOSTAP_H */
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
-@@ -933,6 +933,7 @@
+@@ -933,6 +933,7 @@ static int hfa384x_set_rid(struct net_de
prism2_hw_reset(dev);
}
@@ -74,7 +74,7 @@
--- a/drivers/net/wireless/hostap/hostap_info.c
+++ b/drivers/net/wireless/hostap/hostap_info.c
-@@ -433,6 +433,11 @@
+@@ -433,6 +433,11 @@ static void handle_info_queue_linkstatus
}
/* Get BSSID if we have a valid AP address */
@@ -88,7 +88,7 @@
netif_carrier_on(local->ddev);
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
-@@ -1501,23 +1501,20 @@
+@@ -1501,23 +1501,20 @@ static int prism2_txpower_hfa386x_to_dBm
val = 255;
tmp = val;
@@ -116,7 +116,7 @@
return (unsigned char) tmp;
}
-@@ -4077,3 +4074,35 @@
+@@ -4077,3 +4074,35 @@ int hostap_ioctl(struct net_device *dev,
return ret;
}
diff --git a/target/linux/generic-2.6/patches-2.6.24/903-stddef_include.patch b/target/linux/generic-2.6/patches-2.6.24/903-stddef_include.patch
index c0c01c0..7fe248d 100644
--- a/target/linux/generic-2.6/patches-2.6.24/903-stddef_include.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/903-stddef_include.patch
@@ -1,6 +1,6 @@
--- a/include/linux/stddef.h
+++ b/include/linux/stddef.h
-@@ -16,6 +16,7 @@
+@@ -16,6 +16,7 @@ enum {
false = 0,
true = 1
};
@@ -8,7 +8,7 @@
#undef offsetof
#ifdef __compiler_offsetof
-@@ -23,6 +24,5 @@
+@@ -23,6 +24,5 @@ enum {
#else
#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
#endif
diff --git a/target/linux/generic-2.6/patches-2.6.24/904-ls_time_locale.patch b/target/linux/generic-2.6/patches-2.6.24/904-ls_time_locale.patch
index 401b151..8fc9381 100644
--- a/target/linux/generic-2.6/patches-2.6.24/904-ls_time_locale.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/904-ls_time_locale.patch
@@ -1,6 +1,6 @@
--- a/scripts/gen_initramfs_list.sh
+++ b/scripts/gen_initramfs_list.sh
-@@ -125,7 +125,7 @@
+@@ -125,7 +125,7 @@ parse() {
str="${ftype} ${name} ${location} ${str}"
;;
"nod")
@@ -9,7 +9,7 @@
local maj=`field 5 ${dev}`
local min=`field 6 ${dev}`
maj=${maj%,}
-@@ -135,7 +135,7 @@
+@@ -135,7 +135,7 @@ parse() {
str="${ftype} ${name} ${str} ${dev} ${maj} ${min}"
;;
"slink")
diff --git a/target/linux/generic-2.6/patches-2.6.24/921-gpio_spi_driver.patch b/target/linux/generic-2.6/patches-2.6.24/921-gpio_spi_driver.patch
index eeb7285..1ad1932 100644
--- a/target/linux/generic-2.6/patches-2.6.24/921-gpio_spi_driver.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/921-gpio_spi_driver.patch
@@ -1,6 +1,6 @@
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
-@@ -100,6 +100,11 @@
+@@ -100,6 +100,11 @@ config SPI_BUTTERFLY
inexpensive battery powered microcontroller evaluation board.
This same cable can be used to flash new firmware.
@@ -14,7 +14,7 @@
depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
-@@ -16,6 +16,7 @@
+@@ -16,6 +16,7 @@ obj-$(CONFIG_SPI_BFIN) += spi_bfin5xx.
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.24/922-w1_gpio_driver_backport.patch b/target/linux/generic-2.6/patches-2.6.24/922-w1_gpio_driver_backport.patch
index fa2f38e..dc5aadf 100644
--- a/target/linux/generic-2.6/patches-2.6.24/922-w1_gpio_driver_backport.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/922-w1_gpio_driver_backport.patch
@@ -1,6 +1,6 @@
--- a/drivers/w1/masters/Kconfig
+++ b/drivers/w1/masters/Kconfig
-@@ -42,5 +42,15 @@
+@@ -42,5 +42,15 @@ config W1_MASTER_DS1WM
in HP iPAQ devices like h5xxx, h2200, and ASIC3-based like
hx4700.
@@ -18,7 +18,7 @@
--- a/drivers/w1/masters/Makefile
+++ b/drivers/w1/masters/Makefile
-@@ -6,3 +6,4 @@
+@@ -6,3 +6,4 @@ obj-$(CONFIG_W1_MASTER_MATROX) += matro
obj-$(CONFIG_W1_MASTER_DS2490) += ds2490.o
obj-$(CONFIG_W1_MASTER_DS2482) += ds2482.o
obj-$(CONFIG_W1_MASTER_DS1WM) += ds1wm.o
diff --git a/target/linux/generic-2.6/patches-2.6.24/930-ppc_big_endian_io_memory_accessors.patch b/target/linux/generic-2.6/patches-2.6.24/930-ppc_big_endian_io_memory_accessors.patch
index 5b3755e..25abf82 100644
--- a/target/linux/generic-2.6/patches-2.6.24/930-ppc_big_endian_io_memory_accessors.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/930-ppc_big_endian_io_memory_accessors.patch
@@ -32,7 +32,7 @@ and didn't make it with the ppc32 equivalent. Thanks.
---
--- a/include/asm-ppc/io.h
+++ b/include/asm-ppc/io.h
-@@ -413,11 +413,21 @@
+@@ -413,11 +413,21 @@ static inline unsigned int ioread16(void
return readw(addr);
}
@@ -54,7 +54,7 @@ and didn't make it with the ppc32 equivalent. Thanks.
static inline void iowrite8(u8 val, void __iomem *addr)
{
writeb(val, addr);
-@@ -428,11 +438,21 @@
+@@ -428,11 +438,21 @@ static inline void iowrite16(u16 val, vo
writew(val, addr);
}
diff --git a/target/linux/generic-2.6/patches-2.6.24/940-arm_mach_types.patch b/target/linux/generic-2.6/patches-2.6.24/940-arm_mach_types.patch
index 7d3a952..cfc8b6c 100644
--- a/target/linux/generic-2.6/patches-2.6.24/940-arm_mach_types.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/940-arm_mach_types.patch
@@ -9,7 +9,7 @@
#
# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
#
-@@ -266,7 +266,7 @@
+@@ -266,7 +266,7 @@ stork_egg ARCH_STORK_EGG STORK_EGG 24
wismo SA1100_WISMO WISMO 249
ezlinx ARCH_EZLINX EZLINX 250
at91rm9200 ARCH_AT91RM9200 AT91RM9200 251
@@ -18,7 +18,7 @@
neptune ARCH_NEPTUNE NEPTUNE 253
hackkit SA1100_HACKKIT HACKKIT 254
pxa_wins30 ARCH_PXA_WINS30 PXA_WINS30 255
-@@ -381,13 +381,13 @@
+@@ -381,13 +381,13 @@ ks8695p ARCH_KS8695P KS8695P 363
se4000 ARCH_SE4000 SE4000 364
quadriceps ARCH_QUADRICEPS QUADRICEPS 365
bronco ARCH_BRONCO BRONCO 366
@@ -34,7 +34,7 @@
rcube ARCH_RCUBE RCUBE 374
rea_olv ARCH_REA_OLV REA_OLV 375
pxa_iphone ARCH_PXA_IPHONE PXA_IPHONE 376
-@@ -661,7 +661,6 @@
+@@ -661,7 +661,6 @@ a9200ec MACH_A9200EC A9200EC 645
pnx0105 MACH_PNX0105 PNX0105 646
adcpoecpu MACH_ADCPOECPU ADCPOECPU 647
csb637 MACH_CSB637 CSB637 648
@@ -42,7 +42,7 @@
mb9200 MACH_MB9200 MB9200 650
kulun MACH_KULUN KULUN 651
snapper MACH_SNAPPER SNAPPER 652
-@@ -953,7 +952,6 @@
+@@ -953,7 +952,6 @@ fred_jack MACH_FRED_JACK FRED_JACK 93
ttg_color1 MACH_TTG_COLOR1 TTG_COLOR1 940
nxeb500hmi MACH_NXEB500HMI NXEB500HMI 941
netdcu8 MACH_NETDCU8 NETDCU8 942
@@ -50,7 +50,7 @@
ng_fvx538 MACH_NG_FVX538 NG_FVX538 944
ng_fvs338 MACH_NG_FVS338 NG_FVS338 945
pnx4103 MACH_PNX4103 PNX4103 946
-@@ -1148,7 +1146,7 @@
+@@ -1148,7 +1146,7 @@ aidx270 MACH_AIDX270 AIDX270 1134
rema MACH_REMA REMA 1135
bps1000 MACH_BPS1000 BPS1000 1136
hw90350 MACH_HW90350 HW90350 1137
@@ -59,7 +59,7 @@
bluetouch MACH_BLUETOUCH BLUETOUCH 1139
vstms MACH_VSTMS VSTMS 1140
xsbase270 MACH_XSBASE270 XSBASE270 1141
-@@ -1214,7 +1212,7 @@
+@@ -1214,7 +1212,7 @@ osstbox MACH_OSSTBOX OSSTBOX 1203
kbat9261 MACH_KBAT9261 KBAT9261 1204
ct1100 MACH_CT1100 CT1100 1205
akcppxa MACH_AKCPPXA AKCPPXA 1206
@@ -68,7 +68,7 @@
hitrack MACH_HITRACK HITRACK 1208
syme1 MACH_SYME1 SYME1 1209
syhl1 MACH_SYHL1 SYHL1 1210
-@@ -1299,7 +1297,7 @@
+@@ -1299,7 +1297,7 @@ xp179 MACH_XP179 XP179 1290
h4300 MACH_H4300 H4300 1291
goramo_mlr MACH_GORAMO_MLR GORAMO_MLR 1292
mxc30020evb MACH_MXC30020EVB MXC30020EVB 1293
@@ -77,7 +77,7 @@
adsportalplus MACH_ADSPORTALPLUS ADSPORTALPLUS 1295
mmsp2plus MACH_MMSP2PLUS MMSP2PLUS 1296
em_x270 MACH_EM_X270 EM_X270 1297
-@@ -1367,3 +1365,346 @@
+@@ -1367,3 +1365,346 @@ db88f5281 MACH_DB88F5281 DB88F5281 13
csb726 MACH_CSB726 CSB726 1359
tik27 MACH_TIK27 TIK27 1360
mx_uc7420 MACH_MX_UC7420 MX_UC7420 1361
diff --git a/target/linux/generic-2.6/patches-2.6.24/950-mtd_cfi_intel_p33_compatbility.patch b/target/linux/generic-2.6/patches-2.6.24/950-mtd_cfi_intel_p33_compatbility.patch
index 1ec71c4..42e8927 100644
--- a/target/linux/generic-2.6/patches-2.6.24/950-mtd_cfi_intel_p33_compatbility.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/950-mtd_cfi_intel_p33_compatbility.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
-@@ -277,7 +277,7 @@
+@@ -277,7 +277,7 @@ read_pri_intelext(struct map_info *map,
return NULL;
if (extp->MajorVersion != '1' ||
diff --git a/target/linux/generic-2.6/patches-2.6.24/975-crypto_kconfig_hacks.patch b/target/linux/generic-2.6/patches-2.6.24/975-crypto_kconfig_hacks.patch
index ec3fdc6..86d6ecd 100644
--- a/target/linux/generic-2.6/patches-2.6.24/975-crypto_kconfig_hacks.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/975-crypto_kconfig_hacks.patch
@@ -1,6 +1,6 @@
---- linux-2.6.24.7/crypto/Kconfig 2008-05-07 01:22:34.000000000 +0200
-+++ linux-2.6.24.7.new/crypto/Kconfig 2009-01-06 12:14:43.000000000 +0100
-@@ -20,7 +20,7 @@
+--- a/crypto/Kconfig
++++ b/crypto/Kconfig
+@@ -20,7 +20,7 @@ menuconfig CRYPTO
if CRYPTO
config CRYPTO_ALGAPI
@@ -9,7 +9,7 @@
help
This option provides the API for cryptographic algorithms.
-@@ -29,15 +29,15 @@
+@@ -29,15 +29,15 @@ config CRYPTO_ABLKCIPHER
select CRYPTO_BLKCIPHER
config CRYPTO_AEAD