-diff -x .git -Nur linux-2.6.25-rc9/Documentation/kernel-parameters.txt powerpc.git/Documentation/kernel-parameters.txt
---- linux-2.6.25-rc9/Documentation/kernel-parameters.txt 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/Documentation/kernel-parameters.txt 2008-04-19 16:40:52.000000000 +0200
-@@ -930,6 +930,8 @@
+--- a/Documentation/kernel-parameters.txt
++++ b/Documentation/kernel-parameters.txt
+@@ -930,6 +930,8 @@ and is between 256 and 4096 characters.
l2cr= [PPC]
lapic [X86-32,APIC] Enable the local APIC even if BIOS
disabled it.
-diff -x .git -Nur linux-2.6.25-rc9/Documentation/powerpc/booting-without-of.txt powerpc.git/Documentation/powerpc/booting-without-of.txt
---- linux-2.6.25-rc9/Documentation/powerpc/booting-without-of.txt 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/Documentation/powerpc/booting-without-of.txt 2008-04-19 16:40:52.000000000 +0200
-@@ -59,12 +59,39 @@
+--- a/Documentation/powerpc/booting-without-of.txt
++++ b/Documentation/powerpc/booting-without-of.txt
+@@ -59,12 +59,39 @@ Table of Contents
p) Freescale Synchronous Serial Interface
q) USB EHCI controllers
Appendix A - Sample SOC node for MPC8540
-@@ -1269,10 +1296,6 @@
+@@ -1269,10 +1296,6 @@ platforms are moved over to use the flat
Recommended properties:
- phy-connection-type : a string naming the controller/PHY interface type,
i.e., "mii" (default), "rmii", "gmii", "rgmii", "rgmii-id", "sgmii",
"tbi", or "rtbi". This property is only really needed if the connection
-@@ -1622,8 +1645,7 @@
+@@ -1622,8 +1645,7 @@ platforms are moved over to use the flat
- device_type : should be "network", "hldc", "uart", "transparent"
"bisync", "atm", or "serial".
- compatible : could be "ucc_geth" or "fsl_atm" and so on.
- reg : Offset and length of the register set for the device
- interrupts : <a b> where a is the interrupt number and b is a
field that represents an encoding of the sense and level
-@@ -1667,10 +1689,6 @@
+@@ -1667,10 +1689,6 @@ platforms are moved over to use the flat
- phy-handle : The phandle for the PHY connected to this controller.
Recommended properties:
- phy-connection-type : a string naming the controller/PHY interface type,
i.e., "mii" (default), "rmii", "gmii", "rgmii", "rgmii-id" (Internal
Delay), "rgmii-txid" (delay on TX only), "rgmii-rxid" (delay on RX only),
-@@ -1680,8 +1698,7 @@
+@@ -1680,8 +1698,7 @@ platforms are moved over to use the flat
ucc@2000 {
device_type = "network";
compatible = "ucc_geth";
reg = <2000 200>;
interrupts = <a0 0>;
interrupt-parent = <700>;
-@@ -1995,7 +2012,6 @@
+@@ -1995,7 +2012,6 @@ platforms are moved over to use the flat
interrupts = <20 8>;
interrupt-parent = <&PIC>;
phy-handle = <&PHY0>;
fsl,cpm-command = <12000300>;
};
-@@ -2217,12 +2233,6 @@
+@@ -2217,12 +2233,6 @@ platforms are moved over to use the flat
EMAC, that is the content of the current (bogus) "phy-port"
property.
Optional properties:
- phy-address : 1 cell, optional, MDIO address of the PHY. If absent,
a search is performed.
-@@ -2246,7 +2256,6 @@
+@@ -2246,7 +2256,6 @@ platforms are moved over to use the flat
Example:
EMAC0: ethernet@40000800 {
device_type = "network";
compatible = "ibm,emac-440gp", "ibm,emac";
interrupt-parent = <&UIC1>;
-@@ -2817,9 +2826,528 @@
+@@ -2817,9 +2826,528 @@ platforms are moved over to use the flat
};
===================================================
The device tree represents the busses and devices of a hardware
-@@ -2905,6 +3433,54 @@
+@@ -2905,6 +3433,54 @@ encodings listed below:
2 = high to low edge sensitive type enabled
3 = low to high edge sensitive type enabled
Appendix A - Sample SOC node for MPC8540
========================================
-diff -x .git -Nur linux-2.6.25-rc9/Documentation/powerpc/phyp-assisted-dump.txt powerpc.git/Documentation/powerpc/phyp-assisted-dump.txt
---- linux-2.6.25-rc9/Documentation/powerpc/phyp-assisted-dump.txt 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/Documentation/powerpc/phyp-assisted-dump.txt 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/Documentation/powerpc/phyp-assisted-dump.txt
@@ -0,0 +1,127 @@
+
+ Hypervisor-Assisted Dump
+
+ o Still need to write a shell script, to copy the dump away.
+ Currently I am parsing it manually.
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/Kconfig powerpc.git/arch/powerpc/Kconfig
---- linux-2.6.25-rc9/arch/powerpc/Kconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/Kconfig 2008-04-19 16:40:52.000000000 +0200
-@@ -49,6 +49,19 @@
+--- a/arch/powerpc/Kconfig
++++ b/arch/powerpc/Kconfig
+@@ -49,6 +49,19 @@ config IRQ_PER_CPU
bool
default y
config RWSEM_GENERIC_SPINLOCK
bool
-@@ -81,6 +94,11 @@
+@@ -81,6 +94,11 @@ config GENERIC_FIND_NEXT_BIT
bool
default y
config ARCH_NO_VIRT_TO_BUS
def_bool PPC64
-@@ -91,6 +109,7 @@
+@@ -91,6 +109,7 @@ config PPC
select HAVE_OPROFILE
select HAVE_KPROBES
select HAVE_KRETPROBES
config EARLY_PRINTK
bool
-@@ -210,15 +229,6 @@
+@@ -210,15 +229,6 @@ source kernel/Kconfig.hz
source kernel/Kconfig.preempt
source "fs/Kconfig.binfmt"
config HUGETLB_PAGE_SIZE_VARIABLE
bool
depends on HUGETLB_PAGE
-@@ -307,6 +317,16 @@
+@@ -307,6 +317,16 @@ config CRASH_DUMP
Don't change this unless you know what you are doing.
config PPCBUG_NVRAM
bool "Enable reading PPCBUG NVRAM during boot" if PPLUS || LOPEC
default y if PPC_PREP
-@@ -381,6 +401,26 @@
+@@ -381,6 +401,26 @@ config PPC_64K_PAGES
while on hardware with such support, it will be used to map
normal application pages.
config PPC_SUBPAGE_PROT
bool "Support setting protections for 4k subpages"
depends on PPC_64K_PAGES
-@@ -490,6 +530,14 @@
+@@ -490,6 +530,14 @@ config FSL_PCI
bool
select PPC_INDIRECT_PCI
# Yes MCA RS/6000s exist but Linux-PPC does not currently support any
config MCA
bool
-@@ -663,22 +711,6 @@
+@@ -663,22 +711,6 @@ config CONSISTENT_SIZE
hex "Size of consistent memory pool" if CONSISTENT_SIZE_BOOL
default "0x00200000" if NOT_COHERENT_CACHE
config PIN_TLB
bool "Pinned Kernel TLBs (860 ONLY)"
depends on ADVANCED_OPTIONS && 8xx
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/Kconfig.debug powerpc.git/arch/powerpc/Kconfig.debug
---- linux-2.6.25-rc9/arch/powerpc/Kconfig.debug 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/Kconfig.debug 2008-04-19 16:40:52.000000000 +0200
-@@ -269,7 +269,7 @@
+--- a/arch/powerpc/Kconfig.debug
++++ b/arch/powerpc/Kconfig.debug
+@@ -269,7 +269,7 @@ config PPC_EARLY_DEBUG_CPM_ADDR
hex "CPM UART early debug transmit descriptor address"
depends on PPC_EARLY_DEBUG_CPM
default "0xfa202008" if PPC_EP88XC
default "0xff002008" if CPM1
help
This specifies the address of the transmit descriptor
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/Makefile powerpc.git/arch/powerpc/Makefile
---- linux-2.6.25-rc9/arch/powerpc/Makefile 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/Makefile 2008-04-19 16:40:52.000000000 +0200
-@@ -71,13 +71,11 @@
+--- a/arch/powerpc/Makefile
++++ b/arch/powerpc/Makefile
+@@ -71,13 +71,11 @@ endif
LDFLAGS_vmlinux := -Bstatic
CPP = $(CC) -E $(KBUILD_CFLAGS)
CHECKFLAGS += -m$(CONFIG_WORD_SIZE) -D__powerpc__ -D__powerpc$(CONFIG_WORD_SIZE)__
-@@ -164,7 +162,7 @@
+@@ -164,7 +162,7 @@ boot := arch/$(ARCH)/boot
$(BOOT_TARGETS): vmlinux
$(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)
$(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)
define archhelp
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/Makefile powerpc.git/arch/powerpc/boot/Makefile
---- linux-2.6.25-rc9/arch/powerpc/boot/Makefile 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/Makefile 2008-04-19 16:40:52.000000000 +0200
-@@ -40,6 +40,7 @@
+--- a/arch/powerpc/boot/Makefile
++++ b/arch/powerpc/boot/Makefile
+@@ -40,6 +40,7 @@ $(obj)/ebony.o: BOOTCFLAGS += -mcpu=405
$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
$(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
zlib := inffast.c inflate.c inftrees.c
-@@ -64,7 +65,8 @@
+@@ -64,7 +65,8 @@ src-plat := of.c cuboot-52xx.c cuboot-82
cuboot-bamboo.c cuboot-mpc7448hpc2.c cuboot-taishan.c \
fixed-head.S ep88xc.c ep405.c \
cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \
src-boot := $(src-wlib) $(src-plat) empty.c
src-boot := $(addprefix $(obj)/, $(src-boot))
-@@ -192,7 +194,7 @@
+@@ -192,7 +194,7 @@ image-$(CONFIG_PPC_CHRP) += zImage.chrp
image-$(CONFIG_PPC_EFIKA) += zImage.chrp
image-$(CONFIG_PPC_PMAC) += zImage.pmac
image-$(CONFIG_PPC_HOLLY) += zImage.holly
image-$(CONFIG_PPC_ISERIES) += zImage.iseries
image-$(CONFIG_DEFAULT_UIMAGE) += uImage
-@@ -216,6 +218,7 @@
+@@ -216,6 +218,7 @@ image-$(CONFIG_RAINIER) += cuImage.rai
image-$(CONFIG_TAISHAN) += cuImage.taishan
image-$(CONFIG_KATMAI) += cuImage.katmai
image-$(CONFIG_WARP) += cuImage.warp
# Board ports in arch/powerpc/platform/8xx/Kconfig
image-$(CONFIG_PPC_MPC86XADS) += cuImage.mpc866ads
-@@ -255,6 +258,7 @@
+@@ -255,6 +258,7 @@ image-$(CONFIG_TQM8555) += cuImage.tqm
image-$(CONFIG_TQM8560) += cuImage.tqm8560
image-$(CONFIG_SBC8548) += cuImage.sbc8548
image-$(CONFIG_SBC8560) += cuImage.sbc8560
# Board ports in arch/powerpc/platform/embedded6xx/Kconfig
image-$(CONFIG_STORCENTER) += cuImage.storcenter
-@@ -285,11 +289,11 @@
+@@ -285,11 +289,11 @@ $(obj)/zImage.%: vmlinux $(wrapperbits)
$(call if_changed,wrap,$*)
# dtbImage% - a dtbImage is a zImage with an embedded device tree blob
# This cannot be in the root of $(src) as the zImage rule always adds a $(obj)
# prefix
-@@ -302,14 +306,24 @@
+@@ -302,14 +306,24 @@ $(obj)/zImage.iseries: vmlinux
$(obj)/uImage: vmlinux $(wrapperbits)
$(call if_changed,wrap,uboot)
# If there isn't a platform selected then just strip the vmlinux.
ifeq (,$(image-y))
-@@ -326,7 +340,7 @@
+@@ -326,7 +340,7 @@ install: $(CONFIGURE) $(addprefix $(obj)
# anything not in $(targets)
clean-files += $(image-) $(initrd-) zImage zImage.initrd cuImage.* treeImage.* \
# clean up files cached by wrapper
clean-kernel := vmlinux.strip vmlinux.bin
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/bamboo.c powerpc.git/arch/powerpc/boot/bamboo.c
---- linux-2.6.25-rc9/arch/powerpc/boot/bamboo.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/bamboo.c 2008-04-19 16:40:52.000000000 +0200
-@@ -33,7 +33,8 @@
+--- a/arch/powerpc/boot/bamboo.c
++++ b/arch/powerpc/boot/bamboo.c
+@@ -33,7 +33,8 @@ static void bamboo_fixups(void)
ibm440ep_fixup_clocks(sysclk, 11059200, 25000000);
ibm4xx_sdram_fixup_memsize();
ibm4xx_quiesce_eth((u32 *)0xef600e00, (u32 *)0xef600f00);
}
void bamboo_init(void *mac0, void *mac1)
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/cpm-serial.c powerpc.git/arch/powerpc/boot/cpm-serial.c
---- linux-2.6.25-rc9/arch/powerpc/boot/cpm-serial.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/cpm-serial.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/cpm-serial.c
++++ b/arch/powerpc/boot/cpm-serial.c
@@ -11,6 +11,7 @@
#include "types.h"
#include "io.h"
struct cpm_scc {
u32 gsmrl;
-@@ -42,6 +43,22 @@
+@@ -42,6 +43,22 @@ struct cpm_param {
u16 tbase;
u8 rfcr;
u8 tfcr;
};
struct cpm_bd {
-@@ -54,10 +71,10 @@
+@@ -54,10 +71,10 @@ static void *cpcr;
static struct cpm_param *param;
static struct cpm_smc *smc;
static struct cpm_scc *scc;
static void (*do_cmd)(int op);
static void (*enable_port)(void);
-@@ -119,20 +136,25 @@
+@@ -119,20 +136,25 @@ static int cpm_serial_open(void)
out_8(¶m->rfcr, 0x10);
out_8(¶m->tfcr, 0x10);
do_cmd(CPM_CMD_INIT_RX_TX);
-@@ -175,10 +197,12 @@
+@@ -175,10 +197,12 @@ static unsigned char cpm_serial_getc(voi
int cpm_console_init(void *devp, struct serial_console_data *scdp)
{
if (dt_is_compatible(devp, "fsl,cpm1-smc-uart")) {
is_smc = 1;
-@@ -202,63 +226,64 @@
+@@ -202,63 +226,64 @@ int cpm_console_init(void *devp, struct
else
do_cmd = cpm1_cmd;
scdp->open = cpm_serial_open;
scdp->putc = cpm_serial_putc;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/cuboot-pq2.c powerpc.git/arch/powerpc/boot/cuboot-pq2.c
---- linux-2.6.25-rc9/arch/powerpc/boot/cuboot-pq2.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/cuboot-pq2.c 2008-04-19 16:40:52.000000000 +0200
-@@ -128,7 +128,7 @@
+--- a/arch/powerpc/boot/cuboot-pq2.c
++++ b/arch/powerpc/boot/cuboot-pq2.c
+@@ -128,7 +128,7 @@ static void fixup_pci(void)
u8 *soc_regs;
int i, len;
void *node, *parent_node;
node = finddevice("/pci");
if (!node || !dt_is_compatible(node, "fsl,pq2-pci"))
-@@ -141,7 +141,7 @@
+@@ -141,7 +141,7 @@ static void fixup_pci(void)
soc_regs = (u8 *)fsl_get_immr();
if (!soc_regs)
dt_get_reg_format(node, &naddr, &nsize);
if (naddr != 3 || nsize != 2)
-@@ -153,7 +153,7 @@
+@@ -153,7 +153,7 @@ static void fixup_pci(void)
dt_get_reg_format(parent_node, &naddr, &nsize);
if (naddr != 1 || nsize != 1)
len = getprop(node, "ranges", pci_ranges_buf,
sizeof(pci_ranges_buf));
-@@ -170,14 +170,20 @@
+@@ -170,14 +170,20 @@ static void fixup_pci(void)
}
if (!mem || !mmio || !io)
out_be32(&pci_regs[1][0], mem_base->phys_addr | 1);
out_be32(&pci_regs[2][0], ~(mem->size[1] + mmio->size[1] - 1));
-@@ -201,8 +207,9 @@
+@@ -201,8 +207,9 @@ static void fixup_pci(void)
out_le32(&pci_regs[0][58], 0);
out_le32(&pci_regs[0][60], 0);
/* If PCI is disabled, drive RST high to enable. */
if (!(in_le32(&pci_regs[0][32]) & 1)) {
-@@ -228,7 +235,11 @@
+@@ -228,7 +235,11 @@ static void fixup_pci(void)
return;
err:
}
static void pq2_platform_fixups(void)
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/cuboot-rainier.c powerpc.git/arch/powerpc/boot/cuboot-rainier.c
---- linux-2.6.25-rc9/arch/powerpc/boot/cuboot-rainier.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/cuboot-rainier.c 2008-04-19 16:40:52.000000000 +0200
-@@ -42,7 +42,8 @@
+--- a/arch/powerpc/boot/cuboot-rainier.c
++++ b/arch/powerpc/boot/cuboot-rainier.c
+@@ -42,7 +42,8 @@ static void rainier_fixups(void)
ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
ibm4xx_denali_fixup_memsize();
}
void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/cuboot-sequoia.c powerpc.git/arch/powerpc/boot/cuboot-sequoia.c
---- linux-2.6.25-rc9/arch/powerpc/boot/cuboot-sequoia.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/cuboot-sequoia.c 2008-04-19 16:40:52.000000000 +0200
-@@ -42,7 +42,8 @@
+--- a/arch/powerpc/boot/cuboot-sequoia.c
++++ b/arch/powerpc/boot/cuboot-sequoia.c
+@@ -42,7 +42,8 @@ static void sequoia_fixups(void)
ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
ibm4xx_denali_fixup_memsize();
}
void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/cuboot-taishan.c powerpc.git/arch/powerpc/boot/cuboot-taishan.c
---- linux-2.6.25-rc9/arch/powerpc/boot/cuboot-taishan.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/cuboot-taishan.c 2008-04-19 16:40:52.000000000 +0200
-@@ -40,7 +40,8 @@
+--- a/arch/powerpc/boot/cuboot-taishan.c
++++ b/arch/powerpc/boot/cuboot-taishan.c
+@@ -40,7 +40,8 @@ static void taishan_fixups(void)
ibm4xx_sdram_fixup_memsize();
ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/cuboot-warp.c powerpc.git/arch/powerpc/boot/cuboot-warp.c
---- linux-2.6.25-rc9/arch/powerpc/boot/cuboot-warp.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/cuboot-warp.c 2008-04-19 16:40:52.000000000 +0200
-@@ -24,7 +24,7 @@
+--- a/arch/powerpc/boot/cuboot-warp.c
++++ b/arch/powerpc/boot/cuboot-warp.c
+@@ -24,7 +24,7 @@ static void warp_fixups(void)
ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
ibm4xx_sdram_fixup_memsize();
ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/cuboot-yosemite.c powerpc.git/arch/powerpc/boot/cuboot-yosemite.c
---- linux-2.6.25-rc9/arch/powerpc/boot/cuboot-yosemite.c 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/cuboot-yosemite.c 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/boot/cuboot-yosemite.c
@@ -0,0 +1,44 @@
+/*
+ * Old U-boot compatibility for Yosemite
+ fdt_init(_dtb_start);
+ serial_console_init();
+}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/devtree.c powerpc.git/arch/powerpc/boot/devtree.c
---- linux-2.6.25-rc9/arch/powerpc/boot/devtree.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/devtree.c 2008-04-19 16:40:52.000000000 +0200
-@@ -350,3 +350,23 @@
+--- a/arch/powerpc/boot/devtree.c
++++ b/arch/powerpc/boot/devtree.c
+@@ -350,3 +350,23 @@ int dt_is_compatible(void *node, const c
return 0;
}
+ return n;
+}
+
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/bamboo.dts powerpc.git/arch/powerpc/boot/dts/bamboo.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/bamboo.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/bamboo.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/bamboo.dts
++++ b/arch/powerpc/boot/dts/bamboo.dts
@@ -204,7 +204,6 @@
};
device_type = "network";
compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
interrupt-parent = <&UIC1>;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/canyonlands.dts powerpc.git/arch/powerpc/boot/dts/canyonlands.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/canyonlands.dts 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/canyonlands.dts 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/boot/dts/canyonlands.dts
@@ -0,0 +1,402 @@
+/*
+ * Device Tree Source for AMCC Canyonlands (460EX)
+ };
+ };
+};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/ebony.dts powerpc.git/arch/powerpc/boot/dts/ebony.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/ebony.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/ebony.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/ebony.dts
++++ b/arch/powerpc/boot/dts/ebony.dts
@@ -241,7 +241,6 @@
};
device_type = "network";
compatible = "ibm,emac-440gp", "ibm,emac";
interrupt-parent = <&UIC1>;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/ep8248e.dts powerpc.git/arch/powerpc/boot/dts/ep8248e.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/ep8248e.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/ep8248e.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/ep8248e.dts
++++ b/arch/powerpc/boot/dts/ep8248e.dts
@@ -121,8 +121,7 @@
data@0 {
interrupts = <4 8>;
interrupt-parent = <&PIC>;
fsl,cpm-brg = <7>;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/ep88xc.dts powerpc.git/arch/powerpc/boot/dts/ep88xc.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/ep88xc.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/ep88xc.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/ep88xc.dts
++++ b/arch/powerpc/boot/dts/ep88xc.dts
@@ -2,7 +2,7 @@
* EP88xC Device Tree Source
*
fsl,cpm-command = <0000>;
};
};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/glacier.dts powerpc.git/arch/powerpc/boot/dts/glacier.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/glacier.dts 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/glacier.dts 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/boot/dts/glacier.dts
@@ -0,0 +1,467 @@
+/*
+ * Device Tree Source for AMCC Glacier (460GT)
+ };
+ };
+};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/haleakala.dts powerpc.git/arch/powerpc/boot/dts/haleakala.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/haleakala.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/haleakala.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/haleakala.dts
++++ b/arch/powerpc/boot/dts/haleakala.dts
@@ -12,7 +12,7 @@
#address-cells = <1>;
#size-cells = <1>;
rx-fifo-size = <1000>;
tx-fifo-size = <800>;
phy-mode = "rgmii";
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/katmai.dts powerpc.git/arch/powerpc/boot/dts/katmai.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/katmai.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/katmai.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/katmai.dts
++++ b/arch/powerpc/boot/dts/katmai.dts
@@ -212,7 +212,7 @@
mal-tx-channel = <0>;
mal-rx-channel = <0>;
rx-fifo-size = <1000>;
tx-fifo-size = <800>;
phy-mode = "gmii";
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/kilauea.dts powerpc.git/arch/powerpc/boot/dts/kilauea.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/kilauea.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/kilauea.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/kilauea.dts
++++ b/arch/powerpc/boot/dts/kilauea.dts
@@ -219,7 +219,7 @@
mal-tx-channel = <0>;
mal-rx-channel = <0>;
rx-fifo-size = <1000>;
tx-fifo-size = <800>;
phy-mode = "rgmii";
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/ksi8560.dts powerpc.git/arch/powerpc/boot/dts/ksi8560.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/ksi8560.dts 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/ksi8560.dts 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/boot/dts/ksi8560.dts
@@ -0,0 +1,267 @@
+/*
+ * Device Tree Source for Emerson KSI8560
+ linux,stdout-path = "/soc/cpm/serial@91a00";
+ };
+};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/kuroboxHD.dts powerpc.git/arch/powerpc/boot/dts/kuroboxHD.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/kuroboxHD.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/kuroboxHD.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/kuroboxHD.dts
++++ b/arch/powerpc/boot/dts/kuroboxHD.dts
@@ -7,6 +7,7 @@
* Based on sandpoint.dts
*
*
* This file is licensed under
* the terms of the GNU General Public License version 2. This program
-@@ -17,6 +18,8 @@
+@@ -17,6 +18,8 @@ XXXX add flash parts, rtc, ??
*/
/ {
model = "KuroboxHD";
compatible = "linkstation";
-@@ -35,19 +38,19 @@
+@@ -35,19 +38,19 @@ XXXX add flash parts, rtc, ??
PowerPC,603e { /* Really 8241 */
device_type = "cpu";
};
soc10x { /* AFAICT need to make soc for 8245's uarts to be defined */
-@@ -56,26 +59,26 @@
+@@ -56,26 +59,26 @@ XXXX add flash parts, rtc, ??
device_type = "soc";
compatible = "mpc10x";
store-gathering = <0>; /* 0 == off, !0 == on */
};
};
-@@ -83,9 +86,9 @@
+@@ -83,9 +86,9 @@ XXXX add flash parts, rtc, ??
cell-index = <0>;
device_type = "serial";
compatible = "ns16550";
interrupts = <9 0>;
interrupt-parent = <&mpic>;
};
-@@ -94,10 +97,10 @@
+@@ -94,10 +97,10 @@ XXXX add flash parts, rtc, ??
cell-index = <1>;
device_type = "serial";
compatible = "ns16550";
interrupt-parent = <&mpic>;
};
-@@ -107,7 +110,7 @@
+@@ -107,7 +110,7 @@ XXXX add flash parts, rtc, ??
device_type = "open-pic";
compatible = "chrp,open-pic";
interrupt-controller;
};
pci0: pci@fec00000 {
-@@ -116,29 +119,29 @@
+@@ -116,29 +119,29 @@ XXXX add flash parts, rtc, ??
#interrupt-cells = <1>;
device_type = "pci";
compatible = "mpc10x-pci";
>;
};
};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/kuroboxHG.dts powerpc.git/arch/powerpc/boot/dts/kuroboxHG.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/kuroboxHG.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/kuroboxHG.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/kuroboxHG.dts
++++ b/arch/powerpc/boot/dts/kuroboxHG.dts
@@ -7,6 +7,7 @@
* Based on sandpoint.dts
*
*
* This file is licensed under
* the terms of the GNU General Public License version 2. This program
-@@ -17,6 +18,8 @@
+@@ -17,6 +18,8 @@ XXXX add flash parts, rtc, ??
*/
/ {
model = "KuroboxHG";
compatible = "linkstation";
-@@ -35,19 +38,19 @@
+@@ -35,19 +38,19 @@ XXXX add flash parts, rtc, ??
PowerPC,603e { /* Really 8241 */
device_type = "cpu";
};
soc10x { /* AFAICT need to make soc for 8245's uarts to be defined */
-@@ -56,26 +59,26 @@
+@@ -56,26 +59,26 @@ XXXX add flash parts, rtc, ??
device_type = "soc";
compatible = "mpc10x";
store-gathering = <0>; /* 0 == off, !0 == on */
};
};
-@@ -83,9 +86,9 @@
+@@ -83,9 +86,9 @@ XXXX add flash parts, rtc, ??
cell-index = <0>;
device_type = "serial";
compatible = "ns16550";
interrupts = <9 0>;
interrupt-parent = <&mpic>;
};
-@@ -94,10 +97,10 @@
+@@ -94,10 +97,10 @@ XXXX add flash parts, rtc, ??
cell-index = <1>;
device_type = "serial";
compatible = "ns16550";
interrupt-parent = <&mpic>;
};
-@@ -107,7 +110,7 @@
+@@ -107,7 +110,7 @@ XXXX add flash parts, rtc, ??
device_type = "open-pic";
compatible = "chrp,open-pic";
interrupt-controller;
};
pci0: pci@fec00000 {
-@@ -116,29 +119,29 @@
+@@ -116,29 +119,29 @@ XXXX add flash parts, rtc, ??
#interrupt-cells = <1>;
device_type = "pci";
compatible = "mpc10x-pci";
>;
};
};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/makalu.dts powerpc.git/arch/powerpc/boot/dts/makalu.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/makalu.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/makalu.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/makalu.dts
++++ b/arch/powerpc/boot/dts/makalu.dts
@@ -219,7 +219,7 @@
mal-tx-channel = <0>;
mal-rx-channel = <0>;
rx-fifo-size = <1000>;
tx-fifo-size = <800>;
phy-mode = "rgmii";
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc7448hpc2.dts powerpc.git/arch/powerpc/boot/dts/mpc7448hpc2.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc7448hpc2.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc7448hpc2.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/mpc7448hpc2.dts
++++ b/arch/powerpc/boot/dts/mpc7448hpc2.dts
@@ -1,7 +1,7 @@
/*
* MPC7448HPC2 (Taiga) board Device Tree Source
interrupt-parent = <&mpic>;
};
};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8272ads.dts powerpc.git/arch/powerpc/boot/dts/mpc8272ads.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8272ads.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8272ads.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/mpc8272ads.dts
++++ b/arch/powerpc/boot/dts/mpc8272ads.dts
@@ -1,7 +1,7 @@
/*
* MPC8272 ADS Device Tree Source
};
};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc832x_mds.dts powerpc.git/arch/powerpc/boot/dts/mpc832x_mds.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc832x_mds.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc832x_mds.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
++++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -255,9 +255,7 @@
enet0: ucc@2200 {
device_type = "network";
port-number = <0>; /* Which ttyQEx device */
soft-uart; /* We need Soft-UART */
reg = <0x2400 0x200>;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc832x_rdb.dts powerpc.git/arch/powerpc/boot/dts/mpc832x_rdb.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc832x_rdb.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc832x_rdb.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
++++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -208,9 +208,7 @@
enet0: ucc@3000 {
device_type = "network";
reg = <0x2200 0x200>;
interrupts = <34>;
interrupt-parent = <&qeic>;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc836x_mds.dts powerpc.git/arch/powerpc/boot/dts/mpc836x_mds.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc836x_mds.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc836x_mds.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/mpc836x_mds.dts
++++ b/arch/powerpc/boot/dts/mpc836x_mds.dts
@@ -257,9 +257,7 @@
enet0: ucc@2000 {
device_type = "network";
reg = <0x3000 0x200>;
interrupts = <33>;
interrupt-parent = <&qeic>;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8540ads.dts powerpc.git/arch/powerpc/boot/dts/mpc8540ads.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8540ads.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8540ads.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/mpc8540ads.dts
++++ b/arch/powerpc/boot/dts/mpc8540ads.dts
@@ -1,7 +1,7 @@
/*
* MPC8540 ADS Device Tree Source
compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
device_type = "pci";
};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8541cds.dts powerpc.git/arch/powerpc/boot/dts/mpc8541cds.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8541cds.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8541cds.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/mpc8541cds.dts
++++ b/arch/powerpc/boot/dts/mpc8541cds.dts
@@ -1,7 +1,7 @@
/*
* MPC8541 CDS Device Tree Source
compatible = "fsl,mpc8540-pci";
device_type = "pci";
};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8544ds.dts powerpc.git/arch/powerpc/boot/dts/mpc8544ds.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8544ds.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8544ds.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/mpc8544ds.dts
++++ b/arch/powerpc/boot/dts/mpc8544ds.dts
@@ -1,7 +1,7 @@
/*
* MPC8544 DS Device Tree Source
};
};
};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8548cds.dts powerpc.git/arch/powerpc/boot/dts/mpc8548cds.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8548cds.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8548cds.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/mpc8548cds.dts
++++ b/arch/powerpc/boot/dts/mpc8548cds.dts
@@ -1,7 +1,7 @@
/*
* MPC8548 CDS Device Tree Source
};
};
};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8555cds.dts powerpc.git/arch/powerpc/boot/dts/mpc8555cds.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8555cds.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8555cds.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/mpc8555cds.dts
++++ b/arch/powerpc/boot/dts/mpc8555cds.dts
@@ -1,7 +1,7 @@
/*
* MPC8555 CDS Device Tree Source
compatible = "fsl,mpc8540-pci";
device_type = "pci";
};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8560ads.dts powerpc.git/arch/powerpc/boot/dts/mpc8560ads.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8560ads.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8560ads.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/mpc8560ads.dts
++++ b/arch/powerpc/boot/dts/mpc8560ads.dts
@@ -1,7 +1,7 @@
/*
* MPC8560 ADS Device Tree Source
+ 0x1000000 0x0 0x0 0xe2000000 0x0 0x1000000>;
};
};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8568mds.dts powerpc.git/arch/powerpc/boot/dts/mpc8568mds.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8568mds.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8568mds.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/mpc8568mds.dts
++++ b/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -1,7 +1,7 @@
/*
* MPC8568E MDS Device Tree Source
};
};
};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8572ds.dts powerpc.git/arch/powerpc/boot/dts/mpc8572ds.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8572ds.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8572ds.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/mpc8572ds.dts
++++ b/arch/powerpc/boot/dts/mpc8572ds.dts
@@ -1,7 +1,7 @@
/*
* MPC8572 DS Device Tree Source
};
};
};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8641_hpcn.dts powerpc.git/arch/powerpc/boot/dts/mpc8641_hpcn.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc8641_hpcn.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8641_hpcn.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
++++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
@@ -13,7 +13,7 @@
/ {
#address-cells = <1>;
#size-cells = <1>;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc866ads.dts powerpc.git/arch/powerpc/boot/dts/mpc866ads.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc866ads.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc866ads.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/mpc866ads.dts
++++ b/arch/powerpc/boot/dts/mpc866ads.dts
@@ -2,6 +2,7 @@
* MPC866 ADS Device Tree Source
*
interrupt-parent = <&CPM_PIC>;
fsl,cpm-command = <0000>;
linux,network-index = <1>;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc885ads.dts powerpc.git/arch/powerpc/boot/dts/mpc885ads.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/mpc885ads.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/mpc885ads.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/mpc885ads.dts
++++ b/arch/powerpc/boot/dts/mpc885ads.dts
@@ -2,7 +2,7 @@
* MPC885 ADS Device Tree Source
*
linux,network-index = <2>;
};
};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/pq2fads.dts powerpc.git/arch/powerpc/boot/dts/pq2fads.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/pq2fads.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/pq2fads.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/pq2fads.dts
++++ b/arch/powerpc/boot/dts/pq2fads.dts
@@ -1,7 +1,7 @@
/*
* Device Tree for the PQ2FADS-ZU board with an MPC8280 chip.
compatible = "fsl,mpc8280-pic", "fsl,cpm2-pic";
};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/prpmc2800.dts powerpc.git/arch/powerpc/boot/dts/prpmc2800.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/prpmc2800.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/prpmc2800.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/prpmc2800.dts
++++ b/arch/powerpc/boot/dts/prpmc2800.dts
@@ -11,6 +11,8 @@
* if it can determine the exact PrPMC type.
*/
+ linux,stdout-path = &MPSC0;
};
};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/rainier.dts powerpc.git/arch/powerpc/boot/dts/rainier.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/rainier.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/rainier.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/rainier.dts
++++ b/arch/powerpc/boot/dts/rainier.dts
@@ -254,7 +254,6 @@
};
rx-fifo-size = <1000>;
tx-fifo-size = <800>;
phy-mode = "rgmii";
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/sbc8641d.dts powerpc.git/arch/powerpc/boot/dts/sbc8641d.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/sbc8641d.dts 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/sbc8641d.dts 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/boot/dts/sbc8641d.dts
@@ -0,0 +1,352 @@
+/*
+ * SBC8641D Device Tree Source
+ };
+ };
+};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/sequoia.dts powerpc.git/arch/powerpc/boot/dts/sequoia.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/sequoia.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/sequoia.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/sequoia.dts
++++ b/arch/powerpc/boot/dts/sequoia.dts
@@ -269,7 +269,6 @@
};
rx-fifo-size = <1000>;
tx-fifo-size = <800>;
phy-mode = "rgmii";
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/taishan.dts powerpc.git/arch/powerpc/boot/dts/taishan.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/taishan.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/taishan.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/taishan.dts
++++ b/arch/powerpc/boot/dts/taishan.dts
@@ -104,6 +104,16 @@
// FIXME: anything else?
};
};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/taishan.dts.orig powerpc.git/arch/powerpc/boot/dts/taishan.dts.orig
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/taishan.dts.orig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/taishan.dts.orig 2008-03-17 14:29:26.000000000 +0100
-@@ -0,0 +1,406 @@
-+/*
-+ * Device Tree Source for IBM/AMCC Taishan
-+ *
-+ * Copyright 2007 IBM Corp.
-+ * Hugh Blemings <hugh@au.ibm.com> based off code by
-+ * Josh Boyer <jwboyer@linux.vnet.ibm.com>, David Gibson <dwg@au1.ibm.com>
-+ *
-+ * This file is licensed under the terms of the GNU General Public
-+ * License version 2. This program is licensed "as is" without
-+ * any warranty of any kind, whether express or implied.
-+ */
-+
-+/ {
-+ #address-cells = <2>;
-+ #size-cells = <1>;
-+ model = "amcc,taishan";
-+ compatible = "amcc,taishan";
-+ dcr-parent = <&/cpus/cpu@0>;
-+
-+ aliases {
-+ ethernet0 = &EMAC2;
-+ ethernet1 = &EMAC3;
-+ serial0 = &UART0;
-+ serial1 = &UART1;
-+ };
-+
-+ cpus {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ cpu@0 {
-+ device_type = "cpu";
-+ model = "PowerPC,440GX";
-+ reg = <0>;
-+ clock-frequency = <2FAF0800>; // 800MHz
-+ timebase-frequency = <0>; // Filled in by zImage
-+ i-cache-line-size = <32>;
-+ d-cache-line-size = <32>;
-+ i-cache-size = <8000>; /* 32 kB */
-+ d-cache-size = <8000>; /* 32 kB */
-+ dcr-controller;
-+ dcr-access-method = "native";
-+ };
-+ };
-+
-+ memory {
-+ device_type = "memory";
-+ reg = <0 0 0>; // Filled in by zImage
-+ };
-+
-+
-+ UICB0: interrupt-controller-base {
-+ compatible = "ibm,uic-440gx", "ibm,uic";
-+ interrupt-controller;
-+ cell-index = <3>;
-+ dcr-reg = <200 009>;
-+ #address-cells = <0>;
-+ #size-cells = <0>;
-+ #interrupt-cells = <2>;
-+ };
-+
-+
-+ UIC0: interrupt-controller0 {
-+ compatible = "ibm,uic-440gx", "ibm,uic";
-+ interrupt-controller;
-+ cell-index = <0>;
-+ dcr-reg = <0c0 009>;
-+ #address-cells = <0>;
-+ #size-cells = <0>;
-+ #interrupt-cells = <2>;
-+ interrupts = <01 4 00 4>; /* cascade - first non-critical */
-+ interrupt-parent = <&UICB0>;
-+
-+ };
-+
-+ UIC1: interrupt-controller1 {
-+ compatible = "ibm,uic-440gx", "ibm,uic";
-+ interrupt-controller;
-+ cell-index = <1>;
-+ dcr-reg = <0d0 009>;
-+ #address-cells = <0>;
-+ #size-cells = <0>;
-+ #interrupt-cells = <2>;
-+ interrupts = <03 4 02 4>; /* cascade */
-+ interrupt-parent = <&UICB0>;
-+ };
-+
-+ UIC2: interrupt-controller2 {
-+ compatible = "ibm,uic-440gx", "ibm,uic";
-+ interrupt-controller;
-+ cell-index = <2>; /* was 1 */
-+ dcr-reg = <210 009>;
-+ #address-cells = <0>;
-+ #size-cells = <0>;
-+ #interrupt-cells = <2>;
-+ interrupts = <05 4 04 4>; /* cascade */
-+ interrupt-parent = <&UICB0>;
-+ };
-+
-+
-+ CPC0: cpc {
-+ compatible = "ibm,cpc-440gp";
-+ dcr-reg = <0b0 003 0e0 010>;
-+ // FIXME: anything else?
-+ };
-+
-+ plb {
-+ compatible = "ibm,plb-440gx", "ibm,plb4";
-+ #address-cells = <2>;
-+ #size-cells = <1>;
-+ ranges;
-+ clock-frequency = <9896800>; // 160MHz
-+
-+ SDRAM0: memory-controller {
-+ compatible = "ibm,sdram-440gp";
-+ dcr-reg = <010 2>;
-+ // FIXME: anything else?
-+ };
-+
-+ SRAM0: sram {
-+ compatible = "ibm,sram-440gp";
-+ dcr-reg = <020 8 00a 1>;
-+ };
-+
-+ DMA0: dma {
-+ // FIXME: ???
-+ compatible = "ibm,dma-440gp";
-+ dcr-reg = <100 027>;
-+ };
-+
-+ MAL0: mcmal {
-+ compatible = "ibm,mcmal-440gx", "ibm,mcmal2";
-+ dcr-reg = <180 62>;
-+ num-tx-chans = <4>;
-+ num-rx-chans = <4>;
-+ interrupt-parent = <&MAL0>;
-+ interrupts = <0 1 2 3 4>;
-+ #interrupt-cells = <1>;
-+ #address-cells = <0>;
-+ #size-cells = <0>;
-+ interrupt-map = </*TXEOB*/ 0 &UIC0 a 4
-+ /*RXEOB*/ 1 &UIC0 b 4
-+ /*SERR*/ 2 &UIC1 0 4
-+ /*TXDE*/ 3 &UIC1 1 4
-+ /*RXDE*/ 4 &UIC1 2 4>;
-+ interrupt-map-mask = <ffffffff>;
-+ };
-+
-+ POB0: opb {
-+ compatible = "ibm,opb-440gx", "ibm,opb";
-+ #address-cells = <1>;
-+ #size-cells = <1>;
-+ /* Wish there was a nicer way of specifying a full 32-bit
-+ range */
-+ ranges = <00000000 1 00000000 80000000
-+ 80000000 1 80000000 80000000>;
-+ dcr-reg = <090 00b>;
-+ interrupt-parent = <&UIC1>;
-+ interrupts = <7 4>;
-+ clock-frequency = <4C4B400>; // 80MHz
-+
-+
-+ EBC0: ebc {
-+ compatible = "ibm,ebc-440gx", "ibm,ebc";
-+ dcr-reg = <012 2>;
-+ #address-cells = <2>;
-+ #size-cells = <1>;
-+ clock-frequency = <4C4B400>; // 80MHz
-+
-+ /* ranges property is supplied by zImage
-+ * based on firmware's configuration of the
-+ * EBC bridge */
-+
-+ interrupts = <5 4>;
-+ interrupt-parent = <&UIC1>;
-+
-+ nor_flash@0,0 {
-+ compatible = "cfi-flash";
-+ bank-width = <4>;
-+ device-width = <2>;
-+ reg = <0 000000 4000000>;
-+ #address-cells = <1>;
-+ #size-cells = <1>;
-+ partition@0 {
-+ label = "kernel";
-+ reg = <0 180000>;
-+ };
-+ partition@180000 {
-+ label = "root";
-+ reg = <180000 200000>;
-+ };
-+ partition@380000 {
-+ label = "user";
-+ reg = <380000 3bc0000>;
-+ };
-+ partition@3f40000 {
-+ label = "env";
-+ reg = <3f40000 80000>;
-+ };
-+ partition@3fc0000 {
-+ label = "u-boot";
-+ reg = <3fc0000 40000>;
-+ };
-+ };
-+ };
-+
-+
-+
-+ UART0: serial@40000200 {
-+ device_type = "serial";
-+ compatible = "ns16550";
-+ reg = <40000200 8>;
-+ virtual-reg = <e0000200>;
-+ clock-frequency = <A8C000>;
-+ current-speed = <1C200>; /* 115200 */
-+ interrupt-parent = <&UIC0>;
-+ interrupts = <0 4>;
-+ };
-+
-+ UART1: serial@40000300 {
-+ device_type = "serial";
-+ compatible = "ns16550";
-+ reg = <40000300 8>;
-+ virtual-reg = <e0000300>;
-+ clock-frequency = <A8C000>;
-+ current-speed = <1C200>; /* 115200 */
-+ interrupt-parent = <&UIC0>;
-+ interrupts = <1 4>;
-+ };
-+
-+ IIC0: i2c@40000400 {
-+ /* FIXME */
-+ compatible = "ibm,iic-440gp", "ibm,iic";
-+ reg = <40000400 14>;
-+ interrupt-parent = <&UIC0>;
-+ interrupts = <2 4>;
-+ };
-+ IIC1: i2c@40000500 {
-+ /* FIXME */
-+ compatible = "ibm,iic-440gp", "ibm,iic";
-+ reg = <40000500 14>;
-+ interrupt-parent = <&UIC0>;
-+ interrupts = <3 4>;
-+ };
-+
-+ GPIO0: gpio@40000700 {
-+ /* FIXME */
-+ compatible = "ibm,gpio-440gp";
-+ reg = <40000700 20>;
-+ };
-+
-+ ZMII0: emac-zmii@40000780 {
-+ compatible = "ibm,zmii-440gx", "ibm,zmii";
-+ reg = <40000780 c>;
-+ };
-+
-+ RGMII0: emac-rgmii@40000790 {
-+ compatible = "ibm,rgmii";
-+ reg = <40000790 8>;
-+ };
-+
-+
-+ EMAC0: ethernet@40000800 {
-+ unused = <1>;
-+ linux,network-index = <2>;
-+ device_type = "network";
-+ compatible = "ibm,emac-440gx", "ibm,emac4";
-+ interrupt-parent = <&UIC1>;
-+ interrupts = <1c 4 1d 4>;
-+ reg = <40000800 70>;
-+ local-mac-address = [000000000000]; // Filled in by zImage
-+ mal-device = <&MAL0>;
-+ mal-tx-channel = <0>;
-+ mal-rx-channel = <0>;
-+ cell-index = <0>;
-+ max-frame-size = <5dc>;
-+ rx-fifo-size = <1000>;
-+ tx-fifo-size = <800>;
-+ phy-mode = "rmii";
-+ phy-map = <00000001>;
-+ zmii-device = <&ZMII0>;
-+ zmii-channel = <0>;
-+ };
-+ EMAC1: ethernet@40000900 {
-+ unused = <1>;
-+ linux,network-index = <3>;
-+ device_type = "network";
-+ compatible = "ibm,emac-440gx", "ibm,emac4";
-+ interrupt-parent = <&UIC1>;
-+ interrupts = <1e 4 1f 4>;
-+ reg = <40000900 70>;
-+ local-mac-address = [000000000000]; // Filled in by zImage
-+ mal-device = <&MAL0>;
-+ mal-tx-channel = <1>;
-+ mal-rx-channel = <1>;
-+ cell-index = <1>;
-+ max-frame-size = <5dc>;
-+ rx-fifo-size = <1000>;
-+ tx-fifo-size = <800>;
-+ phy-mode = "rmii";
-+ phy-map = <00000001>;
-+ zmii-device = <&ZMII0>;
-+ zmii-channel = <1>;
-+ };
-+
-+ EMAC2: ethernet@40000c00 {
-+ linux,network-index = <0>;
-+ device_type = "network";
-+ compatible = "ibm,emac-440gx", "ibm,emac4";
-+ interrupt-parent = <&UIC2>;
-+ interrupts = <0 4 1 4>;
-+ reg = <40000c00 70>;
-+ local-mac-address = [000000000000]; // Filled in by zImage
-+ mal-device = <&MAL0>;
-+ mal-tx-channel = <2>;
-+ mal-rx-channel = <2>;
-+ cell-index = <2>;
-+ max-frame-size = <5dc>;
-+ rx-fifo-size = <1000>;
-+ tx-fifo-size = <800>;
-+ phy-mode = "rgmii";
-+ phy-map = <00000001>;
-+ rgmii-device = <&RGMII0>;
-+ rgmii-channel = <0>;
-+ zmii-device = <&ZMII0>;
-+ zmii-channel = <2>;
-+ };
-+
-+ EMAC3: ethernet@40000e00 {
-+ linux,network-index = <1>;
-+ device_type = "network";
-+ compatible = "ibm,emac-440gx", "ibm,emac4";
-+ interrupt-parent = <&UIC2>;
-+ interrupts = <2 4 3 4>;
-+ reg = <40000e00 70>;
-+ local-mac-address = [000000000000]; // Filled in by zImage
-+ mal-device = <&MAL0>;
-+ mal-tx-channel = <3>;
-+ mal-rx-channel = <3>;
-+ cell-index = <3>;
-+ max-frame-size = <5dc>;
-+ rx-fifo-size = <1000>;
-+ tx-fifo-size = <800>;
-+ phy-mode = "rgmii";
-+ phy-map = <00000003>;
-+ rgmii-device = <&RGMII0>;
-+ rgmii-channel = <1>;
-+ zmii-device = <&ZMII0>;
-+ zmii-channel = <3>;
-+ };
-+
-+
-+ GPT0: gpt@40000a00 {
-+ /* FIXME */
-+ reg = <40000a00 d4>;
-+ interrupt-parent = <&UIC0>;
-+ interrupts = <12 4 13 4 14 4 15 4 16 4>;
-+ };
-+
-+ };
-+
-+ PCIX0: pci@20ec00000 {
-+ device_type = "pci";
-+ #interrupt-cells = <1>;
-+ #size-cells = <2>;
-+ #address-cells = <3>;
-+ compatible = "ibm,plb440gp-pcix", "ibm,plb-pcix";
-+ primary;
-+ large-inbound-windows;
-+ enable-msi-hole;
-+ reg = <2 0ec00000 8 /* Config space access */
-+ 0 0 0 /* no IACK cycles */
-+ 2 0ed00000 4 /* Special cycles */
-+ 2 0ec80000 100 /* Internal registers */
-+ 2 0ec80100 fc>; /* Internal messaging registers */
-+
-+ /* Outbound ranges, one memory and one IO,
-+ * later cannot be changed
-+ */
-+ ranges = <02000000 0 80000000 00000003 80000000 0 80000000
-+ 01000000 0 00000000 00000002 08000000 0 00010000>;
-+
-+ /* Inbound 2GB range starting at 0 */
-+ dma-ranges = <42000000 0 0 0 0 0 80000000>;
-+
-+ interrupt-map-mask = <f800 0 0 7>;
-+ interrupt-map = <
-+ /* IDSEL 1 */
-+ 0800 0 0 1 &UIC0 17 8
-+ 0800 0 0 2 &UIC0 18 8
-+ 0800 0 0 3 &UIC0 19 8
-+ 0800 0 0 4 &UIC0 1a 8
-+
-+ /* IDSEL 2 */
-+ 1000 0 0 1 &UIC0 18 8
-+ 1000 0 0 2 &UIC0 19 8
-+ 1000 0 0 3 &UIC0 1a 8
-+ 1000 0 0 4 &UIC0 17 8
-+ >;
-+ };
-+ };
-+
-+ chosen {
-+ linux,stdout-path = "/plb/opb/serial@40000300";
-+ };
-+};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/taishan.dts.rej powerpc.git/arch/powerpc/boot/dts/taishan.dts.rej
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/taishan.dts.rej 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/taishan.dts.rej 2008-03-17 14:30:56.000000000 +0100
-@@ -0,0 +1,48 @@
-+***************
-+*** 174,180 ****
-+ interrupts = <5 4>;
-+ interrupt-parent = <&UIC1>;
-+
-+- /* TODO: Add other EBC devices */
-+ };
-+
-+
-+--- 174,211 ----
-+ interrupts = <5 4>;
-+ interrupt-parent = <&UIC1>;
-+
-++ nor_flash@0,0 {
-++ compatible = "cfi-flash";
-++ bank-width = <4>;
-++ device-width = <2>;
-++ reg = <0 000000 4000000>;
-++ #address-cells = <1>;
-++ #size-cells = <1>;
-++ partition@0 {
-++ label = "kernel";
-++ reg = <0 180000>;
-++ };
-++ partition@180000 {
-++ label = "root";
-++ reg = <180000 200000>;
-++ };
-++ partition@380000 {
-++ label = "user";
-++ reg = <380000 3a80000>;
-++ };
-++ partition@3e00000 {
-++ label = "kozio";
-++ reg = <3e00000 140000>;
-++ };
-++ partition@3f40000 {
-++ label = "env";
-++ reg = <3f40000 80000>;
-++ };
-++ partition@3fc0000 {
-++ label = "u-boot";
-++ reg = <3fc0000 40000>;
-++ };
-++ };
-+ };
-+
-+
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/walnut.dts powerpc.git/arch/powerpc/boot/dts/walnut.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/walnut.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/walnut.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/walnut.dts
++++ b/arch/powerpc/boot/dts/walnut.dts
@@ -125,7 +125,6 @@
};
device_type = "network";
compatible = "ibm,emac-405gp", "ibm,emac";
interrupt-parent = <&UIC0>;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/warp.dts powerpc.git/arch/powerpc/boot/dts/warp.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/warp.dts 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/dts/warp.dts 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/dts/warp.dts
++++ b/arch/powerpc/boot/dts/warp.dts
@@ -204,7 +204,6 @@
};
device_type = "network";
compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
interrupt-parent = <&UIC1>;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/dts/yosemite.dts powerpc.git/arch/powerpc/boot/dts/yosemite.dts
---- linux-2.6.25-rc9/arch/powerpc/boot/dts/yosemite.dts 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/yosemite.dts 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/boot/dts/yosemite.dts
@@ -0,0 +1,304 @@
+/*
+ * Device Tree Source for AMCC Yosemite
+ linux,stdout-path = "/plb/opb/serial@ef600300";
+ };
+};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/ebony.c powerpc.git/arch/powerpc/boot/ebony.c
---- linux-2.6.25-rc9/arch/powerpc/boot/ebony.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/ebony.c 2008-04-19 16:40:52.000000000 +0200
-@@ -75,7 +75,8 @@
+--- a/arch/powerpc/boot/ebony.c
++++ b/arch/powerpc/boot/ebony.c
+@@ -75,7 +75,8 @@ static void ebony_fixups(void)
ibm440gp_fixup_clocks(sysclk, 6 * 1843200);
ibm4xx_sdram_fixup_memsize();
ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
ebony_flashsel_fixup();
}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/libfdt-wrapper.c powerpc.git/arch/powerpc/boot/libfdt-wrapper.c
---- linux-2.6.25-rc9/arch/powerpc/boot/libfdt-wrapper.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/libfdt-wrapper.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/libfdt-wrapper.c
++++ b/arch/powerpc/boot/libfdt-wrapper.c
@@ -35,7 +35,7 @@
#define check_err(err) \
({ \
fdt_strerror(err)); \
if (BAD_ERROR(err)) \
exit(); \
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/mpc52xx-psc.c powerpc.git/arch/powerpc/boot/mpc52xx-psc.c
---- linux-2.6.25-rc9/arch/powerpc/boot/mpc52xx-psc.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/mpc52xx-psc.c 2008-04-19 16:40:52.000000000 +0200
-@@ -51,14 +51,9 @@
+--- a/arch/powerpc/boot/mpc52xx-psc.c
++++ b/arch/powerpc/boot/mpc52xx-psc.c
+@@ -51,14 +51,9 @@ static unsigned char psc_getc(void)
int mpc5200_psc_console_init(void *devp, struct serial_console_data *scdp)
{
scdp->open = psc_open;
scdp->putc = psc_putc;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/mpsc.c powerpc.git/arch/powerpc/boot/mpsc.c
---- linux-2.6.25-rc9/arch/powerpc/boot/mpsc.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/mpsc.c 2008-04-19 16:40:52.000000000 +0200
-@@ -141,7 +141,7 @@
+--- a/arch/powerpc/boot/mpsc.c
++++ b/arch/powerpc/boot/mpsc.c
+@@ -141,7 +141,7 @@ int mpsc_console_init(void *devp, struct
if (mpscintr_base == NULL)
goto err_out;
if (n != sizeof(v))
goto err_out;
reg_set = (int)v;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/mv64x60.c powerpc.git/arch/powerpc/boot/mv64x60.c
---- linux-2.6.25-rc9/arch/powerpc/boot/mv64x60.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/mv64x60.c 2008-04-19 16:40:52.000000000 +0200
-@@ -535,7 +535,7 @@
+--- a/arch/powerpc/boot/mv64x60.c
++++ b/arch/powerpc/boot/mv64x60.c
+@@ -535,7 +535,7 @@ u8 *mv64x60_get_bridge_pbase(void)
u32 v[2];
void *devp;
if (devp == NULL)
goto err_out;
if (getprop(devp, "reg", v, sizeof(v)) != sizeof(v))
-@@ -553,7 +553,7 @@
+@@ -553,7 +553,7 @@ u8 *mv64x60_get_bridge_base(void)
u32 v;
void *devp;
if (devp == NULL)
goto err_out;
if (getprop(devp, "virtual-reg", &v, sizeof(v)) != sizeof(v))
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/mv64x60_i2c.c powerpc.git/arch/powerpc/boot/mv64x60_i2c.c
---- linux-2.6.25-rc9/arch/powerpc/boot/mv64x60_i2c.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/mv64x60_i2c.c 2008-04-19 16:40:52.000000000 +0200
-@@ -185,7 +185,7 @@
+--- a/arch/powerpc/boot/mv64x60_i2c.c
++++ b/arch/powerpc/boot/mv64x60_i2c.c
+@@ -185,7 +185,7 @@ int mv64x60_i2c_open(void)
u32 v;
void *devp;
if (devp == NULL)
goto err_out;
if (getprop(devp, "virtual-reg", &v, sizeof(v)) != sizeof(v))
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/ns16550.c powerpc.git/arch/powerpc/boot/ns16550.c
---- linux-2.6.25-rc9/arch/powerpc/boot/ns16550.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/ns16550.c 2008-04-19 16:40:52.000000000 +0200
-@@ -55,15 +55,9 @@
+--- a/arch/powerpc/boot/ns16550.c
++++ b/arch/powerpc/boot/ns16550.c
+@@ -55,15 +55,9 @@ static u8 ns16550_tstc(void)
int ns16550_console_init(void *devp, struct serial_console_data *scdp)
{
int n;
n = getprop(devp, "reg-shift", ®_shift, sizeof(reg_shift));
if (n != sizeof(reg_shift))
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/ops.h powerpc.git/arch/powerpc/boot/ops.h
---- linux-2.6.25-rc9/arch/powerpc/boot/ops.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/ops.h 2008-04-19 16:40:52.000000000 +0200
-@@ -95,6 +95,7 @@
+--- a/arch/powerpc/boot/ops.h
++++ b/arch/powerpc/boot/ops.h
+@@ -95,6 +95,7 @@ int dt_xlate_reg(void *node, int res, un
int dt_xlate_addr(void *node, u32 *buf, int buflen, unsigned long *xlated_addr);
int dt_is_compatible(void *node, const char *compat);
void dt_get_reg_format(void *node, u32 *naddr, u32 *nsize);
static inline void *finddevice(const char *name)
{
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/prpmc2800.c powerpc.git/arch/powerpc/boot/prpmc2800.c
---- linux-2.6.25-rc9/arch/powerpc/boot/prpmc2800.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/prpmc2800.c 2008-04-19 16:40:52.000000000 +0200
-@@ -344,20 +344,20 @@
+--- a/arch/powerpc/boot/prpmc2800.c
++++ b/arch/powerpc/boot/prpmc2800.c
+@@ -344,20 +344,20 @@ static void prpmc2800_bridge_setup(u32 m
acc_bits);
/* Get the cpu -> pci i/o & mem mappings from the device tree */
enables = in_le32((u32 *)(bridge_base + MV64x60_CPU_BAR_ENABLE));
enables |= 0x0007fe00; /* Disable all cpu->pci windows */
-@@ -429,9 +429,9 @@
+@@ -429,9 +429,9 @@ static void prpmc2800_fixups(void)
setprop(devp, "model", model, l);
/* Set /cpus/PowerPC,7447/clock-frequency */
v[0] = bip->core_speed;
setprop(devp, "clock-frequency", &v[0], sizeof(v[0]));
-@@ -443,16 +443,17 @@
+@@ -443,16 +443,17 @@ static void prpmc2800_fixups(void)
v[1] = bip->mem_size;
setprop(devp, "reg", v, sizeof(v));
if (devp == NULL)
fatal("Error: Missing User FLASH device tree node\n\r");
rc = getprop(devp, "reg", v, sizeof(v));
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/ps3-head.S powerpc.git/arch/powerpc/boot/ps3-head.S
---- linux-2.6.25-rc9/arch/powerpc/boot/ps3-head.S 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/ps3-head.S 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/ps3-head.S
++++ b/arch/powerpc/boot/ps3-head.S
@@ -27,8 +27,9 @@
/*
* __system_reset_overlay - The PS3 first stage entry.
*
* The PS3 has a single processor with two threads.
*/
-@@ -47,8 +48,6 @@
+@@ -47,8 +48,6 @@ __system_reset_overlay:
mfspr r3, 0x88
cntlzw. r3, r3
beq 1f
/* Secondary goes to __secondary_hold in kernel. */
-@@ -57,8 +56,14 @@
+@@ -57,8 +56,14 @@ __system_reset_overlay:
mtctr r4
bctr
or 31, 31, 31 /* db16cyc */
or 31, 31, 31 /* db16cyc */
-@@ -67,16 +72,18 @@
+@@ -67,16 +72,18 @@ __system_reset_overlay:
mtctr r4
bctr
- . = __system_reset_kernel + 0x100
+ . = __system_reset_kernel + 512
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/ps3.c powerpc.git/arch/powerpc/boot/ps3.c
---- linux-2.6.25-rc9/arch/powerpc/boot/ps3.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/ps3.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/boot/ps3.c
++++ b/arch/powerpc/boot/ps3.c
@@ -27,10 +27,10 @@
#include "page.h"
#include "ops.h"
u64 in_4, u64 in_5, u64 *out_1, u64 *out_2);
#ifdef DEBUG
-@@ -46,6 +46,7 @@
+@@ -46,6 +46,7 @@ BSS_STACK(4096);
* edit the command line passed to vmlinux (by setting /chosen/bootargs).
* The buffer is put in it's own section so that tools may locate it easier.
*/
static char cmdline[COMMAND_LINE_SIZE]
__attribute__((__section__("__builtin_cmdline")));
-@@ -75,7 +76,7 @@
+@@ -75,7 +76,7 @@ static void ps3_exit(void)
static int ps3_repository_read_rm_size(u64 *rm_size)
{
u64 lpar_id;
u64 ppe_id;
u64 v2;
-@@ -114,16 +115,17 @@
+@@ -114,16 +115,17 @@ void ps3_copy_vectors(void)
{
extern char __system_reset_kernel[];
console_ops.write = ps3_console_write;
platform_ops.exit = ps3_exit;
-@@ -151,6 +153,11 @@
+@@ -151,6 +153,11 @@ void platform_init(void)
printf(" flat tree at 0x%lx\n\r", ft_addr);
((kernel_entry_t)0)(ft_addr, 0, NULL);
ps3_exit();
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/serial.c powerpc.git/arch/powerpc/boot/serial.c
---- linux-2.6.25-rc9/arch/powerpc/boot/serial.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/serial.c 2008-04-19 16:40:52.000000000 +0200
-@@ -119,7 +119,7 @@
+--- a/arch/powerpc/boot/serial.c
++++ b/arch/powerpc/boot/serial.c
+@@ -119,7 +119,7 @@ int serial_console_init(void)
if (dt_is_compatible(devp, "ns16550"))
rc = ns16550_console_init(devp, &serial_cd);
rc = mpsc_console_init(devp, &serial_cd);
else if (dt_is_compatible(devp, "fsl,cpm1-scc-uart") ||
dt_is_compatible(devp, "fsl,cpm1-smc-uart") ||
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/simpleboot.c powerpc.git/arch/powerpc/boot/simpleboot.c
---- linux-2.6.25-rc9/arch/powerpc/boot/simpleboot.c 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/simpleboot.c 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/boot/simpleboot.c
@@ -0,0 +1,84 @@
+/*
+ * The simple platform -- for booting when firmware doesn't supply a device
+ fdt_init(_dtb_start);
+ serial_console_init();
+}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/treeboot-walnut.c powerpc.git/arch/powerpc/boot/treeboot-walnut.c
---- linux-2.6.25-rc9/arch/powerpc/boot/treeboot-walnut.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/treeboot-walnut.c 2008-04-19 16:40:52.000000000 +0200
-@@ -68,7 +68,7 @@
+--- a/arch/powerpc/boot/treeboot-walnut.c
++++ b/arch/powerpc/boot/treeboot-walnut.c
+@@ -68,7 +68,7 @@ static void walnut_fixups(void)
ibm4xx_quiesce_eth((u32 *)0xef600800, NULL);
ibm4xx_fixup_ebc_ranges("/plb/ebc");
walnut_flashsel_fixup();
}
void platform_init(void)
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/virtex405-head.S powerpc.git/arch/powerpc/boot/virtex405-head.S
---- linux-2.6.25-rc9/arch/powerpc/boot/virtex405-head.S 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/virtex405-head.S 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/boot/virtex405-head.S
@@ -0,0 +1,30 @@
+#include "ppc_asm.h"
+
+ addi r9,r9,0x20
+ bdnz 1b
+2: b _zimage_start_lib
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/boot/wrapper powerpc.git/arch/powerpc/boot/wrapper
---- linux-2.6.25-rc9/arch/powerpc/boot/wrapper 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/boot/wrapper 2008-04-19 16:40:52.000000000 +0200
-@@ -174,7 +174,7 @@
+--- a/arch/powerpc/boot/wrapper
++++ b/arch/powerpc/boot/wrapper
+@@ -174,7 +174,7 @@ cuboot*)
*-mpc83*)
platformo=$object/cuboot-83xx.o
;;
platformo=$object/cuboot-85xx-cpm2.o
;;
*-mpc85*|*-tqm8540|*-sbc85*)
-@@ -199,6 +199,10 @@
+@@ -199,6 +199,10 @@ adder875-redboot)
platformo="$object/fixed-head.o $object/redboot-8xx.o"
binary=y
;;
esac
vmz="$tmpdir/`basename \"$kernel\"`.$ext"
-@@ -226,10 +230,13 @@
+@@ -226,10 +230,13 @@ if [ -n "$version" ]; then
uboot_version="-n Linux-$version"
fi
$uboot_version -d "$vmz" "$ofile"
if [ -z "$cacheit" ]; then
rm -f "$vmz"
-@@ -298,15 +305,16 @@
+@@ -298,15 +305,16 @@ treeboot*)
exit 0
;;
ps3)
system_reset_overlay=0x`${CROSS}nm "$ofile" \
| grep ' __system_reset_overlay$' \
-@@ -317,7 +325,7 @@
+@@ -317,7 +325,7 @@ ps3)
| cut -d' ' -f1`
system_reset_kernel=`printf "%d" $system_reset_kernel`
overlay_dest="256"
${CROSS}objcopy -O binary "$ofile" "$ofile.bin"
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/40x/ep405_defconfig powerpc.git/arch/powerpc/configs/40x/ep405_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/40x/ep405_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/40x/ep405_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/40x/ep405_defconfig
@@ -0,0 +1,968 @@
+#
+# Automatically generated make config: don't edit
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/40x/kilauea_defconfig powerpc.git/arch/powerpc/configs/40x/kilauea_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/40x/kilauea_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/40x/kilauea_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/40x/kilauea_defconfig
@@ -0,0 +1,839 @@
+#
+# Automatically generated make config: don't edit
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/40x/makalu_defconfig powerpc.git/arch/powerpc/configs/40x/makalu_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/40x/makalu_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/40x/makalu_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/40x/makalu_defconfig
@@ -0,0 +1,839 @@
+#
+# Automatically generated make config: don't edit
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/40x/walnut_defconfig powerpc.git/arch/powerpc/configs/40x/walnut_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/40x/walnut_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/40x/walnut_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/40x/walnut_defconfig
@@ -0,0 +1,887 @@
+#
+# Automatically generated make config: don't edit
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/44x/bamboo_defconfig powerpc.git/arch/powerpc/configs/44x/bamboo_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/44x/bamboo_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/44x/bamboo_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/44x/bamboo_defconfig
@@ -0,0 +1,815 @@
+#
+# Automatically generated make config: don't edit
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/44x/canyonlands_defconfig powerpc.git/arch/powerpc/configs/44x/canyonlands_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/44x/canyonlands_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/44x/canyonlands_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/44x/canyonlands_defconfig
@@ -0,0 +1,721 @@
+#
+# Automatically generated make config: don't edit
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+# CONFIG_CRYPTO is not set
+# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/44x/ebony_defconfig powerpc.git/arch/powerpc/configs/44x/ebony_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/44x/ebony_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/44x/ebony_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/44x/ebony_defconfig
@@ -0,0 +1,898 @@
+#
+# Automatically generated make config: don't edit
+# CONFIG_CRYPTO_LZO is not set
+# CONFIG_CRYPTO_HW is not set
+# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/44x/katmai_defconfig powerpc.git/arch/powerpc/configs/44x/katmai_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/44x/katmai_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/44x/katmai_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/44x/katmai_defconfig
@@ -0,0 +1,790 @@
+#
+# Automatically generated make config: don't edit
+# CONFIG_CRYPTO_AUTHENC is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/44x/rainier_defconfig powerpc.git/arch/powerpc/configs/44x/rainier_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/44x/rainier_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/44x/rainier_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/44x/rainier_defconfig
@@ -0,0 +1,899 @@
+#
+# Automatically generated make config: don't edit
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/44x/sequoia_defconfig powerpc.git/arch/powerpc/configs/44x/sequoia_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/44x/sequoia_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/44x/sequoia_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/44x/sequoia_defconfig
@@ -0,0 +1,916 @@
+#
+# Automatically generated make config: don't edit
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/44x/taishan_defconfig powerpc.git/arch/powerpc/configs/44x/taishan_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/44x/taishan_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/44x/taishan_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/44x/taishan_defconfig
@@ -0,0 +1,815 @@
+#
+# Automatically generated make config: don't edit
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/44x/warp_defconfig powerpc.git/arch/powerpc/configs/44x/warp_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/44x/warp_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/44x/warp_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/44x/warp_defconfig
@@ -0,0 +1,1110 @@
+#
+# Automatically generated make config: don't edit
+# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig powerpc.git/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
@@ -0,0 +1,1395 @@
+#
+# Automatically generated make config: don't edit
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig powerpc.git/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
@@ -0,0 +1,1451 @@
+#
+# Automatically generated make config: don't edit
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc832x_mds_defconfig powerpc.git/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc832x_mds_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/83xx/mpc832x_mds_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
@@ -0,0 +1,1081 @@
+#
+# Automatically generated make config: don't edit
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
+CONFIG_PPC_LIB_RHEAP=y
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig powerpc.git/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
@@ -0,0 +1,1233 @@
+#
+# Automatically generated make config: don't edit
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
+CONFIG_PPC_LIB_RHEAP=y
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc834x_itx_defconfig powerpc.git/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc834x_itx_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/83xx/mpc834x_itx_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
@@ -0,0 +1,1295 @@
+#
+# Automatically generated make config: don't edit
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig powerpc.git/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
@@ -0,0 +1,1222 @@
+#
+# Automatically generated make config: don't edit
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc834x_mds_defconfig powerpc.git/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc834x_mds_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/83xx/mpc834x_mds_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
@@ -0,0 +1,1021 @@
+#
+# Automatically generated make config: don't edit
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc836x_mds_defconfig powerpc.git/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc836x_mds_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/83xx/mpc836x_mds_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
@@ -0,0 +1,1079 @@
+#
+# Automatically generated make config: don't edit
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
+CONFIG_PPC_LIB_RHEAP=y
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc837x_mds_defconfig powerpc.git/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc837x_mds_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/83xx/mpc837x_mds_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
@@ -0,0 +1,899 @@
+#
+# Automatically generated make config: don't edit
+# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig powerpc.git/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
@@ -0,0 +1,930 @@
+#
+# Automatically generated make config: don't edit
+# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/83xx/sbc834x_defconfig powerpc.git/arch/powerpc/configs/83xx/sbc834x_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/83xx/sbc834x_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/83xx/sbc834x_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/83xx/sbc834x_defconfig
@@ -0,0 +1,828 @@
+#
+# Automatically generated make config: don't edit
+# CONFIG_CRYPTO_LZO is not set
+# CONFIG_CRYPTO_HW is not set
+# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/ksi8560_defconfig powerpc.git/arch/powerpc/configs/85xx/ksi8560_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/85xx/ksi8560_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/85xx/ksi8560_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/85xx/ksi8560_defconfig
@@ -0,0 +1,899 @@
+#
+# Automatically generated make config: don't edit
+CONFIG_CRYPTO_HW=y
+# CONFIG_PPC_CLOCK is not set
+CONFIG_PPC_LIB_RHEAP=y
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/mpc8540_ads_defconfig powerpc.git/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/85xx/mpc8540_ads_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/85xx/mpc8540_ads_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
@@ -0,0 +1,796 @@
+#
+# Automatically generated make config: don't edit
+# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/mpc8544_ds_defconfig powerpc.git/arch/powerpc/configs/85xx/mpc8544_ds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/85xx/mpc8544_ds_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/85xx/mpc8544_ds_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/85xx/mpc8544_ds_defconfig
@@ -0,0 +1,1564 @@
+#
+# Automatically generated make config: don't edit
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/mpc8560_ads_defconfig powerpc.git/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/85xx/mpc8560_ads_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/85xx/mpc8560_ads_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
@@ -0,0 +1,885 @@
+#
+# Automatically generated make config: don't edit
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
+CONFIG_PPC_LIB_RHEAP=y
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/mpc8568mds_defconfig powerpc.git/arch/powerpc/configs/85xx/mpc8568mds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/85xx/mpc8568mds_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/85xx/mpc8568mds_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/85xx/mpc8568mds_defconfig
@@ -0,0 +1,1117 @@
+#
+# Automatically generated make config: don't edit
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
+CONFIG_PPC_LIB_RHEAP=y
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/mpc8572_ds_defconfig powerpc.git/arch/powerpc/configs/85xx/mpc8572_ds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/85xx/mpc8572_ds_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/85xx/mpc8572_ds_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/85xx/mpc8572_ds_defconfig
@@ -0,0 +1,1549 @@
+#
+# Automatically generated make config: don't edit
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig powerpc.git/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig
@@ -0,0 +1,935 @@
+#
+# Automatically generated make config: don't edit
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/sbc8548_defconfig powerpc.git/arch/powerpc/configs/85xx/sbc8548_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/85xx/sbc8548_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/85xx/sbc8548_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/85xx/sbc8548_defconfig
@@ -0,0 +1,812 @@
+#
+# Automatically generated make config: don't edit
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/sbc8560_defconfig powerpc.git/arch/powerpc/configs/85xx/sbc8560_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/85xx/sbc8560_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/85xx/sbc8560_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/85xx/sbc8560_defconfig
@@ -0,0 +1,830 @@
+#
+# Automatically generated make config: don't edit
+# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/stx_gp3_defconfig powerpc.git/arch/powerpc/configs/85xx/stx_gp3_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/85xx/stx_gp3_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/85xx/stx_gp3_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/85xx/stx_gp3_defconfig
@@ -0,0 +1,1253 @@
+#
+# Automatically generated make config: don't edit
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
+CONFIG_PPC_LIB_RHEAP=y
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/tqm8540_defconfig powerpc.git/arch/powerpc/configs/85xx/tqm8540_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/85xx/tqm8540_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/85xx/tqm8540_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/85xx/tqm8540_defconfig
@@ -0,0 +1,1097 @@
+#
+# Automatically generated make config: don't edit
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/tqm8541_defconfig powerpc.git/arch/powerpc/configs/85xx/tqm8541_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/85xx/tqm8541_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/85xx/tqm8541_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/85xx/tqm8541_defconfig
@@ -0,0 +1,1109 @@
+#
+# Automatically generated make config: don't edit
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
+CONFIG_PPC_LIB_RHEAP=y
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/tqm8555_defconfig powerpc.git/arch/powerpc/configs/85xx/tqm8555_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/85xx/tqm8555_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/85xx/tqm8555_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/85xx/tqm8555_defconfig
@@ -0,0 +1,1109 @@
+#
+# Automatically generated make config: don't edit
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
+CONFIG_PPC_LIB_RHEAP=y
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/85xx/tqm8560_defconfig powerpc.git/arch/powerpc/configs/85xx/tqm8560_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/85xx/tqm8560_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/85xx/tqm8560_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/85xx/tqm8560_defconfig
@@ -0,0 +1,1109 @@
+#
+# Automatically generated make config: don't edit
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
+CONFIG_PPC_LIB_RHEAP=y
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/bamboo_defconfig powerpc.git/arch/powerpc/configs/bamboo_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/bamboo_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/bamboo_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/bamboo_defconfig
++++ /dev/null
@@ -1,815 +0,0 @@
-#
-# Automatically generated make config: don't edit
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/chrp32_defconfig powerpc.git/arch/powerpc/configs/chrp32_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/chrp32_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/chrp32_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/configs/chrp32_defconfig
++++ b/arch/powerpc/configs/chrp32_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
#
# CONFIG_PPC64 is not set
-@@ -74,8 +74,6 @@
+@@ -74,8 +74,6 @@ CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=15
# CONFIG_CGROUPS is not set
# CONFIG_GROUP_SCHED is not set
CONFIG_SYSFS_DEPRECATED=y
CONFIG_SYSFS_DEPRECATED_V2=y
# CONFIG_RELAY is not set
-@@ -243,7 +241,7 @@
+@@ -243,7 +241,7 @@ CONFIG_PCI_SYSCALL=y
# CONFIG_PCIEPORTBUS is not set
CONFIG_ARCH_SUPPORTS_MSI=y
# CONFIG_PCI_MSI is not set
# CONFIG_PCI_DEBUG is not set
# CONFIG_PCCARD is not set
# CONFIG_HOTPLUG_PCI is not set
-@@ -1328,6 +1326,7 @@
+@@ -1328,6 +1326,7 @@ CONFIG_PLIST=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
#
# Kernel hacking
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/ebony_defconfig powerpc.git/arch/powerpc/configs/ebony_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/ebony_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/ebony_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/ebony_defconfig
++++ /dev/null
@@ -1,898 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# CONFIG_CRYPTO_LZO is not set
-# CONFIG_CRYPTO_HW is not set
-# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/ep405_defconfig powerpc.git/arch/powerpc/configs/ep405_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/ep405_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/ep405_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/ep405_defconfig
++++ /dev/null
@@ -1,968 +0,0 @@
-#
-# Automatically generated make config: don't edit
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/g5_defconfig powerpc.git/arch/powerpc/configs/g5_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/g5_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/g5_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/configs/g5_defconfig
++++ b/arch/powerpc/configs/g5_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
#
CONFIG_PPC64=y
-@@ -77,8 +77,6 @@
+@@ -77,8 +77,6 @@ CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=17
# CONFIG_CGROUPS is not set
# CONFIG_GROUP_SCHED is not set
CONFIG_SYSFS_DEPRECATED=y
CONFIG_SYSFS_DEPRECATED_V2=y
# CONFIG_RELAY is not set
-@@ -276,7 +274,7 @@
+@@ -276,7 +274,7 @@ CONFIG_PCI_SYSCALL=y
# CONFIG_PCIEPORTBUS is not set
CONFIG_ARCH_SUPPORTS_MSI=y
CONFIG_PCI_MSI=y
# CONFIG_PCI_DEBUG is not set
# CONFIG_PCCARD is not set
# CONFIG_HOTPLUG_PCI is not set
-@@ -1596,6 +1594,7 @@
+@@ -1596,6 +1594,7 @@ CONFIG_PLIST=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
#
# Kernel hacking
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/iseries_defconfig powerpc.git/arch/powerpc/configs/iseries_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/iseries_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/iseries_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/configs/iseries_defconfig
++++ b/arch/powerpc/configs/iseries_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
#
CONFIG_PPC64=y
-@@ -77,8 +77,6 @@
+@@ -77,8 +77,6 @@ CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=17
# CONFIG_CGROUPS is not set
# CONFIG_GROUP_SCHED is not set
CONFIG_SYSFS_DEPRECATED=y
CONFIG_SYSFS_DEPRECATED_V2=y
# CONFIG_RELAY is not set
-@@ -261,7 +259,7 @@
+@@ -261,7 +259,7 @@ CONFIG_PCI_SYSCALL=y
# CONFIG_PCIEPORTBUS is not set
CONFIG_ARCH_SUPPORTS_MSI=y
# CONFIG_PCI_MSI is not set
# CONFIG_PCI_DEBUG is not set
# CONFIG_PCCARD is not set
# CONFIG_HOTPLUG_PCI is not set
-@@ -1065,6 +1063,7 @@
+@@ -1065,6 +1063,7 @@ CONFIG_PLIST=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
#
# Kernel hacking
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/katmai_defconfig powerpc.git/arch/powerpc/configs/katmai_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/katmai_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/katmai_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/katmai_defconfig
++++ /dev/null
@@ -1,790 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# CONFIG_CRYPTO_AUTHENC is not set
-CONFIG_CRYPTO_HW=y
-# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/kilauea_defconfig powerpc.git/arch/powerpc/configs/kilauea_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/kilauea_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/kilauea_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/kilauea_defconfig
++++ /dev/null
@@ -1,839 +0,0 @@
-#
-# Automatically generated make config: don't edit
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/makalu_defconfig powerpc.git/arch/powerpc/configs/makalu_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/makalu_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/makalu_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/makalu_defconfig
++++ /dev/null
@@ -1,839 +0,0 @@
-#
-# Automatically generated make config: don't edit
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/maple_defconfig powerpc.git/arch/powerpc/configs/maple_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/maple_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/maple_defconfig 2008-04-19 16:40:52.000000000 +0200
-@@ -333,7 +333,7 @@
+--- a/arch/powerpc/configs/maple_defconfig
++++ b/arch/powerpc/configs/maple_defconfig
+@@ -333,7 +333,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_DEBUG_DEVRES is not set
# CONFIG_SYS_HYPERVISOR is not set
-@@ -374,6 +374,7 @@
+@@ -374,6 +374,7 @@ CONFIG_BLK_DEV_IDEDISK=y
CONFIG_BLK_DEV_IDECD=y
# CONFIG_BLK_DEV_IDETAPE is not set
# CONFIG_BLK_DEV_IDEFLOPPY is not set
CONFIG_IDE_TASK_IOCTL=y
CONFIG_IDE_PROC_FS=y
-@@ -427,10 +428,129 @@
+@@ -427,10 +428,129 @@ CONFIG_IDE_ARCH_OBSOLETE_INIT=y
# SCSI device support
#
# CONFIG_RAID_ATTRS is not set
# CONFIG_MD is not set
# CONFIG_FUSION is not set
-@@ -536,6 +656,7 @@
+@@ -536,6 +656,7 @@ CONFIG_USB_PEGASUS=y
# CONFIG_HIPPI is not set
# CONFIG_PPP is not set
# CONFIG_SLIP is not set
# CONFIG_SHAPER is not set
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
-@@ -783,12 +904,14 @@
+@@ -783,12 +904,14 @@ CONFIG_USB_UHCI_HCD=y
#
# may also be needed; see USB_STORAGE Help for more information
#
CONFIG_USB_MON=y
#
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc8313_rdb_defconfig powerpc.git/arch/powerpc/configs/mpc8313_rdb_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc8313_rdb_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc8313_rdb_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/mpc8313_rdb_defconfig
++++ /dev/null
@@ -1,1393 +0,0 @@
-#
-# Automatically generated make config: don't edit
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc8315_rdb_defconfig powerpc.git/arch/powerpc/configs/mpc8315_rdb_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc8315_rdb_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc8315_rdb_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/mpc8315_rdb_defconfig
++++ /dev/null
@@ -1,1451 +0,0 @@
-#
-# Automatically generated make config: don't edit
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc832x_mds_defconfig powerpc.git/arch/powerpc/configs/mpc832x_mds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc832x_mds_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc832x_mds_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/mpc832x_mds_defconfig
++++ /dev/null
@@ -1,1081 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-CONFIG_PPC_LIB_RHEAP=y
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc832x_rdb_defconfig powerpc.git/arch/powerpc/configs/mpc832x_rdb_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc832x_rdb_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc832x_rdb_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/mpc832x_rdb_defconfig
++++ /dev/null
@@ -1,1233 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-CONFIG_PPC_LIB_RHEAP=y
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc834x_itx_defconfig powerpc.git/arch/powerpc/configs/mpc834x_itx_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc834x_itx_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc834x_itx_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/mpc834x_itx_defconfig
++++ /dev/null
@@ -1,1295 +0,0 @@
-#
-# Automatically generated make config: don't edit
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc834x_itxgp_defconfig powerpc.git/arch/powerpc/configs/mpc834x_itxgp_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc834x_itxgp_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc834x_itxgp_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/mpc834x_itxgp_defconfig
++++ /dev/null
@@ -1,1222 +0,0 @@
-#
-# Automatically generated make config: don't edit
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc834x_mds_defconfig powerpc.git/arch/powerpc/configs/mpc834x_mds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc834x_mds_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc834x_mds_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/mpc834x_mds_defconfig
++++ /dev/null
@@ -1,1021 +0,0 @@
-#
-# Automatically generated make config: don't edit
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc836x_mds_defconfig powerpc.git/arch/powerpc/configs/mpc836x_mds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc836x_mds_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc836x_mds_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/mpc836x_mds_defconfig
++++ /dev/null
@@ -1,1079 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-CONFIG_PPC_LIB_RHEAP=y
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc837x_mds_defconfig powerpc.git/arch/powerpc/configs/mpc837x_mds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc837x_mds_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc837x_mds_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/mpc837x_mds_defconfig
++++ /dev/null
@@ -1,899 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# CONFIG_CRYPTO_LZO is not set
-CONFIG_CRYPTO_HW=y
-# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc837x_rdb_defconfig powerpc.git/arch/powerpc/configs/mpc837x_rdb_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc837x_rdb_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc837x_rdb_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/mpc837x_rdb_defconfig
++++ /dev/null
@@ -1,930 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# CONFIG_CRYPTO_LZO is not set
-CONFIG_CRYPTO_HW=y
-# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc83xx_defconfig powerpc.git/arch/powerpc/configs/mpc83xx_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc83xx_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc83xx_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/configs/mpc83xx_defconfig
++++ b/arch/powerpc/configs/mpc83xx_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
#
# CONFIG_PPC64 is not set
-@@ -201,6 +201,7 @@
+@@ -201,6 +201,7 @@ CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT is not set
CONFIG_BINFMT_ELF=y
# CONFIG_BINFMT_MISC is not set
CONFIG_MATH_EMULATION=y
# CONFIG_IOMMU_HELPER is not set
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-@@ -353,7 +354,90 @@
+@@ -353,7 +354,90 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
# CONFIG_FW_LOADER is not set
# CONFIG_SYS_HYPERVISOR is not set
# CONFIG_CONNECTOR is not set
CONFIG_OF_DEVICE=y
# CONFIG_PARPORT is not set
CONFIG_BLK_DEV=y
-@@ -362,6 +446,7 @@
+@@ -362,6 +446,7 @@ CONFIG_BLK_DEV=y
CONFIG_BLK_DEV_LOOP=y
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
# CONFIG_BLK_DEV_NBD is not set
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=32768
-@@ -469,6 +554,15 @@
+@@ -469,6 +554,15 @@ CONFIG_NETDEV_10000=y
#
# CONFIG_WLAN_PRE80211 is not set
# CONFIG_WLAN_80211 is not set
# CONFIG_WAN is not set
# CONFIG_PPP is not set
# CONFIG_SLIP is not set
-@@ -563,6 +657,7 @@
+@@ -563,6 +657,7 @@ CONFIG_I2C_MPC=y
# CONFIG_I2C_SIMTEC is not set
# CONFIG_I2C_TAOS_EVM is not set
# CONFIG_I2C_STUB is not set
#
# Miscellaneous I2C Chip support
-@@ -648,6 +743,11 @@
+@@ -648,6 +743,11 @@ CONFIG_WATCHDOG=y
CONFIG_83xx_WDT=y
#
# Sonics Silicon Backplane
#
CONFIG_SSB_POSSIBLE=y
-@@ -664,6 +764,7 @@
+@@ -664,6 +764,7 @@ CONFIG_SSB_POSSIBLE=y
# CONFIG_VIDEO_DEV is not set
# CONFIG_DVB_CORE is not set
CONFIG_DAB=y
#
# Graphics support
-@@ -686,6 +787,14 @@
+@@ -686,6 +787,14 @@ CONFIG_HID_SUPPORT=y
CONFIG_HID=y
# CONFIG_HID_DEBUG is not set
# CONFIG_HIDRAW is not set
CONFIG_USB_SUPPORT=y
CONFIG_USB_ARCH_HAS_HCD=y
# CONFIG_USB_ARCH_HAS_OHCI is not set
-@@ -715,8 +824,55 @@
+@@ -715,8 +824,55 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
# CONFIG_USB_R8A66597_HCD is not set
#
# CONFIG_USB_GADGET is not set
# CONFIG_MMC is not set
# CONFIG_MEMSTICK is not set
-@@ -792,6 +948,7 @@
+@@ -792,6 +948,7 @@ CONFIG_TMPFS=y
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
# CONFIG_CRAMFS is not set
# CONFIG_VXFS_FS is not set
# CONFIG_MINIX_FS is not set
-@@ -862,6 +1019,7 @@
+@@ -862,6 +1019,7 @@ CONFIG_PLIST=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
#
# Kernel hacking
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc8540_ads_defconfig powerpc.git/arch/powerpc/configs/mpc8540_ads_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc8540_ads_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc8540_ads_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/mpc8540_ads_defconfig
++++ /dev/null
@@ -1,796 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# CONFIG_CRYPTO_LZO is not set
-CONFIG_CRYPTO_HW=y
-# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc8544_ds_defconfig powerpc.git/arch/powerpc/configs/mpc8544_ds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc8544_ds_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc8544_ds_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/mpc8544_ds_defconfig
++++ /dev/null
@@ -1,1549 +0,0 @@
-#
-# Automatically generated make config: don't edit
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc8560_ads_defconfig powerpc.git/arch/powerpc/configs/mpc8560_ads_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc8560_ads_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc8560_ads_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/mpc8560_ads_defconfig
++++ /dev/null
@@ -1,885 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-CONFIG_PPC_LIB_RHEAP=y
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc8568mds_defconfig powerpc.git/arch/powerpc/configs/mpc8568mds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc8568mds_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc8568mds_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/mpc8568mds_defconfig
++++ /dev/null
@@ -1,1117 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-CONFIG_PPC_LIB_RHEAP=y
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc8572_ds_defconfig powerpc.git/arch/powerpc/configs/mpc8572_ds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc8572_ds_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc8572_ds_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/mpc8572_ds_defconfig
++++ /dev/null
@@ -1,1549 +0,0 @@
-#
-# Automatically generated make config: don't edit
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/mpc85xx_cds_defconfig powerpc.git/arch/powerpc/configs/mpc85xx_cds_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/mpc85xx_cds_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/mpc85xx_cds_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/mpc85xx_cds_defconfig
++++ /dev/null
@@ -1,935 +0,0 @@
-#
-# Automatically generated make config: don't edit
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/pmac32_defconfig powerpc.git/arch/powerpc/configs/pmac32_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/pmac32_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/pmac32_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/configs/pmac32_defconfig
++++ b/arch/powerpc/configs/pmac32_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
#
# CONFIG_PPC64 is not set
-@@ -77,8 +77,6 @@
+@@ -77,8 +77,6 @@ CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=14
# CONFIG_CGROUPS is not set
# CONFIG_GROUP_SCHED is not set
CONFIG_SYSFS_DEPRECATED=y
CONFIG_SYSFS_DEPRECATED_V2=y
# CONFIG_RELAY is not set
-@@ -272,7 +270,7 @@
+@@ -272,7 +270,7 @@ CONFIG_PCI_SYSCALL=y
# CONFIG_PCIEPORTBUS is not set
CONFIG_ARCH_SUPPORTS_MSI=y
# CONFIG_PCI_MSI is not set
# CONFIG_PCI_DEBUG is not set
CONFIG_PCCARD=m
# CONFIG_PCMCIA_DEBUG is not set
-@@ -1895,6 +1893,7 @@
+@@ -1895,6 +1893,7 @@ CONFIG_PLIST=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
#
# Kernel hacking
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/ppc40x_defconfig powerpc.git/arch/powerpc/configs/ppc40x_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/ppc40x_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/ppc40x_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/ppc40x_defconfig
@@ -0,0 +1,896 @@
+#
+# Automatically generated make config: don't edit
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/ppc44x_defconfig powerpc.git/arch/powerpc/configs/ppc44x_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/ppc44x_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/ppc44x_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/configs/ppc44x_defconfig
++++ b/arch/powerpc/configs/ppc44x_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
#
# CONFIG_PPC64 is not set
-@@ -79,6 +79,7 @@
+@@ -79,6 +79,7 @@ CONFIG_FAIR_GROUP_SCHED=y
CONFIG_USER_SCHED=y
# CONFIG_CGROUP_SCHED is not set
CONFIG_SYSFS_DEPRECATED=y
# CONFIG_RELAY is not set
# CONFIG_NAMESPACES is not set
CONFIG_BLK_DEV_INITRD=y
-@@ -113,6 +114,7 @@
+@@ -113,6 +114,7 @@ CONFIG_SLUB=y
CONFIG_HAVE_OPROFILE=y
# CONFIG_KPROBES is not set
CONFIG_HAVE_KPROBES=y
CONFIG_PROC_PAGE_MONITOR=y
CONFIG_SLABINFO=y
CONFIG_RT_MUTEXES=y
-@@ -143,7 +145,6 @@
+@@ -143,7 +145,6 @@ CONFIG_DEFAULT_AS=y
# CONFIG_DEFAULT_NOOP is not set
CONFIG_DEFAULT_IOSCHED="anticipatory"
CONFIG_CLASSIC_RCU=y
CONFIG_PPC4xx_PCI_EXPRESS=y
#
-@@ -161,12 +162,15 @@
+@@ -161,12 +162,15 @@ CONFIG_TAISHAN=y
CONFIG_KATMAI=y
CONFIG_RAINIER=y
CONFIG_WARP=y
CONFIG_IBM440EP_ERR42=y
# CONFIG_IPIC is not set
# CONFIG_MPIC is not set
-@@ -199,7 +203,6 @@
+@@ -199,7 +203,6 @@ CONFIG_HZ=250
CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PREEMPT is not set
CONFIG_BINFMT_ELF=y
# CONFIG_BINFMT_MISC is not set
CONFIG_MATH_EMULATION=y
-@@ -232,6 +235,7 @@
+@@ -232,6 +235,7 @@ CONFIG_ISA_DMA_API=y
#
CONFIG_ZONE_DMA=y
CONFIG_PPC_INDIRECT_PCI=y
CONFIG_PCI=y
CONFIG_PCI_DOMAINS=y
CONFIG_PCI_SYSCALL=y
-@@ -678,6 +682,7 @@
+@@ -678,6 +682,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
# CONFIG_INFINIBAND is not set
# CONFIG_EDAC is not set
# CONFIG_RTC_CLASS is not set
#
# Userspace I/O
-@@ -805,6 +810,7 @@
+@@ -805,6 +810,7 @@ CONFIG_PLIST=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
#
# Kernel hacking
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/ppc64_defconfig powerpc.git/arch/powerpc/configs/ppc64_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/ppc64_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/ppc64_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/configs/ppc64_defconfig
++++ b/arch/powerpc/configs/ppc64_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
#
CONFIG_PPC64=y
-@@ -84,8 +84,6 @@
+@@ -84,8 +84,6 @@ CONFIG_CGROUPS=y
# CONFIG_CGROUP_NS is not set
CONFIG_CPUSETS=y
# CONFIG_GROUP_SCHED is not set
# CONFIG_CGROUP_CPUACCT is not set
# CONFIG_RESOURCE_COUNTERS is not set
CONFIG_SYSFS_DEPRECATED=y
-@@ -289,6 +287,7 @@
+@@ -289,6 +287,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
CONFIG_KEXEC=y
# CONFIG_CRASH_DUMP is not set
CONFIG_IRQ_ALL_CPUS=y
# CONFIG_NUMA is not set
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-@@ -335,7 +334,7 @@
+@@ -335,7 +334,7 @@ CONFIG_PCI_SYSCALL=y
# CONFIG_PCIEPORTBUS is not set
CONFIG_ARCH_SUPPORTS_MSI=y
CONFIG_PCI_MSI=y
# CONFIG_PCI_DEBUG is not set
CONFIG_PCCARD=y
# CONFIG_PCMCIA_DEBUG is not set
-@@ -1881,6 +1880,7 @@
+@@ -1881,6 +1880,7 @@ CONFIG_PLIST=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
#
# Kernel hacking
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/pseries_defconfig powerpc.git/arch/powerpc/configs/pseries_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/pseries_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/pseries_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/configs/pseries_defconfig
++++ b/arch/powerpc/configs/pseries_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
#
CONFIG_PPC64=y
-@@ -83,8 +83,6 @@
+@@ -83,8 +83,6 @@ CONFIG_CGROUPS=y
CONFIG_CGROUP_NS=y
CONFIG_CPUSETS=y
# CONFIG_GROUP_SCHED is not set
CONFIG_CGROUP_CPUACCT=y
# CONFIG_RESOURCE_COUNTERS is not set
CONFIG_SYSFS_DEPRECATED=y
-@@ -237,6 +235,7 @@
+@@ -237,6 +235,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
CONFIG_KEXEC=y
# CONFIG_CRASH_DUMP is not set
CONFIG_IRQ_ALL_CPUS=y
CONFIG_NUMA=y
CONFIG_NODES_SHIFT=4
-@@ -283,7 +282,7 @@
+@@ -283,7 +282,7 @@ CONFIG_PCI_SYSCALL=y
# CONFIG_PCIEPORTBUS is not set
CONFIG_ARCH_SUPPORTS_MSI=y
CONFIG_PCI_MSI=y
# CONFIG_PCI_DEBUG is not set
# CONFIG_PCCARD is not set
CONFIG_HOTPLUG_PCI=m
-@@ -1519,6 +1518,7 @@
+@@ -1519,6 +1518,7 @@ CONFIG_PLIST=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
#
# Kernel hacking
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/rainier_defconfig powerpc.git/arch/powerpc/configs/rainier_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/rainier_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/rainier_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/rainier_defconfig
++++ /dev/null
@@ -1,899 +0,0 @@
-#
-# Automatically generated make config: don't edit
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/sbc834x_defconfig powerpc.git/arch/powerpc/configs/sbc834x_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/sbc834x_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/sbc834x_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/sbc834x_defconfig
++++ /dev/null
@@ -1,828 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# CONFIG_CRYPTO_LZO is not set
-# CONFIG_CRYPTO_HW is not set
-# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/sbc8548_defconfig powerpc.git/arch/powerpc/configs/sbc8548_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/sbc8548_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/sbc8548_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/sbc8548_defconfig
++++ /dev/null
@@ -1,812 +0,0 @@
-#
-# Automatically generated make config: don't edit
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/sbc8560_defconfig powerpc.git/arch/powerpc/configs/sbc8560_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/sbc8560_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/sbc8560_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/sbc8560_defconfig
++++ /dev/null
@@ -1,830 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# CONFIG_CRYPTO_LZO is not set
-CONFIG_CRYPTO_HW=y
-# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/sbc8641d_defconfig powerpc.git/arch/powerpc/configs/sbc8641d_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/sbc8641d_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/sbc8641d_defconfig 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/configs/sbc8641d_defconfig
@@ -0,0 +1,1342 @@
+#
+# Automatically generated make config: don't edit
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/sequoia_defconfig powerpc.git/arch/powerpc/configs/sequoia_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/sequoia_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/sequoia_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/sequoia_defconfig
++++ /dev/null
@@ -1,916 +0,0 @@
-#
-# Automatically generated make config: don't edit
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/stx_gp3_defconfig powerpc.git/arch/powerpc/configs/stx_gp3_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/stx_gp3_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/stx_gp3_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/stx_gp3_defconfig
++++ /dev/null
@@ -1,1253 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-CONFIG_PPC_LIB_RHEAP=y
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/taishan_defconfig powerpc.git/arch/powerpc/configs/taishan_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/taishan_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/taishan_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/taishan_defconfig
++++ /dev/null
@@ -1,815 +0,0 @@
-#
-# Automatically generated make config: don't edit
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/tqm8540_defconfig powerpc.git/arch/powerpc/configs/tqm8540_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/tqm8540_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/tqm8540_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/tqm8540_defconfig
++++ /dev/null
@@ -1,1097 +0,0 @@
-#
-# Automatically generated make config: don't edit
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/tqm8541_defconfig powerpc.git/arch/powerpc/configs/tqm8541_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/tqm8541_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/tqm8541_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/tqm8541_defconfig
++++ /dev/null
@@ -1,1109 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-CONFIG_PPC_LIB_RHEAP=y
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/tqm8555_defconfig powerpc.git/arch/powerpc/configs/tqm8555_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/tqm8555_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/tqm8555_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/tqm8555_defconfig
++++ /dev/null
@@ -1,1109 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-CONFIG_PPC_LIB_RHEAP=y
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/tqm8560_defconfig powerpc.git/arch/powerpc/configs/tqm8560_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/tqm8560_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/tqm8560_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/tqm8560_defconfig
++++ /dev/null
@@ -1,1109 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-CONFIG_PPC_LIB_RHEAP=y
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/walnut_defconfig powerpc.git/arch/powerpc/configs/walnut_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/walnut_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/walnut_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/walnut_defconfig
++++ /dev/null
@@ -1,887 +0,0 @@
-#
-# Automatically generated make config: don't edit
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/configs/warp_defconfig powerpc.git/arch/powerpc/configs/warp_defconfig
---- linux-2.6.25-rc9/arch/powerpc/configs/warp_defconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/configs/warp_defconfig 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/warp_defconfig
++++ /dev/null
@@ -1,1110 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# CONFIG_CRYPTO_LZO is not set
-CONFIG_CRYPTO_HW=y
-# CONFIG_PPC_CLOCK is not set
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/Makefile powerpc.git/arch/powerpc/kernel/Makefile
---- linux-2.6.25-rc9/arch/powerpc/kernel/Makefile 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/Makefile 2008-04-19 16:40:52.000000000 +0200
-@@ -67,6 +67,7 @@
+--- a/arch/powerpc/kernel/Makefile
++++ b/arch/powerpc/kernel/Makefile
+@@ -67,6 +67,7 @@ obj-$(CONFIG_BOOTX_TEXT) += btext.o
obj-$(CONFIG_SMP) += smp.o
obj-$(CONFIG_KPROBES) += kprobes.o
obj-$(CONFIG_PPC_UDBG_16550) += legacy_serial.o udbg_16550.o
pci64-$(CONFIG_PPC64) += pci_dn.o isa-bridge.o
obj-$(CONFIG_PCI) += pci_$(CONFIG_WORD_SIZE).o $(pci64-y) \
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/asm-offsets.c powerpc.git/arch/powerpc/kernel/asm-offsets.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/asm-offsets.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/asm-offsets.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/kernel/asm-offsets.c
++++ b/arch/powerpc/kernel/asm-offsets.c
@@ -26,8 +26,6 @@
#ifdef CONFIG_PPC64
#include <linux/time.h>
#define DEFINE(sym, val) \
asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-@@ -60,7 +61,6 @@
+@@ -60,7 +61,6 @@ int main(void)
DEFINE(AUDITCONTEXT, offsetof(struct task_struct, audit_context));
#else
DEFINE(THREAD_INFO, offsetof(struct task_struct, stack));
#endif /* CONFIG_PPC64 */
DEFINE(KSP, offsetof(struct thread_struct, ksp));
-@@ -80,7 +80,6 @@
+@@ -80,7 +80,6 @@ int main(void)
DEFINE(PGDIR, offsetof(struct thread_struct, pgdir));
#if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)
DEFINE(THREAD_DBCR0, offsetof(struct thread_struct, dbcr0));
#endif
#ifdef CONFIG_SPE
DEFINE(THREAD_EVR0, offsetof(struct thread_struct, evr[0]));
-@@ -325,6 +324,9 @@
+@@ -325,6 +324,9 @@ int main(void)
DEFINE(PAGE_OFFSET_VSID, KERNEL_VSID(PAGE_OFFSET));
DEFINE(VMALLOC_START_ESID, GET_ESID(VMALLOC_START));
DEFINE(VMALLOC_START_VSID, KERNEL_VSID(VMALLOC_START));
#endif
DEFINE(PGD_TABLE_SIZE, PGD_TABLE_SIZE);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/btext.c powerpc.git/arch/powerpc/kernel/btext.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/btext.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/btext.c 2008-03-17 14:03:31.000000000 +0100
+--- a/arch/powerpc/kernel/btext.c
++++ b/arch/powerpc/kernel/btext.c
@@ -7,6 +7,7 @@
#include <linux/string.h>
#include <linux/init.h>
#include <asm/processor.h>
#include <asm/udbg.h>
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/cpu_setup_44x.S powerpc.git/arch/powerpc/kernel/cpu_setup_44x.S
---- linux-2.6.25-rc9/arch/powerpc/kernel/cpu_setup_44x.S 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/cpu_setup_44x.S 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/kernel/cpu_setup_44x.S
++++ b/arch/powerpc/kernel/cpu_setup_44x.S
@@ -3,7 +3,7 @@
* Valentine Barshak <vbarshak@ru.mvista.com>
* MontaVista Software, Inc (c) 2007
* Benjamin Herrenschmidt <benh@kernel.crashing.org>
*
* This program is free software; you can redistribute it and/or
-@@ -32,6 +32,9 @@
+@@ -32,6 +32,9 @@ _GLOBAL(__setup_cpu_440grx)
bl __fixup_440A_mcheck
mtlr r4
blr
_GLOBAL(__setup_cpu_440gx)
_GLOBAL(__setup_cpu_440spe)
b __fixup_440A_mcheck
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/cputable.c powerpc.git/arch/powerpc/kernel/cputable.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/cputable.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/cputable.c 2008-04-19 16:40:52.000000000 +0200
-@@ -36,6 +36,8 @@
+--- a/arch/powerpc/kernel/cputable.c
++++ b/arch/powerpc/kernel/cputable.c
+@@ -36,6 +36,8 @@ extern void __setup_cpu_440epx(unsigned
extern void __setup_cpu_440gx(unsigned long offset, struct cpu_spec* spec);
extern void __setup_cpu_440grx(unsigned long offset, struct cpu_spec* spec);
extern void __setup_cpu_440spe(unsigned long offset, struct cpu_spec* spec);
extern void __setup_cpu_603(unsigned long offset, struct cpu_spec* spec);
extern void __setup_cpu_604(unsigned long offset, struct cpu_spec* spec);
extern void __setup_cpu_750(unsigned long offset, struct cpu_spec* spec);
-@@ -1397,6 +1399,30 @@
+@@ -1397,6 +1399,30 @@ static struct cpu_spec __initdata cpu_sp
.machine_check = machine_check_440A,
.platform = "ppc440",
},
#endif /* CONFIG_44x */
#ifdef CONFIG_FSL_BOOKE
#ifdef CONFIG_E200
-@@ -1512,7 +1538,7 @@
+@@ -1512,7 +1538,7 @@ struct cpu_spec * __init identify_cpu(un
*t = *s;
*PTRRELOC(&cur_cpu_spec) = &the_cpu_spec;
#if defined(CONFIG_PPC64) || defined(CONFIG_BOOKE)
* setup_cpu for that processor. I will consolidate
* that at a later time, for now, just use #ifdef.
* we also don't need to PTRRELOC the function pointer
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/crash.c powerpc.git/arch/powerpc/kernel/crash.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/crash.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/crash.c 2008-03-17 14:03:31.000000000 +0100
+--- a/arch/powerpc/kernel/crash.c
++++ b/arch/powerpc/kernel/crash.c
@@ -24,12 +24,13 @@
#include <linux/init.h>
#include <linux/irq.h>
#include <asm/firmware.h>
#include <asm/smp.h>
#include <asm/system.h>
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/crash_dump.c powerpc.git/arch/powerpc/kernel/crash_dump.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/crash_dump.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/crash_dump.c 2008-03-17 14:03:31.000000000 +0100
+--- a/arch/powerpc/kernel/crash_dump.c
++++ b/arch/powerpc/kernel/crash_dump.c
@@ -13,8 +13,9 @@
#include <linux/crash_dump.h>
#include <asm/firmware.h>
#include <asm/uaccess.h>
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/entry_32.S powerpc.git/arch/powerpc/kernel/entry_32.S
---- linux-2.6.25-rc9/arch/powerpc/kernel/entry_32.S 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/entry_32.S 2008-04-19 16:40:52.000000000 +0200
-@@ -110,9 +110,9 @@
+--- a/arch/powerpc/kernel/entry_32.S
++++ b/arch/powerpc/kernel/entry_32.S
+@@ -110,9 +110,9 @@ transfer_to_handler:
stw r11,PT_REGS(r12)
#if defined(CONFIG_40x) || defined(CONFIG_BOOKE)
/* Check to see if the dbcr0 register is set up to debug. Use the
beq+ 3f
/* From user and task is ptraced - load up global dbcr0 */
li r12,-1 /* clear all pending debug events */
-@@ -120,6 +120,12 @@
+@@ -120,6 +120,12 @@ transfer_to_handler:
lis r11,global_dbcr0@ha
tophys(r11,r11)
addi r11,r11,global_dbcr0@l
lwz r12,0(r11)
mtspr SPRN_DBCR0,r12
lwz r12,4(r11)
-@@ -238,10 +244,10 @@
+@@ -238,10 +244,10 @@ ret_from_syscall:
stw r11,_CCR(r1)
syscall_exit_cont:
#if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)
bnel- load_dbcr0
#endif
#ifdef CONFIG_44x
-@@ -666,10 +672,10 @@
+@@ -666,10 +672,10 @@ user_exc_return: /* r10 contains MSR_KE
restore_user:
#if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)
bnel- load_dbcr0
#endif
-@@ -879,6 +885,12 @@
+@@ -879,6 +885,12 @@ load_dbcr0:
mfspr r10,SPRN_DBCR0
lis r11,global_dbcr0@ha
addi r11,r11,global_dbcr0@l
stw r10,0(r11)
mtspr SPRN_DBCR0,r0
lwz r10,4(r11)
-@@ -891,7 +903,7 @@
+@@ -891,7 +903,7 @@ load_dbcr0:
.section .bss
.align 4
global_dbcr0:
.previous
#endif /* !(CONFIG_4xx || CONFIG_BOOKE) */
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/entry_64.S powerpc.git/arch/powerpc/kernel/entry_64.S
---- linux-2.6.25-rc9/arch/powerpc/kernel/entry_64.S 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/entry_64.S 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/kernel/entry_64.S
++++ b/arch/powerpc/kernel/entry_64.S
@@ -29,6 +29,8 @@
#include <asm/cputable.h>
#include <asm/firmware.h>
.section ".text"
.align 7
-@@ -88,6 +90,14 @@
+@@ -88,6 +90,14 @@ system_call_common:
addi r9,r1,STACK_FRAME_OVERHEAD
ld r11,exception_marker@toc(r2)
std r11,-16(r9) /* "regshere" marker */
li r10,1
stb r10,PACASOFTIRQEN(r13)
stb r10,PACAHARDIRQEN(r13)
-@@ -102,7 +112,7 @@
+@@ -102,7 +112,7 @@ BEGIN_FW_FTR_SECTION
b hardware_interrupt_entry
2:
END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
mfmsr r11
ori r11,r11,MSR_EE
mtmsrd r11,1
-@@ -504,6 +514,10 @@
+@@ -504,6 +514,10 @@ BEGIN_FW_FTR_SECTION
li r3,0
stb r3,PACASOFTIRQEN(r13) /* ensure we are soft-disabled */
ori r10,r10,MSR_EE
mtmsrd r10 /* hard-enable again */
addi r3,r1,STACK_FRAME_OVERHEAD
-@@ -512,7 +526,7 @@
+@@ -512,7 +526,7 @@ BEGIN_FW_FTR_SECTION
4:
END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
#endif
/* extract EE bit and use it to restore paca->hard_enabled */
ld r3,_MSR(r1)
-@@ -580,6 +594,16 @@
+@@ -580,6 +594,16 @@ do_work:
bne restore
/* here we are preempting the current task */
1:
li r0,1
stb r0,PACASOFTIRQEN(r13)
stb r0,PACAHARDIRQEN(r13)
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_32.S powerpc.git/arch/powerpc/kernel/head_32.S
---- linux-2.6.25-rc9/arch/powerpc/kernel/head_32.S 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/head_32.S 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/kernel/head_32.S
++++ b/arch/powerpc/kernel/head_32.S
@@ -30,6 +30,7 @@
#include <asm/thread_info.h>
#include <asm/ppc_asm.h>
/* 601 only have IBAT; cr0.eq is set on 601 when using this macro */
#define LOAD_BAT(n, reg, RA, RB) \
-@@ -268,8 +269,8 @@
+@@ -268,8 +269,8 @@ __secondary_hold_acknowledge:
li r10,MSR_KERNEL & ~(MSR_IR|MSR_DR); /* can take exceptions */ \
MTMSRD(r10); /* (except for mach check in rtas) */ \
stw r0,GPR0(r11); \
stw r10,8(r11); \
SAVE_4GPRS(3, r11); \
SAVE_2GPRS(7, r11)
-@@ -763,23 +764,6 @@
+@@ -763,23 +764,6 @@ load_up_altivec:
b fast_exception_return
/*
* giveup_altivec(tsk)
* Disable AltiVec for the task given as the argument,
* and save the AltiVec registers in its thread_struct.
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_44x.S powerpc.git/arch/powerpc/kernel/head_44x.S
---- linux-2.6.25-rc9/arch/powerpc/kernel/head_44x.S 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/head_44x.S 2008-04-19 16:40:52.000000000 +0200
-@@ -211,7 +211,7 @@
+--- a/arch/powerpc/kernel/head_44x.S
++++ b/arch/powerpc/kernel/head_44x.S
+@@ -211,7 +211,7 @@ skpinv: addi r4,r4,1 /* Increment */
SET_IVOR(12, WatchdogTimer);
SET_IVOR(13, DataTLBError);
SET_IVOR(14, InstructionTLBError);
/* Establish the interrupt vector base */
lis r4,interrupt_base@h /* IVPR only uses the high 16-bits */
-@@ -578,7 +578,7 @@
+@@ -578,7 +578,7 @@ interrupt_base:
b InstructionStorage
/* Debug Interrupt */
/*
* Local functions
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_64.S powerpc.git/arch/powerpc/kernel/head_64.S
---- linux-2.6.25-rc9/arch/powerpc/kernel/head_64.S 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/head_64.S 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/kernel/head_64.S
++++ b/arch/powerpc/kernel/head_64.S
@@ -36,8 +36,7 @@
#include <asm/firmware.h>
#include <asm/page_64.h>
/*
* We layout physical memory as follows:
-@@ -450,8 +449,8 @@
+@@ -450,8 +449,8 @@ bad_stack:
*/
fast_exc_return_irq: /* restores irq state too */
ld r3,SOFTE(r1)
rldicl r4,r12,49,63 /* get MSR_EE to LSB */
stb r4,PACAHARDIRQEN(r13) /* restore paca->hard_enabled */
b 1f
-@@ -621,7 +620,7 @@
+@@ -621,7 +620,7 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISER
mtlr r10
andi. r10,r12,MSR_RI /* check for unrecoverable exception */
.machine push
.machine "power4"
-@@ -643,6 +642,22 @@
+@@ -643,6 +642,22 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISER
rfid
b . /* prevent speculative execution */
unrecov_slb:
EXCEPTION_PROLOG_COMMON(0x4100, PACA_EXSLB)
DISABLE_INTS
-@@ -808,7 +823,7 @@
+@@ -808,7 +823,7 @@ _STATIC(load_up_altivec)
* Hash table stuff
*/
.align 7
std r3,_DAR(r1)
std r4,_DSISR(r1)
-@@ -820,6 +835,27 @@
+@@ -820,6 +835,27 @@ BEGIN_FTR_SECTION
END_FTR_SECTION_IFCLR(CPU_FTR_SLB)
/*
* We need to set the _PAGE_USER bit if MSR_PR is set or if we are
* accessing a userspace segment (even from the kernel). We assume
* kernel addresses always have the high bit set.
-@@ -832,13 +868,6 @@
+@@ -832,13 +868,6 @@ END_FTR_SECTION_IFCLR(CPU_FTR_SLB)
rlwimi r4,r5,22+2,31-2,31-2 /* Set _PAGE_EXEC if trap is 0x400 */
/*
* r3 contains the faulting address
* r4 contains the required access permissions
* r5 contains the trap number
-@@ -848,7 +877,6 @@
+@@ -848,7 +877,6 @@ END_FTR_SECTION_IFCLR(CPU_FTR_SLB)
bl .hash_page /* build HPTE if possible */
cmpdi r3,0 /* see if hash_page succeeded */
BEGIN_FW_FTR_SECTION
/*
* If we had interrupts soft-enabled at the point where the
-@@ -860,7 +888,7 @@
+@@ -860,7 +888,7 @@ BEGIN_FW_FTR_SECTION
*/
beq 13f
END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
BEGIN_FW_FTR_SECTION
/*
* Here we have interrupts hard-disabled, so it is sufficient
-@@ -874,11 +902,12 @@
+@@ -874,11 +902,12 @@ END_FW_FTR_SECTION_IFCLR(FW_FEATURE_ISER
/*
* hash_page couldn't handle it, set soft interrupt enable back
b 11f
/* Here we have a page fault that hash_page can't handle. */
-@@ -1477,6 +1506,10 @@
+@@ -1477,6 +1506,10 @@ _INIT_STATIC(start_here_multiplatform)
addi r2,r2,0x4000
add r2,r2,r26
/* Do very early kernel initializations, including initial hash table,
* stab and slb setup before we turn on relocation. */
-@@ -1505,10 +1538,6 @@
+@@ -1505,10 +1538,6 @@ _INIT_GLOBAL(start_here_common)
li r0,0
stdu r0,-STACK_FRAME_OVERHEAD(r1)
/* Load the TOC */
ld r2,PACATOC(r13)
std r1,PACAKSAVE(r13)
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_booke.h powerpc.git/arch/powerpc/kernel/head_booke.h
---- linux-2.6.25-rc9/arch/powerpc/kernel/head_booke.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/head_booke.h 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/kernel/head_booke.h
++++ b/arch/powerpc/kernel/head_booke.h
@@ -56,8 +56,17 @@
* is necessary since the MMU is always on, for Book-E parts, and the stacks
* are offset from KERNELBASE.
#define DEBUG_SPRG SPRN_SPRG6W
#ifdef CONFIG_SMP
-@@ -212,9 +221,8 @@
+@@ -212,9 +221,8 @@ label:
* save (and later restore) the MSR via SPRN_CSRR1, which will still have
* the MSR_DE bit set.
*/
DEBUG_EXCEPTION_PROLOG; \
\
/* \
-@@ -234,8 +242,8 @@
+@@ -234,8 +242,8 @@ label:
cmplw r12,r10; \
blt+ 2f; /* addr below exception vectors */ \
\
cmplw r12,r10; \
bgt+ 2f; /* addr above exception vectors */ \
\
-@@ -265,9 +273,9 @@
+@@ -265,9 +273,9 @@ label:
2: mfspr r4,SPRN_DBSR; \
addi r3,r1,STACK_FRAME_OVERHEAD; \
EXC_XFER_TEMPLATE(DebugException, 0x2002, (MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE)), NOCOPY, debug_transfer_to_handler, ret_from_debug_exc)
CRITICAL_EXCEPTION_PROLOG; \
\
/* \
-@@ -287,8 +295,8 @@
+@@ -287,8 +295,8 @@ label:
cmplw r12,r10; \
blt+ 2f; /* addr below exception vectors */ \
\
cmplw r12,r10; \
bgt+ 2f; /* addr above exception vectors */ \
\
-@@ -318,7 +326,6 @@
+@@ -318,7 +326,6 @@ label:
2: mfspr r4,SPRN_DBSR; \
addi r3,r1,STACK_FRAME_OVERHEAD; \
EXC_XFER_TEMPLATE(DebugException, 0x2002, (MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE)), NOCOPY, crit_transfer_to_handler, ret_from_crit_exc)
#define INSTRUCTION_STORAGE_EXCEPTION \
START_EXCEPTION(InstructionStorage) \
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/head_fsl_booke.S powerpc.git/arch/powerpc/kernel/head_fsl_booke.S
---- linux-2.6.25-rc9/arch/powerpc/kernel/head_fsl_booke.S 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/head_fsl_booke.S 2008-04-19 16:40:52.000000000 +0200
-@@ -68,7 +68,9 @@
+--- a/arch/powerpc/kernel/head_fsl_booke.S
++++ b/arch/powerpc/kernel/head_fsl_booke.S
+@@ -68,7 +68,9 @@ _ENTRY(_start);
mr r29,r5
mr r28,r6
mr r27,r7
/* We try to not make any assumptions about how the boot loader
* setup or used the TLBs. We invalidate all mappings from the
-@@ -167,7 +169,28 @@
+@@ -167,7 +169,28 @@ skpinv: addi r6,r6,1 /* Increment */
mtspr SPRN_MAS0,r7
tlbre
lis r7,0x1000 /* Set MAS0(TLBSEL) = 1 */
rlwimi r7,r5,16,4,15 /* Setup MAS0 = TLBSEL | ESEL(r5) */
mtspr SPRN_MAS0,r7
-@@ -177,12 +200,10 @@
+@@ -177,12 +200,10 @@ skpinv: addi r6,r6,1 /* Increment */
ori r6,r6,(MAS1_TSIZE(BOOKE_PAGESZ_4K))@l
mtspr SPRN_MAS1,r6
mfspr r6,SPRN_MAS2
tlbwe
xori r6,r4,1
-@@ -232,8 +253,7 @@
+@@ -232,8 +253,7 @@ skpinv: addi r6,r6,1 /* Increment */
ori r6,r6,PAGE_OFFSET@l
rlwimi r6,r7,0,20,31
mtspr SPRN_MAS2,r6
tlbwe
/* 7. Jump to KERNELBASE mapping */
-@@ -283,7 +303,10 @@
+@@ -283,7 +303,10 @@ skpinv: addi r6,r6,1 /* Increment */
SET_IVOR(12, WatchdogTimer);
SET_IVOR(13, DataTLBError);
SET_IVOR(14, InstructionTLBError);
SET_IVOR(32, SPEUnavailable);
SET_IVOR(33, SPEFloatingPointData);
SET_IVOR(34, SPEFloatingPointRound);
-@@ -718,7 +741,10 @@
+@@ -718,7 +741,10 @@ interrupt_base:
/* Debug Interrupt */
/*
* Local functions
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/ibmebus.c powerpc.git/arch/powerpc/kernel/ibmebus.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/ibmebus.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/ibmebus.c 2008-04-19 16:40:52.000000000 +0200
-@@ -183,7 +183,7 @@
+--- a/arch/powerpc/kernel/ibmebus.c
++++ b/arch/powerpc/kernel/ibmebus.c
+@@ -183,7 +183,7 @@ static int ibmebus_create_devices(const
ret = ibmebus_create_device(child);
if (ret) {
printk(KERN_ERR "%s: failed to create device (%i)",
of_node_put(child);
break;
}
-@@ -269,7 +269,7 @@
+@@ -269,7 +269,7 @@ static ssize_t ibmebus_store_probe(struc
if (bus_find_device(&ibmebus_bus_type, NULL, path,
ibmebus_match_path)) {
printk(KERN_WARNING "%s: %s has already been probed\n",
rc = -EEXIST;
goto out;
}
-@@ -279,7 +279,7 @@
+@@ -279,7 +279,7 @@ static ssize_t ibmebus_store_probe(struc
of_node_put(dn);
} else {
printk(KERN_WARNING "%s: no such device node: %s\n",
rc = -ENODEV;
}
-@@ -308,7 +308,7 @@
+@@ -308,7 +308,7 @@ static ssize_t ibmebus_store_remove(stru
return count;
} else {
printk(KERN_WARNING "%s: %s not on the bus\n",
kfree(path);
return -ENODEV;
-@@ -337,14 +337,14 @@
+@@ -337,14 +337,14 @@ static int __init ibmebus_bus_init(void)
err = of_bus_type_init(&ibmebus_bus_type, "ibmebus");
if (err) {
printk(KERN_ERR "%s: failed to register IBM eBus.\n",
bus_unregister(&ibmebus_bus_type);
return err;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/iommu.c powerpc.git/arch/powerpc/kernel/iommu.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/iommu.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/iommu.c 2008-04-19 16:40:52.000000000 +0200
-@@ -520,7 +520,7 @@
+--- a/arch/powerpc/kernel/iommu.c
++++ b/arch/powerpc/kernel/iommu.c
+@@ -520,7 +520,7 @@ void iommu_free_table(struct iommu_table
unsigned int order;
if (!tbl || !tbl->it_map) {
node_name);
return;
}
-@@ -530,7 +530,7 @@
+@@ -530,7 +530,7 @@ void iommu_free_table(struct iommu_table
for (i = 0; i < (tbl->it_size/64); i++) {
if (tbl->it_map[i] != 0) {
printk(KERN_WARNING "%s: Unexpected TCEs for %s\n",
break;
}
}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/irq.c powerpc.git/arch/powerpc/kernel/irq.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/irq.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/irq.c 2008-04-19 16:40:52.000000000 +0200
-@@ -114,7 +114,7 @@
+--- a/arch/powerpc/kernel/irq.c
++++ b/arch/powerpc/kernel/irq.c
+@@ -114,7 +114,7 @@ static inline void set_soft_enabled(unsi
: : "r" (enable), "i" (offsetof(struct paca_struct, soft_enabled)));
}
{
/*
* get_paca()->soft_enabled = en;
-@@ -174,6 +174,7 @@
+@@ -174,6 +174,7 @@ void local_irq_restore(unsigned long en)
__hard_irq_enable();
}
#endif /* CONFIG_PPC64 */
int show_interrupts(struct seq_file *p, void *v)
-@@ -310,8 +311,21 @@
+@@ -310,8 +311,21 @@ void do_IRQ(struct pt_regs *regs)
handler = &__do_IRQ;
irqtp->task = curtp->task;
irqtp->flags = 0;
if (irqtp->flags)
set_bits(irqtp->flags, &curtp->flags);
} else
-@@ -357,7 +371,7 @@
+@@ -357,7 +371,7 @@ void irq_ctx_init(void)
memset((void *)softirq_ctx[i], 0, THREAD_SIZE);
tp = softirq_ctx[i];
tp->cpu = i;
memset((void *)hardirq_ctx[i], 0, THREAD_SIZE);
tp = hardirq_ctx[i];
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/isa-bridge.c powerpc.git/arch/powerpc/kernel/isa-bridge.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/isa-bridge.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/isa-bridge.c 2008-04-19 16:40:52.000000000 +0200
-@@ -80,13 +80,13 @@
+--- a/arch/powerpc/kernel/isa-bridge.c
++++ b/arch/powerpc/kernel/isa-bridge.c
+@@ -80,13 +80,13 @@ static void __devinit pci_process_ISA_OF
* (size depending on dev->n_addr_cells)
* cell 5: the size of the range
*/
goto inval_range;
isa_addr = range->isa_addr.a_lo;
-@@ -99,7 +99,7 @@
+@@ -99,7 +99,7 @@ static void __devinit pci_process_ISA_OF
*/
if ((pci_addr != 0) || (isa_addr != 0)) {
printk(KERN_ERR "unexpected isa to pci mapping: %s\n",
return;
}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/lparcfg.c powerpc.git/arch/powerpc/kernel/lparcfg.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/lparcfg.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/lparcfg.c 2008-04-19 16:40:52.000000000 +0200
-@@ -226,7 +226,7 @@
+--- a/arch/powerpc/kernel/lparcfg.c
++++ b/arch/powerpc/kernel/lparcfg.c
+@@ -226,7 +226,7 @@ static void parse_system_parameter_strin
unsigned char *local_buffer = kmalloc(SPLPAR_MAXLENGTH, GFP_KERNEL);
if (!local_buffer) {
printk(KERN_ERR "%s %s kmalloc failure at line %d \n",
return;
}
-@@ -243,14 +243,14 @@
+@@ -243,14 +243,14 @@ static void parse_system_parameter_strin
if (call_status != 0) {
printk(KERN_INFO
"%s %s Error calling get-system-parameter (0x%x)\n",
kfree(local_buffer);
return;
}
-@@ -484,10 +484,10 @@
+@@ -484,10 +484,10 @@ static ssize_t lparcfg_write(struct file
current_weight = (resource >> 5 * 8) & 0xFF;
pr_debug("%s: current_entitled = %lu, current_weight = %u\n",
retval = plpar_hcall_norets(H_SET_PPP, *new_entitled_ptr,
*new_weight_ptr);
-@@ -502,7 +502,7 @@
+@@ -502,7 +502,7 @@ static ssize_t lparcfg_write(struct file
retval = -EINVAL;
} else {
printk(KERN_WARNING "%s: received unknown hv return code %ld",
retval = -EIO;
}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/machine_kexec.c powerpc.git/arch/powerpc/kernel/machine_kexec.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/machine_kexec.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/machine_kexec.c 2008-03-17 14:03:31.000000000 +0100
+--- a/arch/powerpc/kernel/machine_kexec.c
++++ b/arch/powerpc/kernel/machine_kexec.c
@@ -12,8 +12,9 @@
#include <linux/kexec.h>
#include <linux/reboot.h>
void machine_crash_shutdown(struct pt_regs *regs)
{
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/paca.c powerpc.git/arch/powerpc/kernel/paca.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/paca.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/paca.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/kernel/paca.c
++++ b/arch/powerpc/kernel/paca.c
@@ -15,7 +15,6 @@
#include <asm/ptrace.h>
#include <asm/page.h>
*/
struct lppaca lppaca[] = {
[0 ... (NR_CPUS-1)] = {
-@@ -66,32 +65,17 @@
+@@ -66,32 +65,17 @@ struct slb_shadow slb_shadow[] __cacheli
* processors. The processor VPD array needs one entry per physical
* processor (not thread).
*/
struct paca_struct paca[] = {
PACA_INIT(0),
#if NR_CPUS > 1
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/ppc_ksyms.c powerpc.git/arch/powerpc/kernel/ppc_ksyms.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/ppc_ksyms.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/ppc_ksyms.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/kernel/ppc_ksyms.c
++++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -45,10 +45,6 @@
#include <asm/signal.h>
#include <asm/dcr.h>
#ifdef CONFIG_PPC32
extern void transfer_to_handler(void);
extern void do_IRQ(struct pt_regs *regs);
-@@ -58,7 +54,6 @@
+@@ -58,7 +54,6 @@ extern void program_check_exception(stru
extern void single_step_exception(struct pt_regs *regs);
extern int sys_sigreturn(struct pt_regs *regs);
EXPORT_SYMBOL(clear_pages);
EXPORT_SYMBOL(copy_page);
EXPORT_SYMBOL(ISA_DMA_THRESHOLD);
-@@ -79,6 +74,7 @@
+@@ -79,6 +74,7 @@ EXPORT_SYMBOL(strncpy);
EXPORT_SYMBOL(strcat);
EXPORT_SYMBOL(strlen);
EXPORT_SYMBOL(strcmp);
EXPORT_SYMBOL(csum_partial);
EXPORT_SYMBOL(csum_partial_copy_generic);
-@@ -192,3 +188,4 @@
+@@ -192,3 +188,4 @@ EXPORT_SYMBOL(intercept_table);
EXPORT_SYMBOL(__mtdcr);
EXPORT_SYMBOL(__mfdcr);
#endif
+EXPORT_SYMBOL(empty_zero_page);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/process.c powerpc.git/arch/powerpc/kernel/process.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/process.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/process.c 2008-04-19 16:40:52.000000000 +0200
-@@ -868,11 +868,6 @@
+--- a/arch/powerpc/kernel/process.c
++++ b/arch/powerpc/kernel/process.c
+@@ -868,11 +868,6 @@ int sys_execve(unsigned long a0, unsigne
flush_spe_to_thread(current);
error = do_execve(filename, (char __user * __user *) a1,
(char __user * __user *) a2, regs);
putname(filename);
out:
return error;
-@@ -919,20 +914,6 @@
+@@ -919,20 +914,6 @@ int validate_sp(unsigned long sp, struct
return valid_irq_stack(sp, p, nbytes);
}
EXPORT_SYMBOL(validate_sp);
unsigned long get_wchan(struct task_struct *p)
-@@ -944,15 +925,15 @@
+@@ -944,15 +925,15 @@ unsigned long get_wchan(struct task_stru
return 0;
sp = p->thread.ksp;
if (!in_sched_functions(ip))
return ip;
}
-@@ -981,12 +962,12 @@
+@@ -981,12 +962,12 @@ void show_stack(struct task_struct *tsk,
lr = 0;
printk("Call Trace:\n");
do {
if (!firstframe || ip != lr) {
printk("["REG"] ["REG"] ", sp, ip);
print_symbol("%s", ip);
-@@ -1000,8 +981,8 @@
+@@ -1000,8 +981,8 @@ void show_stack(struct task_struct *tsk,
* See if this is an exception frame.
* We look for the "regshere" marker in the current frame.
*/
struct pt_regs *regs = (struct pt_regs *)
(sp + STACK_FRAME_OVERHEAD);
printk("--- Exception: %lx", regs->trap);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/prom.c powerpc.git/arch/powerpc/kernel/prom.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/prom.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/prom.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/kernel/prom.c
++++ b/arch/powerpc/kernel/prom.c
@@ -31,10 +31,10 @@
#include <linux/kexec.h>
#include <linux/debugfs.h>
#include <asm/kexec.h>
#ifdef DEBUG
-@@ -436,7 +437,7 @@
+@@ -436,7 +437,7 @@ early_param("mem", early_parse_mem);
* The device tree may be allocated beyond our memory limit, or inside the
* crash kernel region for kdump. If so, move it out of the way.
*/
{
unsigned long start, size;
void *p;
-@@ -1040,6 +1041,87 @@
+@@ -1040,6 +1041,87 @@ static void __init early_reserve_mem(voi
#endif
}
void __init early_init_devtree(void *params)
{
DBG(" -> early_init_devtree(%p)\n", params);
-@@ -1052,6 +1134,11 @@
+@@ -1052,6 +1134,11 @@ void __init early_init_devtree(void *par
of_scan_flat_dt(early_init_dt_scan_rtas, NULL);
#endif
/* Retrieve various informations from the /chosen node of the
* device-tree, including the platform type, initrd location and
* size, TCE reserve, and more ...
-@@ -1072,6 +1159,7 @@
+@@ -1072,6 +1159,7 @@ void __init early_init_devtree(void *par
reserve_kdump_trampoline();
reserve_crashkernel();
early_reserve_mem();
lmb_enforce_memory_limit(memory_limit);
lmb_analyze();
-@@ -1244,12 +1332,14 @@
+@@ -1244,12 +1332,14 @@ EXPORT_SYMBOL(of_node_put);
*/
void of_attach_node(struct device_node *np)
{
}
/*
-@@ -1260,8 +1350,9 @@
+@@ -1260,8 +1350,9 @@ void of_attach_node(struct device_node *
void of_detach_node(struct device_node *np)
{
struct device_node *parent;
parent = np->parent;
if (!parent)
-@@ -1292,7 +1383,7 @@
+@@ -1292,7 +1383,7 @@ void of_detach_node(struct device_node *
of_node_set_flag(np, OF_DETACHED);
out_unlock:
}
#ifdef CONFIG_PPC_PSERIES
-@@ -1373,20 +1464,21 @@
+@@ -1373,20 +1464,21 @@ __initcall(prom_reconfig_setup);
int prom_add_property(struct device_node* np, struct property* prop)
{
struct property **next;
#ifdef CONFIG_PROC_DEVICETREE
/* try to add to proc as well if it was initialized */
-@@ -1406,9 +1498,10 @@
+@@ -1406,9 +1498,10 @@ int prom_add_property(struct device_node
int prom_remove_property(struct device_node *np, struct property *prop)
{
struct property **next;
next = &np->properties;
while (*next) {
if (*next == prop) {
-@@ -1421,7 +1514,7 @@
+@@ -1421,7 +1514,7 @@ int prom_remove_property(struct device_n
}
next = &(*next)->next;
}
if (!found)
return -ENODEV;
-@@ -1447,9 +1540,10 @@
+@@ -1447,9 +1540,10 @@ int prom_update_property(struct device_n
struct property *oldprop)
{
struct property **next;
next = &np->properties;
while (*next) {
if (*next == oldprop) {
-@@ -1463,7 +1557,7 @@
+@@ -1463,7 +1557,7 @@ int prom_update_property(struct device_n
}
next = &(*next)->next;
}
if (!found)
return -ENODEV;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/prom_init.c powerpc.git/arch/powerpc/kernel/prom_init.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/prom_init.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/prom_init.c 2008-04-19 16:40:52.000000000 +0200
-@@ -2240,6 +2240,14 @@
+--- a/arch/powerpc/kernel/prom_init.c
++++ b/arch/powerpc/kernel/prom_init.c
+@@ -2240,6 +2240,14 @@ static void __init fixup_device_tree_efi
if (rv != PROM_ERROR && (strcmp(prop, "chrp") == 0))
prom_setprop(node, "/", "device_type", "efika", sizeof("efika"));
/* Fixup bestcomm interrupts property */
node = call_prom("finddevice", 1, 1, ADDR("/builtin/bestcomm"));
if (PHANDLE_VALID(node)) {
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/rtas.c powerpc.git/arch/powerpc/kernel/rtas.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/rtas.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/rtas.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/kernel/rtas.c
++++ b/arch/powerpc/kernel/rtas.c
@@ -22,6 +22,7 @@
#include <linux/smp.h>
#include <linux/completion.h>
#include <asm/udbg.h>
#include <asm/syscalls.h>
#include <asm/smp.h>
-@@ -507,7 +507,7 @@
+@@ -507,7 +507,7 @@ int rtas_error_rc(int rtas_rc)
break;
default:
printk(KERN_ERR "%s: unexpected RTAS error %d\n",
rc = -ERANGE;
break;
}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/rtas_flash.c powerpc.git/arch/powerpc/kernel/rtas_flash.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/rtas_flash.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/rtas_flash.c 2008-04-19 16:40:52.000000000 +0200
-@@ -807,7 +807,7 @@
+--- a/arch/powerpc/kernel/rtas_flash.c
++++ b/arch/powerpc/kernel/rtas_flash.c
+@@ -807,7 +807,7 @@ int __init rtas_flash_init(void)
rtas_block_ctor);
if (!flash_block_cache) {
printk(KERN_ERR "%s: failed to create block cache\n",
rc = -ENOMEM;
goto cleanup;
}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/rtas_pci.c powerpc.git/arch/powerpc/kernel/rtas_pci.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/rtas_pci.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/rtas_pci.c 2008-04-19 16:40:52.000000000 +0200
-@@ -56,21 +56,6 @@
+--- a/arch/powerpc/kernel/rtas_pci.c
++++ b/arch/powerpc/kernel/rtas_pci.c
+@@ -56,21 +56,6 @@ static inline int config_access_valid(st
return 0;
}
int rtas_read_config(struct pci_dn *pdn, int where, int size, u32 *val)
{
int returnval = -1;
-@@ -117,7 +102,7 @@
+@@ -117,7 +102,7 @@ static int rtas_pci_read_config(struct p
for (dn = busdn->child; dn; dn = dn->sibling) {
struct pci_dn *pdn = PCI_DN(dn);
if (pdn && pdn->devfn == devfn
return rtas_read_config(pdn, where, size, val);
}
-@@ -164,7 +149,7 @@
+@@ -164,7 +149,7 @@ static int rtas_pci_write_config(struct
for (dn = busdn->child; dn; dn = dn->sibling) {
struct pci_dn *pdn = PCI_DN(dn);
if (pdn && pdn->devfn == devfn
return rtas_write_config(pdn, where, size, val);
}
return PCIBIOS_DEVICE_NOT_FOUND;
-@@ -326,7 +311,7 @@
+@@ -326,7 +311,7 @@ int pcibios_remove_root_bus(struct pci_c
res = b->resource[0];
if (!res->flags) {
b->name);
return 1;
}
-@@ -334,13 +319,13 @@
+@@ -334,13 +319,13 @@ int pcibios_remove_root_bus(struct pci_c
rc = pcibios_unmap_io_space(b);
if (rc) {
printk(KERN_ERR "%s: failed to unmap IO on bus %s\n",
return 1;
}
-@@ -348,13 +333,13 @@
+@@ -348,13 +333,13 @@ int pcibios_remove_root_bus(struct pci_c
res = b->resource[i];
if (!res->flags && i == 0) {
printk(KERN_ERR "%s: no MEM resource for PHB %s\n",
return 1;
}
}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/setup-common.c powerpc.git/arch/powerpc/kernel/setup-common.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/setup-common.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/setup-common.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/kernel/setup-common.c
++++ b/arch/powerpc/kernel/setup-common.c
@@ -34,6 +34,7 @@
#include <linux/serial_8250.h>
#include <linux/debugfs.h>
#include <asm/xmon.h>
#include <asm/cputhreads.h>
-@@ -167,6 +167,8 @@
+@@ -167,6 +167,8 @@ static int show_cpuinfo(struct seq_file
unsigned short min;
if (cpu_id == NR_CPUS) {
#if defined(CONFIG_SMP) && defined(CONFIG_PPC32)
unsigned long bogosum = 0;
int i;
-@@ -178,6 +180,13 @@
+@@ -178,6 +180,13 @@ static int show_cpuinfo(struct seq_file
seq_printf(m, "timebase\t: %lu\n", ppc_tb_freq);
if (ppc_md.name)
seq_printf(m, "platform\t: %s\n", ppc_md.name);
if (ppc_md.show_cpuinfo != NULL)
ppc_md.show_cpuinfo(m);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/setup_32.c powerpc.git/arch/powerpc/kernel/setup_32.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/setup_32.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/setup_32.c 2008-04-19 16:40:52.000000000 +0200
-@@ -172,6 +172,18 @@
+--- a/arch/powerpc/kernel/setup_32.c
++++ b/arch/powerpc/kernel/setup_32.c
+@@ -172,6 +172,18 @@ int __init ppc_setup_l2cr(char *str)
}
__setup("l2cr=", ppc_setup_l2cr);
#ifdef CONFIG_GENERIC_NVRAM
/* Generic nvram hooks used by drivers/char/gen_nvram.c */
-@@ -277,7 +289,7 @@
+@@ -277,7 +289,7 @@ void __init setup_arch(char **cmdline_p)
if (ppc_md.panic)
setup_panic();
init_mm.end_code = (unsigned long) _etext;
init_mm.end_data = (unsigned long) _edata;
init_mm.brk = klimit;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/setup_64.c powerpc.git/arch/powerpc/kernel/setup_64.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/setup_64.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/setup_64.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/kernel/setup_64.c
++++ b/arch/powerpc/kernel/setup_64.c
@@ -33,6 +33,8 @@
#include <linux/serial_8250.h>
#include <linux/bootmem.h>
#include <asm/firmware.h>
#include <asm/xmon.h>
#include <asm/udbg.h>
-@@ -178,6 +179,9 @@
+@@ -178,6 +179,9 @@ void __init early_setup(unsigned long dt
/* Enable early debugging if any specified (see udbg.h) */
udbg_early_init();
DBG(" -> early_setup(), dt_ptr: 0x%lx\n", dt_ptr);
/*
-@@ -510,7 +514,7 @@
+@@ -510,7 +514,7 @@ void __init setup_arch(char **cmdline_p)
if (ppc_md.panic)
setup_panic();
init_mm.end_code = (unsigned long) _etext;
init_mm.end_data = (unsigned long) _edata;
init_mm.brk = klimit;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/stacktrace.c powerpc.git/arch/powerpc/kernel/stacktrace.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/stacktrace.c 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/stacktrace.c 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/kernel/stacktrace.c
@@ -0,0 +1,47 @@
+/*
+ * Stack trace utility
+ sp = newsp;
+ }
+}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/sys_ppc32.c powerpc.git/arch/powerpc/kernel/sys_ppc32.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/sys_ppc32.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/sys_ppc32.c 2008-04-19 16:40:52.000000000 +0200
-@@ -368,11 +368,6 @@
+--- a/arch/powerpc/kernel/sys_ppc32.c
++++ b/arch/powerpc/kernel/sys_ppc32.c
+@@ -368,11 +368,6 @@ long compat_sys_execve(unsigned long a0,
error = compat_do_execve(filename, compat_ptr(a1), compat_ptr(a2), regs);
putname(filename);
out:
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/vdso.c powerpc.git/arch/powerpc/kernel/vdso.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/vdso.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/vdso.c 2008-03-17 14:03:31.000000000 +0100
+--- a/arch/powerpc/kernel/vdso.c
++++ b/arch/powerpc/kernel/vdso.c
@@ -21,13 +21,14 @@
#include <linux/elf.h>
#include <linux/security.h>
#include <asm/machdep.h>
#include <asm/cputable.h>
#include <asm/sections.h>
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/vio.c powerpc.git/arch/powerpc/kernel/vio.c
---- linux-2.6.25-rc9/arch/powerpc/kernel/vio.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/vio.c 2008-04-19 16:40:52.000000000 +0200
-@@ -139,7 +139,7 @@
+--- a/arch/powerpc/kernel/vio.c
++++ b/arch/powerpc/kernel/vio.c
+@@ -139,7 +139,7 @@ static int vio_bus_remove(struct device
*/
int vio_register_driver(struct vio_driver *viodrv)
{
viodrv->driver.name);
/* fill in 'struct driver' fields */
-@@ -184,7 +184,7 @@
+@@ -184,7 +184,7 @@ struct vio_dev *vio_register_device_node
/* we need the 'device_type' property, in order to match with drivers */
if (of_node->type == NULL) {
printk(KERN_WARNING "%s: node %s missing 'device_type'\n",
of_node->name ? of_node->name : "<unknown>");
return NULL;
}
-@@ -192,7 +192,7 @@
+@@ -192,7 +192,7 @@ struct vio_dev *vio_register_device_node
unit_address = of_get_property(of_node, "reg", NULL);
if (unit_address == NULL) {
printk(KERN_WARNING "%s: node %s missing 'reg'\n",
of_node->name ? of_node->name : "<unknown>");
return NULL;
}
-@@ -227,7 +227,7 @@
+@@ -227,7 +227,7 @@ struct vio_dev *vio_register_device_node
/* register with generic device framework */
if (device_register(&viodev->dev)) {
printk(KERN_ERR "%s: failed to register device %s\n",
/* XXX free TCE table */
kfree(viodev);
return NULL;
-@@ -258,7 +258,7 @@
+@@ -258,7 +258,7 @@ static int __init vio_bus_init(void)
err = device_register(&vio_bus_device.dev);
if (err) {
printk(KERN_WARNING "%s: device_register returned %i\n",
return err;
}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/kernel/vmlinux.lds.S powerpc.git/arch/powerpc/kernel/vmlinux.lds.S
---- linux-2.6.25-rc9/arch/powerpc/kernel/vmlinux.lds.S 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/kernel/vmlinux.lds.S 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/kernel/vmlinux.lds.S
++++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -1,11 +1,9 @@
#ifdef CONFIG_PPC64
-#include <asm/page.h>
#include <asm-generic/vmlinux.lds.h>
#include <asm/cache.h>
-@@ -33,7 +31,7 @@
+@@ -33,7 +31,7 @@ SECTIONS
*/
/* Text and gots */
ALIGN_FUNCTION();
*(.text.head)
_text = .;
-@@ -58,7 +56,7 @@
+@@ -58,7 +56,7 @@ SECTIONS
RODATA
/* Exception & bug tables */
__start___ex_table = .;
*(__ex_table)
__stop___ex_table = .;
-@@ -74,7 +72,7 @@
+@@ -74,7 +72,7 @@ SECTIONS
. = ALIGN(PAGE_SIZE);
__init_begin = .;
_sinittext = .;
INIT_TEXT
_einittext = .;
-@@ -83,11 +81,11 @@
+@@ -83,11 +81,11 @@ SECTIONS
/* .exit.text is discarded at runtime, not link time,
* to deal with references from __bug_table
*/
INIT_DATA
__vtop_table_begin = .;
*(.vtop_fixup);
-@@ -103,19 +101,19 @@
+@@ -103,19 +101,19 @@ SECTIONS
}
. = ALIGN(16);
__con_initcall_start = .;
*(.con_initcall.init)
__con_initcall_end = .;
-@@ -124,14 +122,14 @@
+@@ -124,14 +122,14 @@ SECTIONS
SECURITY_INIT
. = ALIGN(8);
__start___fw_ftr_fixup = .;
*(__fw_ftr_fixup)
__stop___fw_ftr_fixup = .;
-@@ -139,14 +137,14 @@
+@@ -139,14 +137,14 @@ SECTIONS
#endif
#ifdef CONFIG_BLK_DEV_INITRD
. = ALIGN(PAGE_SIZE);
__per_cpu_start = .;
*(.data.percpu)
*(.data.percpu.shared_aligned)
-@@ -154,7 +152,7 @@
+@@ -154,7 +152,7 @@ SECTIONS
}
. = ALIGN(8);
__machine_desc_start = . ;
*(.machine.desc)
__machine_desc_end = . ;
-@@ -172,25 +170,24 @@
+@@ -172,25 +170,24 @@ SECTIONS
_sdata = .;
#ifdef CONFIG_PPC32
__toc_start = .;
*(.got)
*(.toc)
-@@ -207,26 +204,26 @@
+@@ -207,26 +204,26 @@ SECTIONS
#else
. = ALIGN(16384);
#endif
__nosave_begin = .;
*(.data.nosave)
. = ALIGN(PAGE_SIZE);
-@@ -237,7 +234,7 @@
+@@ -237,7 +234,7 @@ SECTIONS
* And finally the bss
*/
__bss_start = .;
*(.sbss) *(.scommon)
*(.dynbss)
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/lib/rheap.c powerpc.git/arch/powerpc/lib/rheap.c
---- linux-2.6.25-rc9/arch/powerpc/lib/rheap.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/lib/rheap.c 2008-04-19 16:40:52.000000000 +0200
-@@ -54,7 +54,7 @@
+--- a/arch/powerpc/lib/rheap.c
++++ b/arch/powerpc/lib/rheap.c
+@@ -54,7 +54,7 @@ static int grow(rh_info_t * info, int ma
new_blocks = max_blocks - info->max_blocks;
if (block == NULL)
return -ENOMEM;
-@@ -258,7 +258,7 @@
+@@ -258,7 +258,7 @@ rh_info_t *rh_create(unsigned int alignm
if ((alignment & (alignment - 1)) != 0)
return ERR_PTR(-EINVAL);
if (info == NULL)
return ERR_PTR(-ENOMEM);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/lib/string.S powerpc.git/arch/powerpc/lib/string.S
---- linux-2.6.25-rc9/arch/powerpc/lib/string.S 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/lib/string.S 2008-04-19 16:40:52.000000000 +0200
-@@ -75,6 +75,20 @@
+--- a/arch/powerpc/lib/string.S
++++ b/arch/powerpc/lib/string.S
+@@ -75,6 +75,20 @@ _GLOBAL(strcmp)
beq 1b
blr
_GLOBAL(strlen)
addi r4,r3,-1
1: lbzu r0,1(r4)
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fabs.c powerpc.git/arch/powerpc/math-emu/fabs.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fabs.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fabs.c 2008-04-19 16:40:52.000000000 +0200
-@@ -9,7 +9,7 @@
+--- a/arch/powerpc/math-emu/fabs.c
++++ b/arch/powerpc/math-emu/fabs.c
+@@ -9,7 +9,7 @@ fabs(u32 *frD, u32 *frB)
frD[1] = frB[1];
#ifdef DEBUG
dump_double(frD);
printk("\n");
#endif
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fadd.c powerpc.git/arch/powerpc/math-emu/fadd.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fadd.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fadd.c 2008-04-19 16:40:52.000000000 +0200
-@@ -14,7 +14,7 @@
+--- a/arch/powerpc/math-emu/fadd.c
++++ b/arch/powerpc/math-emu/fadd.c
+@@ -14,7 +14,7 @@ fadd(void *frD, void *frA, void *frB)
int ret = 0;
#ifdef DEBUG
#endif
__FP_UNPACK_D(A, frA);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fadds.c powerpc.git/arch/powerpc/math-emu/fadds.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fadds.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fadds.c 2008-04-19 16:40:52.000000000 +0200
-@@ -15,7 +15,7 @@
+--- a/arch/powerpc/math-emu/fadds.c
++++ b/arch/powerpc/math-emu/fadds.c
+@@ -15,7 +15,7 @@ fadds(void *frD, void *frA, void *frB)
int ret = 0;
#ifdef DEBUG
#endif
__FP_UNPACK_D(A, frA);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fcmpo.c powerpc.git/arch/powerpc/math-emu/fcmpo.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fcmpo.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fcmpo.c 2008-04-19 16:40:52.000000000 +0200
-@@ -15,7 +15,7 @@
+--- a/arch/powerpc/math-emu/fcmpo.c
++++ b/arch/powerpc/math-emu/fcmpo.c
+@@ -15,7 +15,7 @@ fcmpo(u32 *ccr, int crfD, void *frA, voi
int ret = 0;
#ifdef DEBUG
#endif
__FP_UNPACK_D(A, frA);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fcmpu.c powerpc.git/arch/powerpc/math-emu/fcmpu.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fcmpu.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fcmpu.c 2008-04-19 16:40:52.000000000 +0200
-@@ -14,7 +14,7 @@
+--- a/arch/powerpc/math-emu/fcmpu.c
++++ b/arch/powerpc/math-emu/fcmpu.c
+@@ -14,7 +14,7 @@ fcmpu(u32 *ccr, int crfD, void *frA, voi
long cmp;
#ifdef DEBUG
#endif
__FP_UNPACK_D(A, frA);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fctiw.c powerpc.git/arch/powerpc/math-emu/fctiw.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fctiw.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fctiw.c 2008-04-19 16:40:52.000000000 +0200
-@@ -16,7 +16,7 @@
+--- a/arch/powerpc/math-emu/fctiw.c
++++ b/arch/powerpc/math-emu/fctiw.c
+@@ -16,7 +16,7 @@ fctiw(u32 *frD, void *frB)
frD[1] = r;
#ifdef DEBUG
dump_double(frD);
printk("\n");
#endif
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fctiwz.c powerpc.git/arch/powerpc/math-emu/fctiwz.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fctiwz.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fctiwz.c 2008-04-19 16:40:52.000000000 +0200
-@@ -23,7 +23,7 @@
+--- a/arch/powerpc/math-emu/fctiwz.c
++++ b/arch/powerpc/math-emu/fctiwz.c
+@@ -23,7 +23,7 @@ fctiwz(u32 *frD, void *frB)
__FPU_FPSCR = fpscr;
#ifdef DEBUG
dump_double(frD);
printk("\n");
#endif
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fdiv.c powerpc.git/arch/powerpc/math-emu/fdiv.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fdiv.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fdiv.c 2008-04-19 16:40:52.000000000 +0200
-@@ -14,7 +14,7 @@
+--- a/arch/powerpc/math-emu/fdiv.c
++++ b/arch/powerpc/math-emu/fdiv.c
+@@ -14,7 +14,7 @@ fdiv(void *frD, void *frA, void *frB)
int ret = 0;
#ifdef DEBUG
#endif
__FP_UNPACK_D(A, frA);
-@@ -28,13 +28,13 @@
+@@ -28,13 +28,13 @@ fdiv(void *frD, void *frA, void *frB)
if (A_c == FP_CLS_ZERO && B_c == FP_CLS_ZERO) {
ret |= EFLAG_VXZDZ;
#ifdef DEBUG
#endif
}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fdivs.c powerpc.git/arch/powerpc/math-emu/fdivs.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fdivs.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fdivs.c 2008-04-19 16:40:52.000000000 +0200
-@@ -15,7 +15,7 @@
+--- a/arch/powerpc/math-emu/fdivs.c
++++ b/arch/powerpc/math-emu/fdivs.c
+@@ -15,7 +15,7 @@ fdivs(void *frD, void *frA, void *frB)
int ret = 0;
#ifdef DEBUG
#endif
__FP_UNPACK_D(A, frA);
-@@ -29,13 +29,13 @@
+@@ -29,13 +29,13 @@ fdivs(void *frD, void *frA, void *frB)
if (A_c == FP_CLS_ZERO && B_c == FP_CLS_ZERO) {
ret |= EFLAG_VXZDZ;
#ifdef DEBUG
#endif
}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fmadd.c powerpc.git/arch/powerpc/math-emu/fmadd.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fmadd.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fmadd.c 2008-04-19 16:40:52.000000000 +0200
-@@ -16,7 +16,7 @@
+--- a/arch/powerpc/math-emu/fmadd.c
++++ b/arch/powerpc/math-emu/fmadd.c
+@@ -16,7 +16,7 @@ fmadd(void *frD, void *frA, void *frB, v
int ret = 0;
#ifdef DEBUG
#endif
__FP_UNPACK_D(A, frA);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fmadds.c powerpc.git/arch/powerpc/math-emu/fmadds.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fmadds.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fmadds.c 2008-04-19 16:40:52.000000000 +0200
-@@ -17,7 +17,7 @@
+--- a/arch/powerpc/math-emu/fmadds.c
++++ b/arch/powerpc/math-emu/fmadds.c
+@@ -17,7 +17,7 @@ fmadds(void *frD, void *frA, void *frB,
int ret = 0;
#ifdef DEBUG
#endif
__FP_UNPACK_D(A, frA);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fmr.c powerpc.git/arch/powerpc/math-emu/fmr.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fmr.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fmr.c 2008-04-19 16:40:52.000000000 +0200
-@@ -9,7 +9,7 @@
+--- a/arch/powerpc/math-emu/fmr.c
++++ b/arch/powerpc/math-emu/fmr.c
+@@ -9,7 +9,7 @@ fmr(u32 *frD, u32 *frB)
frD[1] = frB[1];
#ifdef DEBUG
dump_double(frD);
printk("\n");
#endif
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fmsub.c powerpc.git/arch/powerpc/math-emu/fmsub.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fmsub.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fmsub.c 2008-04-19 16:40:52.000000000 +0200
-@@ -16,7 +16,7 @@
+--- a/arch/powerpc/math-emu/fmsub.c
++++ b/arch/powerpc/math-emu/fmsub.c
+@@ -16,7 +16,7 @@ fmsub(void *frD, void *frA, void *frB, v
int ret = 0;
#ifdef DEBUG
#endif
__FP_UNPACK_D(A, frA);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fmsubs.c powerpc.git/arch/powerpc/math-emu/fmsubs.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fmsubs.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fmsubs.c 2008-04-19 16:40:52.000000000 +0200
-@@ -17,7 +17,7 @@
+--- a/arch/powerpc/math-emu/fmsubs.c
++++ b/arch/powerpc/math-emu/fmsubs.c
+@@ -17,7 +17,7 @@ fmsubs(void *frD, void *frA, void *frB,
int ret = 0;
#ifdef DEBUG
#endif
__FP_UNPACK_D(A, frA);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fmul.c powerpc.git/arch/powerpc/math-emu/fmul.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fmul.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fmul.c 2008-04-19 16:40:52.000000000 +0200
-@@ -14,7 +14,7 @@
+--- a/arch/powerpc/math-emu/fmul.c
++++ b/arch/powerpc/math-emu/fmul.c
+@@ -14,7 +14,7 @@ fmul(void *frD, void *frA, void *frB)
int ret = 0;
#ifdef DEBUG
#endif
__FP_UNPACK_D(A, frA);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fmuls.c powerpc.git/arch/powerpc/math-emu/fmuls.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fmuls.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fmuls.c 2008-04-19 16:40:52.000000000 +0200
-@@ -15,7 +15,7 @@
+--- a/arch/powerpc/math-emu/fmuls.c
++++ b/arch/powerpc/math-emu/fmuls.c
+@@ -15,7 +15,7 @@ fmuls(void *frD, void *frA, void *frB)
int ret = 0;
#ifdef DEBUG
#endif
__FP_UNPACK_D(A, frA);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fnabs.c powerpc.git/arch/powerpc/math-emu/fnabs.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fnabs.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fnabs.c 2008-04-19 16:40:52.000000000 +0200
-@@ -9,7 +9,7 @@
+--- a/arch/powerpc/math-emu/fnabs.c
++++ b/arch/powerpc/math-emu/fnabs.c
+@@ -9,7 +9,7 @@ fnabs(u32 *frD, u32 *frB)
frD[1] = frB[1];
#ifdef DEBUG
dump_double(frD);
printk("\n");
#endif
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fneg.c powerpc.git/arch/powerpc/math-emu/fneg.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fneg.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fneg.c 2008-04-19 16:40:52.000000000 +0200
-@@ -9,7 +9,7 @@
+--- a/arch/powerpc/math-emu/fneg.c
++++ b/arch/powerpc/math-emu/fneg.c
+@@ -9,7 +9,7 @@ fneg(u32 *frD, u32 *frB)
frD[1] = frB[1];
#ifdef DEBUG
dump_double(frD);
printk("\n");
#endif
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fnmadd.c powerpc.git/arch/powerpc/math-emu/fnmadd.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fnmadd.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fnmadd.c 2008-04-19 16:40:52.000000000 +0200
-@@ -16,7 +16,7 @@
+--- a/arch/powerpc/math-emu/fnmadd.c
++++ b/arch/powerpc/math-emu/fnmadd.c
+@@ -16,7 +16,7 @@ fnmadd(void *frD, void *frA, void *frB,
int ret = 0;
#ifdef DEBUG
#endif
__FP_UNPACK_D(A, frA);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fnmadds.c powerpc.git/arch/powerpc/math-emu/fnmadds.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fnmadds.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fnmadds.c 2008-04-19 16:40:52.000000000 +0200
-@@ -17,7 +17,7 @@
+--- a/arch/powerpc/math-emu/fnmadds.c
++++ b/arch/powerpc/math-emu/fnmadds.c
+@@ -17,7 +17,7 @@ fnmadds(void *frD, void *frA, void *frB,
int ret = 0;
#ifdef DEBUG
#endif
__FP_UNPACK_D(A, frA);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fnmsub.c powerpc.git/arch/powerpc/math-emu/fnmsub.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fnmsub.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fnmsub.c 2008-04-19 16:40:52.000000000 +0200
-@@ -16,7 +16,7 @@
+--- a/arch/powerpc/math-emu/fnmsub.c
++++ b/arch/powerpc/math-emu/fnmsub.c
+@@ -16,7 +16,7 @@ fnmsub(void *frD, void *frA, void *frB,
int ret = 0;
#ifdef DEBUG
#endif
__FP_UNPACK_D(A, frA);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fnmsubs.c powerpc.git/arch/powerpc/math-emu/fnmsubs.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fnmsubs.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fnmsubs.c 2008-04-19 16:40:52.000000000 +0200
-@@ -17,7 +17,7 @@
+--- a/arch/powerpc/math-emu/fnmsubs.c
++++ b/arch/powerpc/math-emu/fnmsubs.c
+@@ -17,7 +17,7 @@ fnmsubs(void *frD, void *frA, void *frB,
int ret = 0;
#ifdef DEBUG
#endif
__FP_UNPACK_D(A, frA);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fres.c powerpc.git/arch/powerpc/math-emu/fres.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fres.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fres.c 2008-04-19 16:40:52.000000000 +0200
-@@ -6,7 +6,7 @@
+--- a/arch/powerpc/math-emu/fres.c
++++ b/arch/powerpc/math-emu/fres.c
+@@ -6,7 +6,7 @@ int
fres(void *frD, void *frB)
{
#ifdef DEBUG
#endif
return -ENOSYS;
}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/frsp.c powerpc.git/arch/powerpc/math-emu/frsp.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/frsp.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/frsp.c 2008-04-19 16:40:52.000000000 +0200
-@@ -12,7 +12,7 @@
+--- a/arch/powerpc/math-emu/frsp.c
++++ b/arch/powerpc/math-emu/frsp.c
+@@ -12,7 +12,7 @@ frsp(void *frD, void *frB)
FP_DECL_D(B);
#ifdef DEBUG
#endif
__FP_UNPACK_D(B, frB);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/frsqrte.c powerpc.git/arch/powerpc/math-emu/frsqrte.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/frsqrte.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/frsqrte.c 2008-04-19 16:40:52.000000000 +0200
-@@ -6,7 +6,7 @@
+--- a/arch/powerpc/math-emu/frsqrte.c
++++ b/arch/powerpc/math-emu/frsqrte.c
+@@ -6,7 +6,7 @@ int
frsqrte(void *frD, void *frB)
{
#ifdef DEBUG
#endif
return 0;
}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fsel.c powerpc.git/arch/powerpc/math-emu/fsel.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fsel.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fsel.c 2008-04-19 16:40:52.000000000 +0200
-@@ -11,7 +11,7 @@
+--- a/arch/powerpc/math-emu/fsel.c
++++ b/arch/powerpc/math-emu/fsel.c
+@@ -11,7 +11,7 @@ fsel(u32 *frD, void *frA, u32 *frB, u32
FP_DECL_D(A);
#ifdef DEBUG
#endif
__FP_UNPACK_D(A, frA);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fsqrt.c powerpc.git/arch/powerpc/math-emu/fsqrt.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fsqrt.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fsqrt.c 2008-04-19 16:40:52.000000000 +0200
-@@ -13,7 +13,7 @@
+--- a/arch/powerpc/math-emu/fsqrt.c
++++ b/arch/powerpc/math-emu/fsqrt.c
+@@ -13,7 +13,7 @@ fsqrt(void *frD, void *frB)
int ret = 0;
#ifdef DEBUG
#endif
__FP_UNPACK_D(B, frB);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fsqrts.c powerpc.git/arch/powerpc/math-emu/fsqrts.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fsqrts.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fsqrts.c 2008-04-19 16:40:52.000000000 +0200
-@@ -14,7 +14,7 @@
+--- a/arch/powerpc/math-emu/fsqrts.c
++++ b/arch/powerpc/math-emu/fsqrts.c
+@@ -14,7 +14,7 @@ fsqrts(void *frD, void *frB)
int ret = 0;
#ifdef DEBUG
#endif
__FP_UNPACK_D(B, frB);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fsub.c powerpc.git/arch/powerpc/math-emu/fsub.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fsub.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fsub.c 2008-04-19 16:40:52.000000000 +0200
-@@ -14,7 +14,7 @@
+--- a/arch/powerpc/math-emu/fsub.c
++++ b/arch/powerpc/math-emu/fsub.c
+@@ -14,7 +14,7 @@ fsub(void *frD, void *frA, void *frB)
int ret = 0;
#ifdef DEBUG
#endif
__FP_UNPACK_D(A, frA);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/fsubs.c powerpc.git/arch/powerpc/math-emu/fsubs.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/fsubs.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/fsubs.c 2008-04-19 16:40:52.000000000 +0200
-@@ -15,7 +15,7 @@
+--- a/arch/powerpc/math-emu/fsubs.c
++++ b/arch/powerpc/math-emu/fsubs.c
+@@ -15,7 +15,7 @@ fsubs(void *frD, void *frA, void *frB)
int ret = 0;
#ifdef DEBUG
#endif
__FP_UNPACK_D(A, frA);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/lfd.c powerpc.git/arch/powerpc/math-emu/lfd.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/lfd.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/lfd.c 2008-04-19 16:40:52.000000000 +0200
-@@ -11,7 +11,7 @@
+--- a/arch/powerpc/math-emu/lfd.c
++++ b/arch/powerpc/math-emu/lfd.c
+@@ -11,7 +11,7 @@ lfd(void *frD, void *ea)
if (copy_from_user(frD, ea, sizeof(double)))
return -EFAULT;
#ifdef DEBUG
dump_double(frD);
printk("\n");
#endif
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/lfs.c powerpc.git/arch/powerpc/math-emu/lfs.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/lfs.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/lfs.c 2008-04-19 16:40:52.000000000 +0200
-@@ -14,7 +14,7 @@
+--- a/arch/powerpc/math-emu/lfs.c
++++ b/arch/powerpc/math-emu/lfs.c
+@@ -14,7 +14,7 @@ lfs(void *frD, void *ea)
float f;
#ifdef DEBUG
#endif
if (copy_from_user(&f, ea, sizeof(float)))
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/mcrfs.c powerpc.git/arch/powerpc/math-emu/mcrfs.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/mcrfs.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/mcrfs.c 2008-04-19 16:40:52.000000000 +0200
-@@ -10,7 +10,7 @@
+--- a/arch/powerpc/math-emu/mcrfs.c
++++ b/arch/powerpc/math-emu/mcrfs.c
+@@ -10,7 +10,7 @@ mcrfs(u32 *ccr, u32 crfD, u32 crfS)
u32 value, clear;
#ifdef DEBUG
#endif
clear = 15 << ((7 - crfS) << 2);
-@@ -24,7 +24,7 @@
+@@ -24,7 +24,7 @@ mcrfs(u32 *ccr, u32 crfD, u32 crfS)
*ccr |= (value << ((7 - crfD) << 2));
#ifdef DEBUG
#endif
return 0;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/mffs.c powerpc.git/arch/powerpc/math-emu/mffs.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/mffs.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/mffs.c 2008-04-19 16:40:52.000000000 +0200
-@@ -10,7 +10,7 @@
+--- a/arch/powerpc/math-emu/mffs.c
++++ b/arch/powerpc/math-emu/mffs.c
+@@ -10,7 +10,7 @@ mffs(u32 *frD)
frD[1] = __FPU_FPSCR;
#ifdef DEBUG
#endif
return 0;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/mtfsb0.c powerpc.git/arch/powerpc/math-emu/mtfsb0.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/mtfsb0.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/mtfsb0.c 2008-04-19 16:40:52.000000000 +0200
-@@ -11,7 +11,7 @@
+--- a/arch/powerpc/math-emu/mtfsb0.c
++++ b/arch/powerpc/math-emu/mtfsb0.c
+@@ -11,7 +11,7 @@ mtfsb0(int crbD)
__FPU_FPSCR &= ~(1 << (31 - crbD));
#ifdef DEBUG
#endif
return 0;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/mtfsb1.c powerpc.git/arch/powerpc/math-emu/mtfsb1.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/mtfsb1.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/mtfsb1.c 2008-04-19 16:40:52.000000000 +0200
-@@ -11,7 +11,7 @@
+--- a/arch/powerpc/math-emu/mtfsb1.c
++++ b/arch/powerpc/math-emu/mtfsb1.c
+@@ -11,7 +11,7 @@ mtfsb1(int crbD)
__FPU_FPSCR |= (1 << (31 - crbD));
#ifdef DEBUG
#endif
return 0;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/mtfsf.c powerpc.git/arch/powerpc/math-emu/mtfsf.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/mtfsf.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/mtfsf.c 2008-04-19 16:40:52.000000000 +0200
-@@ -38,7 +38,7 @@
+--- a/arch/powerpc/math-emu/mtfsf.c
++++ b/arch/powerpc/math-emu/mtfsf.c
+@@ -38,7 +38,7 @@ mtfsf(unsigned int FM, u32 *frB)
__FPU_FPSCR |= (frB[1] & mask);
#ifdef DEBUG
#endif
return 0;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/mtfsfi.c powerpc.git/arch/powerpc/math-emu/mtfsfi.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/mtfsfi.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/mtfsfi.c 2008-04-19 16:40:52.000000000 +0200
-@@ -16,7 +16,7 @@
+--- a/arch/powerpc/math-emu/mtfsfi.c
++++ b/arch/powerpc/math-emu/mtfsfi.c
+@@ -16,7 +16,7 @@ mtfsfi(unsigned int crfD, unsigned int I
__FPU_FPSCR |= (IMM & 0xf) << ((7 - crfD) << 2);
#ifdef DEBUG
#endif
return 0;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/stfd.c powerpc.git/arch/powerpc/math-emu/stfd.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/stfd.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/stfd.c 2008-04-19 16:40:52.000000000 +0200
-@@ -7,7 +7,7 @@
+--- a/arch/powerpc/math-emu/stfd.c
++++ b/arch/powerpc/math-emu/stfd.c
+@@ -7,7 +7,7 @@ stfd(void *frS, void *ea)
{
#if 0
#ifdef DEBUG
dump_double(frS);
printk("\n");
#endif
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/stfiwx.c powerpc.git/arch/powerpc/math-emu/stfiwx.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/stfiwx.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/stfiwx.c 2008-04-19 16:40:52.000000000 +0200
-@@ -6,7 +6,7 @@
+--- a/arch/powerpc/math-emu/stfiwx.c
++++ b/arch/powerpc/math-emu/stfiwx.c
+@@ -6,7 +6,7 @@ int
stfiwx(u32 *frS, void *ea)
{
#ifdef DEBUG
#endif
if (copy_to_user(ea, &frS[1], sizeof(frS[1])))
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/math-emu/stfs.c powerpc.git/arch/powerpc/math-emu/stfs.c
---- linux-2.6.25-rc9/arch/powerpc/math-emu/stfs.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/math-emu/stfs.c 2008-04-19 16:40:52.000000000 +0200
-@@ -15,7 +15,7 @@
+--- a/arch/powerpc/math-emu/stfs.c
++++ b/arch/powerpc/math-emu/stfs.c
+@@ -15,7 +15,7 @@ stfs(void *frS, void *ea)
int err;
#ifdef DEBUG
#endif
__FP_UNPACK_D(A, frS);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/40x_mmu.c powerpc.git/arch/powerpc/mm/40x_mmu.c
---- linux-2.6.25-rc9/arch/powerpc/mm/40x_mmu.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/mm/40x_mmu.c 2008-04-19 16:40:52.000000000 +0200
-@@ -97,7 +97,7 @@
+--- a/arch/powerpc/mm/40x_mmu.c
++++ b/arch/powerpc/mm/40x_mmu.c
+@@ -97,7 +97,7 @@ unsigned long __init mmu_mapin_ram(void)
phys_addr_t p;
v = KERNELBASE;
s = total_lowmem;
if (__map_without_ltlbs)
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/44x_mmu.c powerpc.git/arch/powerpc/mm/44x_mmu.c
---- linux-2.6.25-rc9/arch/powerpc/mm/44x_mmu.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/mm/44x_mmu.c 2008-04-19 16:40:52.000000000 +0200
-@@ -67,7 +67,7 @@
+--- a/arch/powerpc/mm/44x_mmu.c
++++ b/arch/powerpc/mm/44x_mmu.c
+@@ -67,7 +67,7 @@ unsigned long __init mmu_mapin_ram(void)
/* Pin in enough TLBs to cover any lowmem not covered by the
* initial 256M mapping established in head_44x.S */
addr += PPC_PIN_SIZE)
ppc44x_pin_tlb(addr + PAGE_OFFSET, addr);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/Makefile powerpc.git/arch/powerpc/mm/Makefile
---- linux-2.6.25-rc9/arch/powerpc/mm/Makefile 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/mm/Makefile 2008-03-17 14:03:31.000000000 +0100
-@@ -6,7 +6,7 @@
+--- a/arch/powerpc/mm/Makefile
++++ b/arch/powerpc/mm/Makefile
+@@ -6,7 +6,7 @@ ifeq ($(CONFIG_PPC64),y)
EXTRA_CFLAGS += -mno-minimal-toc
endif
init_$(CONFIG_WORD_SIZE).o \
pgtable_$(CONFIG_WORD_SIZE).o \
mmu_context_$(CONFIG_WORD_SIZE).o
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/fsl_booke_mmu.c powerpc.git/arch/powerpc/mm/fsl_booke_mmu.c
---- linux-2.6.25-rc9/arch/powerpc/mm/fsl_booke_mmu.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/mm/fsl_booke_mmu.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/mm/fsl_booke_mmu.c
++++ b/arch/powerpc/mm/fsl_booke_mmu.c
@@ -49,18 +49,15 @@
#include <asm/mmu.h>
#include <asm/uaccess.h>
#define NUM_TLBCAMS (16)
-@@ -165,15 +162,15 @@
+@@ -165,15 +162,15 @@ void invalidate_tlbcam_entry(int index)
void __init cam_mapin_ram(unsigned long cam0, unsigned long cam1,
unsigned long cam2)
{
}
}
-@@ -196,35 +193,32 @@
+@@ -196,35 +193,32 @@ unsigned long __init mmu_mapin_ram(void)
void __init
adjust_total_lowmem(void)
{
ram -= __cam2;
}
-@@ -232,6 +226,6 @@
+@@ -232,6 +226,6 @@ adjust_total_lowmem(void)
" CAM2=%ldMb residual: %ldMb\n",
__cam0 >> 20, __cam1 >> 20, __cam2 >> 20,
(total_lowmem - __cam0 - __cam1 - __cam2) >> 20);
+ __max_low_memory = __cam0 + __cam1 + __cam2;
+ __initial_memory_limit_addr = memstart_addr + __max_low_memory;
}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/hash_utils_64.c powerpc.git/arch/powerpc/mm/hash_utils_64.c
---- linux-2.6.25-rc9/arch/powerpc/mm/hash_utils_64.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/mm/hash_utils_64.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/mm/hash_utils_64.c
++++ b/arch/powerpc/mm/hash_utils_64.c
@@ -31,6 +31,7 @@
#include <linux/cache.h>
#include <linux/init.h>
#include <asm/abs_addr.h>
#include <asm/tlbflush.h>
#include <asm/io.h>
-@@ -191,6 +192,29 @@
+@@ -191,6 +192,29 @@ int htab_bolt_mapping(unsigned long vsta
return ret < 0 ? ret : 0;
}
static int __init htab_dt_scan_seg_sizes(unsigned long node,
const char *uname, int depth,
void *data)
-@@ -434,6 +458,12 @@
+@@ -434,6 +458,12 @@ void create_section_mapping(unsigned lon
_PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_COHERENT | PP_RWXX,
mmu_linear_psize, mmu_kernel_ssize));
}
#endif /* CONFIG_MEMORY_HOTPLUG */
static inline void make_bl(unsigned int *insn_addr, void *func)
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/init_32.c powerpc.git/arch/powerpc/mm/init_32.c
---- linux-2.6.25-rc9/arch/powerpc/mm/init_32.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/mm/init_32.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/mm/init_32.c
++++ b/arch/powerpc/mm/init_32.c
@@ -30,6 +30,7 @@
#include <linux/highmem.h>
#include <linux/initrd.h>
#include <asm/sections.h>
#include "mmu_decl.h"
-@@ -59,8 +59,8 @@
+@@ -59,8 +59,8 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_ga
unsigned long total_memory;
unsigned long total_lowmem;
int boot_mapsize;
#ifdef CONFIG_PPC_PMAC
-@@ -95,10 +95,10 @@
+@@ -95,10 +95,10 @@ int __map_without_ltlbs;
unsigned long __max_low_memory = MAX_LOW_MEM;
/*
/*
* Check for command-line options that affect what MMU_init will do.
-@@ -131,10 +131,10 @@
+@@ -131,10 +131,10 @@ void __init MMU_init(void)
/* 601 can only access 16MB at the moment */
if (PVR_VER(mfspr(SPRN_PVR)) == 1)
/* parse args from command line */
MMU_setup();
-@@ -145,8 +145,8 @@
+@@ -145,8 +145,8 @@ void __init MMU_init(void)
printk(KERN_WARNING "Only using first contiguous memory region");
}
#ifdef CONFIG_FSL_BOOKE
/* Freescale Book-E parts expect lowmem to be mapped by fixed TLB
-@@ -157,9 +157,10 @@
+@@ -157,9 +157,10 @@ void __init MMU_init(void)
if (total_lowmem > __max_low_memory) {
total_lowmem = __max_low_memory;
lmb_analyze();
#endif /* CONFIG_HIGHMEM */
}
-@@ -184,8 +185,6 @@
+@@ -184,8 +185,6 @@ void __init MMU_init(void)
/* Map in I/O resources */
if (ppc_md.progress)
ppc_md.progress("MMU:setio", 0x302);
/* Initialize the context management stuff */
mmu_context_init();
-@@ -208,7 +207,7 @@
+@@ -208,7 +207,7 @@ void __init *early_get_page(void)
p = alloc_bootmem_pages(PAGE_SIZE);
} else {
p = __va(lmb_alloc_base(PAGE_SIZE, PAGE_SIZE,
}
return p;
}
-@@ -276,7 +275,7 @@
+@@ -276,7 +275,7 @@ static int __init setup_kcore(void)
kcore_mem = kmalloc(sizeof(struct kcore_list), GFP_ATOMIC);
if (!kcore_mem)
/* must stay under 32 bits */
if ( 0xfffffffful - (unsigned long)__va(base) < size) {
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/init_64.c powerpc.git/arch/powerpc/mm/init_64.c
---- linux-2.6.25-rc9/arch/powerpc/mm/init_64.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/mm/init_64.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/mm/init_64.c
++++ b/arch/powerpc/mm/init_64.c
@@ -38,11 +38,11 @@
#include <linux/nodemask.h>
#include <linux/module.h>
void free_initmem(void)
{
-@@ -122,7 +121,7 @@
+@@ -122,7 +121,7 @@ static int __init setup_kcore(void)
/* GFP_ATOMIC to avoid might_sleep warnings during boot */
kcore_mem = kmalloc(sizeof(struct kcore_list), GFP_ATOMIC);
if (!kcore_mem)
kclist_add(kcore_mem, __va(base), size);
}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/lmb.c powerpc.git/arch/powerpc/mm/lmb.c
---- linux-2.6.25-rc9/arch/powerpc/mm/lmb.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/mm/lmb.c 1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/mm/lmb.c
++++ /dev/null
@@ -1,357 +0,0 @@
-/*
- * Procedures for maintaining information about logical memory blocks.
- }
- return 0;
-}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/mem.c powerpc.git/arch/powerpc/mm/mem.c
---- linux-2.6.25-rc9/arch/powerpc/mm/mem.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/mm/mem.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/mm/mem.c
++++ b/arch/powerpc/mm/mem.c
@@ -31,6 +31,7 @@
#include <linux/initrd.h>
#include <linux/pagemap.h>
#include <asm/sections.h>
#include <asm/vdso.h>
-@@ -111,7 +111,7 @@
+@@ -111,7 +111,7 @@ int memory_add_physaddr_to_nid(u64 start
}
#endif
{
struct pglist_data *pgdata;
struct zone *zone;
-@@ -175,7 +175,6 @@
+@@ -175,7 +175,6 @@ void show_mem(void)
printk("Mem-info:\n");
show_free_areas();
for_each_online_pgdat(pgdat) {
unsigned long flags;
pgdat_resize_lock(pgdat, &flags);
-@@ -217,9 +216,11 @@
+@@ -217,9 +216,11 @@ void __init do_init_bootmem(void)
unsigned long total_pages;
int boot_mapsize;
#endif
/*
-@@ -245,18 +246,18 @@
+@@ -245,18 +246,18 @@ void __init do_init_bootmem(void)
* present.
*/
#ifdef CONFIG_HIGHMEM
lmb.reserved.region[i].base;
reserve_bootmem(lmb.reserved.region[i].base,
adjusted_size, BOOTMEM_DEFAULT);
-@@ -326,7 +327,7 @@
+@@ -326,7 +327,7 @@ void __init paging_init(void)
(top_of_ram - total_ram) >> 20);
memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
#ifdef CONFIG_HIGHMEM
max_zone_pfns[ZONE_HIGHMEM] = top_of_ram >> PAGE_SHIFT;
#else
max_zone_pfns[ZONE_DMA] = top_of_ram >> PAGE_SHIFT;
-@@ -381,7 +382,7 @@
+@@ -381,7 +382,7 @@ void __init mem_init(void)
{
unsigned long pfn, highmem_mapnr;
for (pfn = highmem_mapnr; pfn < max_mapnr; ++pfn) {
struct page *page = pfn_to_page(pfn);
if (lmb_is_reserved(pfn << PAGE_SHIFT))
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/mmu_decl.h powerpc.git/arch/powerpc/mm/mmu_decl.h
---- linux-2.6.25-rc9/arch/powerpc/mm/mmu_decl.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/mm/mmu_decl.h 2008-04-19 16:40:52.000000000 +0200
-@@ -48,9 +48,11 @@
+--- a/arch/powerpc/mm/mmu_decl.h
++++ b/arch/powerpc/mm/mmu_decl.h
+@@ -48,9 +48,11 @@ extern unsigned int num_tlbcam_entries;
extern unsigned long ioremap_bot;
extern unsigned long __max_low_memory;
/* ...and now those things that may be slightly different between processor
* architectures. -- Dan
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/numa.c powerpc.git/arch/powerpc/mm/numa.c
---- linux-2.6.25-rc9/arch/powerpc/mm/numa.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/mm/numa.c 2008-03-17 14:03:31.000000000 +0100
+--- a/arch/powerpc/mm/numa.c
++++ b/arch/powerpc/mm/numa.c
@@ -17,8 +17,9 @@
#include <linux/nodemask.h>
#include <linux/cpu.h>
#include <asm/system.h>
#include <asm/smp.h>
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/pgtable_32.c powerpc.git/arch/powerpc/mm/pgtable_32.c
---- linux-2.6.25-rc9/arch/powerpc/mm/pgtable_32.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/mm/pgtable_32.c 2008-04-19 16:40:52.000000000 +0200
-@@ -281,12 +281,13 @@
+--- a/arch/powerpc/mm/pgtable_32.c
++++ b/arch/powerpc/mm/pgtable_32.c
+@@ -281,12 +281,13 @@ int map_page(unsigned long va, phys_addr
*/
void __init mapin_ram(void)
{
for (; s < total_lowmem; s += PAGE_SIZE) {
ktext = ((char *) v >= _stext && (char *) v < etext);
f = ktext ?_PAGE_RAM_TEXT : _PAGE_RAM;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/ppc_mmu_32.c powerpc.git/arch/powerpc/mm/ppc_mmu_32.c
---- linux-2.6.25-rc9/arch/powerpc/mm/ppc_mmu_32.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/mm/ppc_mmu_32.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/mm/ppc_mmu_32.c
++++ b/arch/powerpc/mm/ppc_mmu_32.c
@@ -26,11 +26,11 @@
#include <linux/mm.h>
#include <linux/init.h>
#include "mmu_decl.h"
-@@ -82,7 +82,6 @@
+@@ -82,7 +82,6 @@ unsigned long __init mmu_mapin_ram(void)
#else
unsigned long tot, bl, done;
unsigned long max_size = (256<<20);
if (__map_without_bats) {
printk(KERN_DEBUG "RAM mapped without BATs\n");
-@@ -93,19 +92,13 @@
+@@ -93,19 +92,13 @@ unsigned long __init mmu_mapin_ram(void)
/* Make sure we don't map a block larger than the
smallest alignment of the physical address. */
done = (unsigned long)bat_addrs[2].limit - KERNELBASE + 1;
if ((done < tot) && !bat_addrs[3].limit) {
/* use BAT3 to cover a bit more */
-@@ -113,7 +106,7 @@
+@@ -113,7 +106,7 @@ unsigned long __init mmu_mapin_ram(void)
for (bl = 128<<10; bl < max_size; bl <<= 1)
if (bl * 2 > tot)
break;
done = (unsigned long)bat_addrs[3].limit - KERNELBASE + 1;
}
-@@ -240,7 +233,7 @@
+@@ -240,7 +233,7 @@ void __init MMU_init_hw(void)
*/
if ( ppc_md.progress ) ppc_md.progress("hash:find piece", 0x322);
Hash = __va(lmb_alloc_base(Hash_size, Hash_size,
cacheable_memzero(Hash, Hash_size);
_SDR1 = __pa(Hash) | SDR1_LOW_BITS;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/mm/stab.c powerpc.git/arch/powerpc/mm/stab.c
---- linux-2.6.25-rc9/arch/powerpc/mm/stab.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/mm/stab.c 2008-03-17 14:03:31.000000000 +0100
+--- a/arch/powerpc/mm/stab.c
++++ b/arch/powerpc/mm/stab.c
@@ -12,12 +12,14 @@
* 2 of the License, or (at your option) any later version.
*/
#include <asm/abs_addr.h>
#include <asm/firmware.h>
#include <asm/iseries/hv_call.h>
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/oprofile/cell/spu_task_sync.c powerpc.git/arch/powerpc/oprofile/cell/spu_task_sync.c
---- linux-2.6.25-rc9/arch/powerpc/oprofile/cell/spu_task_sync.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/oprofile/cell/spu_task_sync.c 2008-04-19 16:40:52.000000000 +0200
-@@ -68,7 +68,7 @@
+--- a/arch/powerpc/oprofile/cell/spu_task_sync.c
++++ b/arch/powerpc/oprofile/cell/spu_task_sync.c
+@@ -68,7 +68,7 @@ static struct cached_info *get_cached_in
if (spu_num >= num_spu_nodes) {
printk(KERN_ERR "SPU_PROF: "
"%s, line %d: Invalid index %d into spu info cache\n",
ret_info = NULL;
goto out;
}
-@@ -115,7 +115,7 @@
+@@ -115,7 +115,7 @@ prepare_cached_spu_info(struct spu *spu,
if (!info) {
printk(KERN_ERR "SPU_PROF: "
"%s, line %d: create vma_map failed\n",
retval = -ENOMEM;
goto err_alloc;
}
-@@ -123,7 +123,7 @@
+@@ -123,7 +123,7 @@ prepare_cached_spu_info(struct spu *spu,
if (!new_map) {
printk(KERN_ERR "SPU_PROF: "
"%s, line %d: create vma_map failed\n",
retval = -ENOMEM;
goto err_alloc;
}
-@@ -171,7 +171,7 @@
+@@ -171,7 +171,7 @@ static int release_cached_info(int spu_i
printk(KERN_ERR "SPU_PROF: "
"%s, line %d: "
"Invalid index %d into spu info cache\n",
goto out;
}
end = spu_index + 1;
-@@ -273,7 +273,7 @@
+@@ -273,7 +273,7 @@ fail_no_image_cookie:
printk(KERN_ERR "SPU_PROF: "
"%s, line %d: Cannot find dcookie for SPU binary\n",
goto out;
}
-@@ -467,7 +467,7 @@
+@@ -467,7 +467,7 @@ int spu_sync_stop(void)
if (ret) {
printk(KERN_ERR "SPU_PROF: "
"%s, line %d: spu_switch_event_unregister returned %d\n",
goto out;
}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/oprofile/cell/vma_map.c powerpc.git/arch/powerpc/oprofile/cell/vma_map.c
---- linux-2.6.25-rc9/arch/powerpc/oprofile/cell/vma_map.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/oprofile/cell/vma_map.c 2008-04-19 16:40:52.000000000 +0200
-@@ -72,7 +72,7 @@
+--- a/arch/powerpc/oprofile/cell/vma_map.c
++++ b/arch/powerpc/oprofile/cell/vma_map.c
+@@ -72,7 +72,7 @@ vma_map_add(struct vma_to_fileoffset_map
kzalloc(sizeof(struct vma_to_fileoffset_map), GFP_KERNEL);
if (!new) {
printk(KERN_ERR "SPU_PROF: %s, line %d: malloc failed\n",
vma_map_free(map);
return NULL;
}
-@@ -134,19 +134,19 @@
+@@ -134,19 +134,19 @@ struct vma_to_fileoffset_map *create_vma
if (memcmp(ehdr.e_ident, expected, EI_PAD) != 0) {
printk(KERN_ERR "SPU_PROF: "
"%s, line %d: Unexpected e_ident parsing SPU ELF\n",
goto fail;
}
phdr_start = spu_elf_start + ehdr.e_phoff;
-@@ -232,7 +232,7 @@
+@@ -232,7 +232,7 @@ struct vma_to_fileoffset_map *create_vma
if (overlay_tbl_offset < 0) {
printk(KERN_ERR "SPU_PROF: "
"%s, line %d: Error finding SPU overlay table\n",
goto fail;
}
ovly_table = spu_elf_start + overlay_tbl_offset;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/oprofile/op_model_cell.c powerpc.git/arch/powerpc/oprofile/op_model_cell.c
---- linux-2.6.25-rc9/arch/powerpc/oprofile/op_model_cell.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/oprofile/op_model_cell.c 2008-04-19 16:40:52.000000000 +0200
-@@ -216,7 +216,7 @@
+--- a/arch/powerpc/oprofile/op_model_cell.c
++++ b/arch/powerpc/oprofile/op_model_cell.c
+@@ -216,7 +216,7 @@ static void pm_rtas_reset_signals(u32 no
* failure to stop OProfile.
*/
printk(KERN_WARNING "%s: rtas returned: %d\n",
}
static int pm_rtas_activate_signals(u32 node, u32 count)
-@@ -255,7 +255,7 @@
+@@ -255,7 +255,7 @@ static int pm_rtas_activate_signals(u32
if (unlikely(ret)) {
printk(KERN_WARNING "%s: rtas returned: %d\n",
return -EIO;
}
}
-@@ -560,7 +560,7 @@
+@@ -560,7 +560,7 @@ static int cell_reg_setup(struct op_coun
if (unlikely(spu_rtas_token == RTAS_UNKNOWN_SERVICE)) {
printk(KERN_ERR
"%s: rtas token ibm,cbe-spu-perftools unknown\n",
return -EIO;
}
}
-@@ -576,7 +576,7 @@
+@@ -576,7 +576,7 @@ static int cell_reg_setup(struct op_coun
if (unlikely(pm_rtas_token == RTAS_UNKNOWN_SERVICE)) {
printk(KERN_ERR
"%s: rtas token ibm,cbe-perftools unknown\n",
return -EIO;
}
-@@ -853,7 +853,7 @@
+@@ -853,7 +853,7 @@ static int pm_rtas_activate_spu_profilin
if (unlikely(ret)) {
printk(KERN_WARNING "%s: rtas returned: %d\n",
return -EIO;
}
-@@ -949,7 +949,7 @@
+@@ -949,7 +949,7 @@ static int cell_global_start_spu(struct
if (unlikely(ret != 0)) {
printk(KERN_ERR
"%s: rtas call ibm,cbe-spu-perftools failed, return = %d\n",
rtas_error = -EIO;
goto out;
}
-@@ -1061,7 +1061,7 @@
+@@ -1061,7 +1061,7 @@ static void cell_global_stop_spu(void)
if (unlikely(rtn_value != 0)) {
printk(KERN_ERR
"%s: rtas call ibm,cbe-spu-perftools failed, return = %d\n",
}
/* Deactivate the signals */
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/40x/ep405.c powerpc.git/arch/powerpc/platforms/40x/ep405.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/40x/ep405.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/40x/ep405.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/40x/ep405.c
++++ b/arch/powerpc/platforms/40x/ep405.c
@@ -29,6 +29,7 @@
#include <asm/time.h>
#include <asm/uic.h>
static struct device_node *bcsr_node;
static void __iomem *bcsr_regs;
-@@ -119,5 +120,6 @@
+@@ -119,5 +120,6 @@ define_machine(ep405) {
.progress = udbg_progress,
.init_IRQ = uic_init_tree,
.get_irq = uic_get_irq,
+ .restart = ppc4xx_reset_system,
.calibrate_decr = generic_calibrate_decr,
};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/40x/kilauea.c powerpc.git/arch/powerpc/platforms/40x/kilauea.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/40x/kilauea.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/40x/kilauea.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/40x/kilauea.c
++++ b/arch/powerpc/platforms/40x/kilauea.c
@@ -1,7 +1,7 @@
/*
* Kilauea board specific routines
static __initdata struct of_device_id kilauea_of_bus[] = {
{ .compatible = "ibm,plb4", },
-@@ -54,5 +55,6 @@
+@@ -54,5 +55,6 @@ define_machine(kilauea) {
.progress = udbg_progress,
.init_IRQ = uic_init_tree,
.get_irq = uic_get_irq,
+ .restart = ppc4xx_reset_system,
.calibrate_decr = generic_calibrate_decr,
};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/40x/makalu.c powerpc.git/arch/powerpc/platforms/40x/makalu.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/40x/makalu.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/40x/makalu.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/40x/makalu.c
++++ b/arch/powerpc/platforms/40x/makalu.c
@@ -20,6 +20,7 @@
#include <asm/time.h>
#include <asm/uic.h>
static __initdata struct of_device_id makalu_of_bus[] = {
{ .compatible = "ibm,plb4", },
-@@ -54,5 +55,6 @@
+@@ -54,5 +55,6 @@ define_machine(makalu) {
.progress = udbg_progress,
.init_IRQ = uic_init_tree,
.get_irq = uic_get_irq,
+ .restart = ppc4xx_reset_system,
.calibrate_decr = generic_calibrate_decr,
};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/40x/virtex.c powerpc.git/arch/powerpc/platforms/40x/virtex.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/40x/virtex.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/40x/virtex.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/40x/virtex.c
++++ b/arch/powerpc/platforms/40x/virtex.c
@@ -14,6 +14,7 @@
#include <asm/prom.h>
#include <asm/time.h>
static struct of_device_id xilinx_of_bus_ids[] __initdata = {
{ .compatible = "xlnx,plb-v46-1.00.a", },
-@@ -48,5 +49,6 @@
+@@ -48,5 +49,6 @@ define_machine(virtex) {
.probe = virtex_probe,
.init_IRQ = xilinx_intc_init_tree,
.get_irq = xilinx_intc_get_irq,
+ .restart = ppc4xx_reset_system,
.calibrate_decr = generic_calibrate_decr,
};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/40x/walnut.c powerpc.git/arch/powerpc/platforms/40x/walnut.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/40x/walnut.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/40x/walnut.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/40x/walnut.c
++++ b/arch/powerpc/platforms/40x/walnut.c
@@ -26,6 +26,7 @@
#include <asm/time.h>
#include <asm/uic.h>
static __initdata struct of_device_id walnut_of_bus[] = {
{ .compatible = "ibm,plb3", },
-@@ -61,5 +62,6 @@
+@@ -61,5 +62,6 @@ define_machine(walnut) {
.progress = udbg_progress,
.init_IRQ = uic_init_tree,
.get_irq = uic_get_irq,
+ .restart = ppc4xx_reset_system,
+ .calibrate_decr = generic_calibrate_decr,
};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/44x.h powerpc.git/arch/powerpc/platforms/44x/44x.h
---- linux-2.6.25-rc9/arch/powerpc/platforms/44x/44x.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/44x/44x.h 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/44x/44x.h
++++ b/arch/powerpc/platforms/44x/44x.h
@@ -3,6 +3,5 @@
extern u8 as1_readb(volatile u8 __iomem *addr);
-extern void ppc44x_reset_system(char *cmd);
#endif /* __POWERPC_PLATFORMS_44X_44X_H */
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/Kconfig powerpc.git/arch/powerpc/platforms/44x/Kconfig
---- linux-2.6.25-rc9/arch/powerpc/platforms/44x/Kconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/44x/Kconfig 2008-04-19 16:40:52.000000000 +0200
-@@ -67,6 +67,25 @@
+--- a/arch/powerpc/platforms/44x/Kconfig
++++ b/arch/powerpc/platforms/44x/Kconfig
+@@ -67,6 +67,25 @@ config WARP
See http://www.pikatechnologies.com/ and follow the "PIKA for Computer
Telephony Developers" link for more information.
#config LUAN
# bool "Luan"
# depends on 44x
-@@ -122,6 +141,14 @@
+@@ -122,6 +141,14 @@ config 440SPe
bool
select IBM_NEW_EMAC_EMAC4
# 44x errata/workaround config symbols, selected by the CPU models above
config IBM440EP_ERR42
bool
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/Makefile powerpc.git/arch/powerpc/platforms/44x/Makefile
---- linux-2.6.25-rc9/arch/powerpc/platforms/44x/Makefile 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/44x/Makefile 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/44x/Makefile
++++ b/arch/powerpc/platforms/44x/Makefile
@@ -1,9 +1,11 @@
-obj-$(CONFIG_44x) := misc_44x.o
+obj-$(CONFIG_44x) := misc_44x.o idle.o
obj-$(CONFIG_WARP) += warp.o
obj-$(CONFIG_WARP) += warp-nand.o
+obj-$(CONFIG_CANYONLANDS) += canyonlands.o
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/bamboo.c powerpc.git/arch/powerpc/platforms/44x/bamboo.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/44x/bamboo.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/44x/bamboo.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/44x/bamboo.c
++++ b/arch/powerpc/platforms/44x/bamboo.c
@@ -22,8 +22,7 @@
#include <asm/time.h>
#include <asm/uic.h>
static __initdata struct of_device_id bamboo_of_bus[] = {
{ .compatible = "ibm,plb4", },
-@@ -53,11 +52,11 @@
+@@ -53,11 +52,11 @@ static int __init bamboo_probe(void)
}
define_machine(bamboo) {
+ .restart = ppc4xx_reset_system,
.calibrate_decr = generic_calibrate_decr,
};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/canyonlands.c powerpc.git/arch/powerpc/platforms/44x/canyonlands.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/44x/canyonlands.c 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/44x/canyonlands.c 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/platforms/44x/canyonlands.c
@@ -0,0 +1,63 @@
+/*
+ * Canyonlands board specific routines
+ .restart = ppc4xx_reset_system,
+ .calibrate_decr = generic_calibrate_decr,
+};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/ebony.c powerpc.git/arch/powerpc/platforms/44x/ebony.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/44x/ebony.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/44x/ebony.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/44x/ebony.c
++++ b/arch/powerpc/platforms/44x/ebony.c
@@ -26,8 +26,7 @@
#include <asm/time.h>
#include <asm/uic.h>
static __initdata struct of_device_id ebony_of_bus[] = {
{ .compatible = "ibm,plb4", },
-@@ -66,6 +65,6 @@
+@@ -66,6 +65,6 @@ define_machine(ebony) {
.progress = udbg_progress,
.init_IRQ = uic_init_tree,
.get_irq = uic_get_irq,
+ .restart = ppc4xx_reset_system,
.calibrate_decr = generic_calibrate_decr,
};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/idle.c powerpc.git/arch/powerpc/platforms/44x/idle.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/44x/idle.c 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/44x/idle.c 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/platforms/44x/idle.c
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2008 IBM Corp.
+}
+
+early_param("idle", idle_param);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/katmai.c powerpc.git/arch/powerpc/platforms/44x/katmai.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/44x/katmai.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/44x/katmai.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/44x/katmai.c
++++ b/arch/powerpc/platforms/44x/katmai.c
@@ -22,8 +22,7 @@
#include <asm/time.h>
#include <asm/uic.h>
static __initdata struct of_device_id katmai_of_bus[] = {
{ .compatible = "ibm,plb4", },
-@@ -58,6 +57,6 @@
+@@ -58,6 +57,6 @@ define_machine(katmai) {
.progress = udbg_progress,
.init_IRQ = uic_init_tree,
.get_irq = uic_get_irq,
+ .restart = ppc4xx_reset_system,
.calibrate_decr = generic_calibrate_decr,
};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/misc_44x.S powerpc.git/arch/powerpc/platforms/44x/misc_44x.S
---- linux-2.6.25-rc9/arch/powerpc/platforms/44x/misc_44x.S 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/44x/misc_44x.S 2008-04-19 16:40:52.000000000 +0200
-@@ -44,14 +44,3 @@
+--- a/arch/powerpc/platforms/44x/misc_44x.S
++++ b/arch/powerpc/platforms/44x/misc_44x.S
+@@ -44,14 +44,3 @@ _GLOBAL(as1_writeb)
sync
isync
blr
- oris r13,r13,DBCR0_RST_SYSTEM@h
- mtspr SPRN_DBCR0,r13
- b . /* Just in case the reset doesn't work */
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/rainier.c powerpc.git/arch/powerpc/platforms/44x/rainier.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/44x/rainier.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/44x/rainier.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/44x/rainier.c
++++ b/arch/powerpc/platforms/44x/rainier.c
@@ -22,7 +22,7 @@
#include <asm/time.h>
#include <asm/uic.h>
static __initdata struct of_device_id rainier_of_bus[] = {
{ .compatible = "ibm,plb4", },
-@@ -57,6 +57,6 @@
+@@ -57,6 +57,6 @@ define_machine(rainier) {
.progress = udbg_progress,
.init_IRQ = uic_init_tree,
.get_irq = uic_get_irq,
+ .restart = ppc4xx_reset_system,
.calibrate_decr = generic_calibrate_decr,
};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/sequoia.c powerpc.git/arch/powerpc/platforms/44x/sequoia.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/44x/sequoia.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/44x/sequoia.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/44x/sequoia.c
++++ b/arch/powerpc/platforms/44x/sequoia.c
@@ -23,7 +23,7 @@
#include <asm/uic.h>
#include <asm/pci-bridge.h>
static __initdata struct of_device_id sequoia_of_bus[] = {
{ .compatible = "ibm,plb4", },
-@@ -58,6 +58,6 @@
+@@ -58,6 +58,6 @@ define_machine(sequoia) {
.progress = udbg_progress,
.init_IRQ = uic_init_tree,
.get_irq = uic_get_irq,
+ .restart = ppc4xx_reset_system,
.calibrate_decr = generic_calibrate_decr,
};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/taishan.c powerpc.git/arch/powerpc/platforms/44x/taishan.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/44x/taishan.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/44x/taishan.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/44x/taishan.c
++++ b/arch/powerpc/platforms/44x/taishan.c
@@ -29,8 +29,7 @@
#include <asm/time.h>
#include <asm/uic.h>
static __initdata struct of_device_id taishan_of_bus[] = {
{ .compatible = "ibm,plb4", },
-@@ -68,6 +67,6 @@
+@@ -68,6 +67,6 @@ define_machine(taishan) {
.progress = udbg_progress,
.init_IRQ = uic_init_tree,
.get_irq = uic_get_irq,
+ .restart = ppc4xx_reset_system,
.calibrate_decr = generic_calibrate_decr,
};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/warp-nand.c powerpc.git/arch/powerpc/platforms/44x/warp-nand.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/44x/warp-nand.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/44x/warp-nand.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/44x/warp-nand.c
++++ b/arch/powerpc/platforms/44x/warp-nand.c
@@ -11,6 +11,7 @@
#include <linux/mtd/partitions.h>
#include <linux/mtd/nand.h>
#ifdef CONFIG_MTD_NAND_NDFC
-@@ -100,6 +101,6 @@
+@@ -100,6 +101,6 @@ static int warp_setup_nand_flash(void)
return 0;
}
+machine_device_initcall(warp, warp_setup_nand_flash);
#endif
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/44x/warp.c powerpc.git/arch/powerpc/platforms/44x/warp.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/44x/warp.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/44x/warp.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/44x/warp.c
++++ b/arch/powerpc/platforms/44x/warp.c
@@ -18,9 +18,7 @@
#include <asm/udbg.h>
#include <asm/time.h>
static __initdata struct of_device_id warp_of_bus[] = {
{ .compatible = "ibm,plb4", },
-@@ -49,7 +47,7 @@
+@@ -49,7 +47,7 @@ define_machine(warp) {
.progress = udbg_progress,
.init_IRQ = uic_init_tree,
.get_irq = uic_get_irq,
.calibrate_decr = generic_calibrate_decr,
};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/52xx/lite5200.c powerpc.git/arch/powerpc/platforms/52xx/lite5200.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/52xx/lite5200.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/52xx/lite5200.c 2008-04-19 16:40:52.000000000 +0200
-@@ -63,7 +63,7 @@
+--- a/arch/powerpc/platforms/52xx/lite5200.c
++++ b/arch/powerpc/platforms/52xx/lite5200.c
+@@ -63,7 +63,7 @@ lite5200_fix_clock_config(void)
of_node_put(np);
if (!cdm) {
printk(KERN_ERR "%s() failed; expect abnormal behaviour\n",
return;
}
-@@ -98,7 +98,7 @@
+@@ -98,7 +98,7 @@ lite5200_fix_port_config(void)
of_node_put(np);
if (!gpio) {
printk(KERN_ERR "%s() failed. expect abnormal behavior\n",
return;
}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/82xx/Kconfig powerpc.git/arch/powerpc/platforms/82xx/Kconfig
---- linux-2.6.25-rc9/arch/powerpc/platforms/82xx/Kconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/82xx/Kconfig 2008-04-19 16:40:52.000000000 +0200
-@@ -11,7 +11,6 @@
+--- a/arch/powerpc/platforms/82xx/Kconfig
++++ b/arch/powerpc/platforms/82xx/Kconfig
+@@ -11,7 +11,6 @@ config MPC8272_ADS
select 8260
select FSL_SOC
select PQ2_ADS_PCI_PIC if PCI
help
This option enables support for the MPC8272 ADS board
-@@ -22,7 +21,6 @@
+@@ -22,7 +21,6 @@ config PQ2FADS
select 8260
select FSL_SOC
select PQ2_ADS_PCI_PIC if PCI
help
This option enables support for the PQ2FADS board
-@@ -31,7 +29,6 @@
+@@ -31,7 +29,6 @@ config EP8248E
select 8272
select 8260
select FSL_SOC
select MDIO_BITBANG
help
This enables support for the Embedded Planet EP8248E board.
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/83xx/mpc837x_rdb.c powerpc.git/arch/powerpc/platforms/83xx/mpc837x_rdb.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/83xx/mpc837x_rdb.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/83xx/mpc837x_rdb.c 2008-04-19 16:40:52.000000000 +0200
-@@ -46,6 +46,7 @@
+--- a/arch/powerpc/platforms/83xx/mpc837x_rdb.c
++++ b/arch/powerpc/platforms/83xx/mpc837x_rdb.c
+@@ -46,6 +46,7 @@ static void __init mpc837x_rdb_setup_arc
static struct of_device_id mpc837x_ids[] = {
{ .type = "soc", },
{ .compatible = "soc", },
{},
};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/83xx/mpc83xx.h powerpc.git/arch/powerpc/platforms/83xx/mpc83xx.h
---- linux-2.6.25-rc9/arch/powerpc/platforms/83xx/mpc83xx.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/83xx/mpc83xx.h 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/83xx/mpc83xx.h
++++ b/arch/powerpc/platforms/83xx/mpc83xx.h
@@ -16,6 +16,7 @@
#define MPC83XX_SCCR_USB_DRCM_10 0x00200000
#define MPC8315_SCCR_USB_MASK 0x00c00000
#define CONTROL_REFSEL_48MHZ 0x00000080
#define CONTROL_PHY_CLK_SEL_ULPI 0x00000400
#define CONTROL_OTG_PORT 0x00000020
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/83xx/usb.c powerpc.git/arch/powerpc/platforms/83xx/usb.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/83xx/usb.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/83xx/usb.c 2008-04-19 16:40:52.000000000 +0200
-@@ -129,7 +129,7 @@
+--- a/arch/powerpc/platforms/83xx/usb.c
++++ b/arch/powerpc/platforms/83xx/usb.c
+@@ -129,7 +129,7 @@ int mpc831x_usb_cfg(void)
if (immr_node && of_device_is_compatible(immr_node, "fsl,mpc8315-immr"))
clrsetbits_be32(immap + MPC83XX_SCCR_OFFS,
MPC8315_SCCR_USB_MASK,
else
clrsetbits_be32(immap + MPC83XX_SCCR_OFFS,
MPC83XX_SCCR_USB_MASK,
-@@ -164,9 +164,15 @@
+@@ -164,9 +164,15 @@ int mpc831x_usb_cfg(void)
/* Using on-chip PHY */
if (prop && (!strcmp(prop, "utmi_wide") ||
!strcmp(prop, "utmi"))) {
/* Using external UPLI PHY */
} else if (prop && !strcmp(prop, "ulpi")) {
/* Set PHY_CLK_SEL to ULPI */
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/85xx/Kconfig powerpc.git/arch/powerpc/platforms/85xx/Kconfig
---- linux-2.6.25-rc9/arch/powerpc/platforms/85xx/Kconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/85xx/Kconfig 2008-04-19 16:40:52.000000000 +0200
-@@ -19,7 +19,6 @@
+--- a/arch/powerpc/platforms/85xx/Kconfig
++++ b/arch/powerpc/platforms/85xx/Kconfig
+@@ -19,7 +19,6 @@ config MPC8540_ADS
config MPC8560_ADS
bool "Freescale MPC8560 ADS"
select DEFAULT_UIMAGE
select CPM2
help
This option enables support for the MPC 8560 ADS board
-@@ -46,6 +45,12 @@
+@@ -46,6 +45,12 @@ config MPC85xx_DS
help
This option enables support for the MPC85xx DS (MPC8544 DS) board
config STX_GP3
bool "Silicon Turnkey Express GP3"
help
-@@ -53,14 +58,12 @@
+@@ -53,14 +58,12 @@ config STX_GP3
board.
select CPM2
select DEFAULT_UIMAGE
select TQM85xx
config TQM8541
-@@ -68,7 +71,6 @@
+@@ -68,7 +71,6 @@ config TQM8541
help
This option enables support for the TQ Components TQM8541 board.
select DEFAULT_UIMAGE
select TQM85xx
select CPM2
-@@ -77,7 +79,6 @@
+@@ -77,7 +79,6 @@ config TQM8555
help
This option enables support for the TQ Components TQM8555 board.
select DEFAULT_UIMAGE
select TQM85xx
select CPM2
-@@ -86,7 +87,6 @@
+@@ -86,7 +87,6 @@ config TQM8560
help
This option enables support for the TQ Components TQM8560 board.
select DEFAULT_UIMAGE
select TQM85xx
select CPM2
-@@ -99,7 +99,6 @@
+@@ -99,7 +99,6 @@ config SBC8548
config SBC8560
bool "Wind River SBC8560"
select DEFAULT_UIMAGE
help
This option enables support for the Wind River SBC8560 board
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/85xx/Makefile powerpc.git/arch/powerpc/platforms/85xx/Makefile
---- linux-2.6.25-rc9/arch/powerpc/platforms/85xx/Makefile 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/85xx/Makefile 2008-04-19 16:40:52.000000000 +0200
-@@ -10,3 +10,4 @@
+--- a/arch/powerpc/platforms/85xx/Makefile
++++ b/arch/powerpc/platforms/85xx/Makefile
+@@ -10,3 +10,4 @@ obj-$(CONFIG_STX_GP3) += stx_gp3.o
obj-$(CONFIG_TQM85xx) += tqm85xx.o
obj-$(CONFIG_SBC8560) += sbc8560.o
obj-$(CONFIG_SBC8548) += sbc8548.o
+obj-$(CONFIG_KSI8560) += ksi8560.o
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/85xx/ksi8560.c powerpc.git/arch/powerpc/platforms/85xx/ksi8560.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/85xx/ksi8560.c 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/85xx/ksi8560.c 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/platforms/85xx/ksi8560.c
@@ -0,0 +1,257 @@
+/*
+ * Board setup routines for the Emerson KSI8560
+ .restart = machine_restart,
+ .calibrate_decr = generic_calibrate_decr,
+};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/85xx/mpc85xx_ads.c powerpc.git/arch/powerpc/platforms/85xx/mpc85xx_ads.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/85xx/mpc85xx_ads.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/85xx/mpc85xx_ads.c 2008-04-19 16:40:52.000000000 +0200
-@@ -165,7 +165,7 @@
+--- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c
++++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
+@@ -165,7 +165,7 @@ static void __init init_ioports(void)
int i;
for (i = 0; i < ARRAY_SIZE(mpc8560_ads_pins); i++) {
cpm2_set_pin(pin->port, pin->pin, pin->flags);
}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/85xx/mpc85xx_ds.c powerpc.git/arch/powerpc/platforms/85xx/mpc85xx_ds.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/85xx/mpc85xx_ds.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/85xx/mpc85xx_ds.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c
++++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
@@ -19,6 +19,7 @@
#include <linux/delay.h>
#include <linux/seq_file.h>
#else
#define DBG(fmt, args...)
#endif
-@@ -183,6 +184,18 @@
+@@ -183,6 +184,18 @@ static int __init mpc8544_ds_probe(void)
}
}
/*
* Called very early, device-tree isn't unflattened
*/
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/86xx/Kconfig powerpc.git/arch/powerpc/platforms/86xx/Kconfig
---- linux-2.6.25-rc9/arch/powerpc/platforms/86xx/Kconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/86xx/Kconfig 2008-04-19 16:40:52.000000000 +0200
-@@ -11,6 +11,12 @@
+--- a/arch/powerpc/platforms/86xx/Kconfig
++++ b/arch/powerpc/platforms/86xx/Kconfig
+@@ -11,6 +11,12 @@ config MPC8641_HPCN
help
This option enables support for the MPC8641 HPCN board.
config MPC8610_HPCD
bool "Freescale MPC8610 HPCD"
select DEFAULT_UIMAGE
-@@ -24,7 +30,7 @@
+@@ -24,7 +30,7 @@ config MPC8641
select FSL_PCI if PCI
select PPC_UDBG_16550
select MPIC
config MPC8610
bool
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/86xx/Makefile powerpc.git/arch/powerpc/platforms/86xx/Makefile
---- linux-2.6.25-rc9/arch/powerpc/platforms/86xx/Makefile 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/86xx/Makefile 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/86xx/Makefile
++++ b/arch/powerpc/platforms/86xx/Makefile
@@ -4,4 +4,5 @@
obj-$(CONFIG_SMP) += mpc86xx_smp.o
obj-$(CONFIG_MPC8641_HPCN) += mpc86xx_hpcn.o
+obj-$(CONFIG_SBC8641D) += sbc8641d.o
obj-$(CONFIG_MPC8610_HPCD) += mpc8610_hpcd.o
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/86xx/mpc8610_hpcd.c powerpc.git/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/86xx/mpc8610_hpcd.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/86xx/mpc8610_hpcd.c 2008-04-19 16:40:52.000000000 +0200
-@@ -52,7 +52,7 @@
+--- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
++++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
+@@ -52,7 +52,7 @@ static int __init mpc8610_declare_of_pla
}
machine_device_initcall(mpc86xx_hpcd, mpc8610_declare_of_platform_devices);
mpc86xx_hpcd_init_irq(void)
{
struct mpic *mpic1;
-@@ -200,7 +200,7 @@
+@@ -200,7 +200,7 @@ static int __init mpc86xx_hpcd_probe(voi
return 0;
}
mpc86xx_time_init(void)
{
unsigned int temp;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c powerpc.git/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c 2008-04-19 16:40:52.000000000 +0200
-@@ -55,7 +55,7 @@
+--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
++++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+@@ -55,7 +55,7 @@ static void mpc86xx_8259_cascade(unsigne
}
#endif /* CONFIG_PCI */
mpc86xx_hpcn_init_irq(void)
{
struct mpic *mpic1;
-@@ -162,7 +162,7 @@
+@@ -162,7 +162,7 @@ mpc86xx_hpcn_setup_arch(void)
}
mpc86xx_hpcn_show_cpuinfo(struct seq_file *m)
{
struct device_node *root;
-@@ -190,13 +190,19 @@
+@@ -190,13 +190,19 @@ static int __init mpc86xx_hpcn_probe(voi
{
unsigned long root = of_get_flat_dt_root();
mpc86xx_time_init(void)
{
unsigned int temp;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/86xx/sbc8641d.c powerpc.git/arch/powerpc/platforms/86xx/sbc8641d.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/86xx/sbc8641d.c 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/86xx/sbc8641d.c 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/platforms/86xx/sbc8641d.c
@@ -0,0 +1,164 @@
+/*
+ * SBC8641D board specific routines
+ .pcibios_fixup_bus = fsl_pcibios_fixup_bus,
+#endif
+};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/8xx/Kconfig powerpc.git/arch/powerpc/platforms/8xx/Kconfig
---- linux-2.6.25-rc9/arch/powerpc/platforms/8xx/Kconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/8xx/Kconfig 2008-04-19 16:40:52.000000000 +0200
-@@ -18,7 +18,6 @@
+--- a/arch/powerpc/platforms/8xx/Kconfig
++++ b/arch/powerpc/platforms/8xx/Kconfig
+@@ -18,7 +18,6 @@ config MPC8XXFADS
config MPC86XADS
bool "MPC86XADS"
select CPM1
help
MPC86x Application Development System by Freescale Semiconductor.
The MPC86xADS is meant to serve as a platform for s/w and h/w
-@@ -27,7 +26,6 @@
+@@ -27,7 +26,6 @@ config MPC86XADS
config MPC885ADS
bool "MPC885ADS"
select CPM1
help
Freescale Semiconductor MPC885 Application Development System (ADS).
Also known as DUET.
-@@ -37,7 +35,6 @@
+@@ -37,7 +35,6 @@ config MPC885ADS
config PPC_EP88XC
bool "Embedded Planet EP88xC (a.k.a. CWH-PPC-885XN-VE)"
select CPM1
help
This enables support for the Embedded Planet EP88xC board.
-@@ -47,7 +44,6 @@
+@@ -47,7 +44,6 @@ config PPC_EP88XC
config PPC_ADDER875
bool "Analogue & Micro Adder 875"
select CPM1
select REDBOOT
help
This enables support for the Analogue & Micro Adder 875
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/8xx/m8xx_setup.c powerpc.git/arch/powerpc/platforms/8xx/m8xx_setup.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/8xx/m8xx_setup.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/8xx/m8xx_setup.c 2008-03-17 14:03:31.000000000 +0100
-@@ -111,17 +111,12 @@
+--- a/arch/powerpc/platforms/8xx/m8xx_setup.c
++++ b/arch/powerpc/platforms/8xx/m8xx_setup.c
+@@ -111,17 +111,12 @@ void __init mpc8xx_calibrate_decr(void)
/* Processor frequency is MHz.
*/
printk("Decrementer Frequency = 0x%lx\n", ppc_tb_freq);
/* Perform some more timer/timebase initialization. This used
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/Kconfig powerpc.git/arch/powerpc/platforms/Kconfig
---- linux-2.6.25-rc9/arch/powerpc/platforms/Kconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/Kconfig 2008-04-19 16:40:52.000000000 +0200
-@@ -290,13 +290,7 @@
+--- a/arch/powerpc/platforms/Kconfig
++++ b/arch/powerpc/platforms/Kconfig
+@@ -290,13 +290,7 @@ config CPM2
config PPC_CPM_NEW_BINDING
bool
depends on CPM1 || CPM2
config AXON_RAM
tristate "Axon DDR2 memory device driver"
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/Kconfig.cputype powerpc.git/arch/powerpc/platforms/Kconfig.cputype
---- linux-2.6.25-rc9/arch/powerpc/platforms/Kconfig.cputype 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/Kconfig.cputype 2008-04-19 16:40:52.000000000 +0200
-@@ -41,11 +41,13 @@
+--- a/arch/powerpc/platforms/Kconfig.cputype
++++ b/arch/powerpc/platforms/Kconfig.cputype
+@@ -41,11 +41,13 @@ config 40x
bool "AMCC 40x"
select PPC_DCR_NATIVE
select PPC_UDBG_16550
config E200
bool "Freescale e200"
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/iommu.c powerpc.git/arch/powerpc/platforms/cell/iommu.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/cell/iommu.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/cell/iommu.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/cell/iommu.c
++++ b/arch/powerpc/platforms/cell/iommu.c
@@ -28,13 +28,13 @@
#include <linux/notifier.h>
#include <linux/of.h>
#include <asm/firmware.h>
#include <asm/cell-regs.h>
-@@ -316,7 +316,7 @@
+@@ -316,7 +316,7 @@ static void cell_iommu_setup_stab(struct
segments = max(dbase + dsize, fbase + fsize) >> IO_SEGMENT_SHIFT;
pr_debug("%s: iommu[%d]: segments: %lu\n",
/* set up the segment table */
stab_size = segments * sizeof(unsigned long);
-@@ -343,7 +343,7 @@
+@@ -343,7 +343,7 @@ static unsigned long *cell_iommu_alloc_p
(1 << 12) / sizeof(unsigned long));
ptab_size = segments * pages_per_segment * sizeof(unsigned long);
iommu->nid, ptab_size, get_order(ptab_size));
page = alloc_pages_node(iommu->nid, GFP_KERNEL, get_order(ptab_size));
BUG_ON(!page);
-@@ -355,7 +355,7 @@
+@@ -355,7 +355,7 @@ static unsigned long *cell_iommu_alloc_p
n_pte_pages = (pages_per_segment * sizeof(unsigned long)) >> 12;
pr_debug("%s: iommu[%d]: stab at %p, ptab at %p, n_pte_pages: %lu\n",
n_pte_pages);
/* initialise the STEs */
-@@ -394,7 +394,7 @@
+@@ -394,7 +394,7 @@ static void cell_iommu_enable_hardware(s
if (cell_iommu_find_ioc(iommu->nid, &xlate_base))
panic("%s: missing IOC register mappings for node %d\n",
iommu->xlate_regs = ioremap(xlate_base, IOC_Reg_Size);
iommu->cmd_regs = iommu->xlate_regs + IOC_IOCmd_Offset;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/pervasive.c powerpc.git/arch/powerpc/platforms/cell/pervasive.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/cell/pervasive.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/cell/pervasive.c 2008-04-19 16:40:52.000000000 +0200
-@@ -65,7 +65,7 @@
+--- a/arch/powerpc/platforms/cell/pervasive.c
++++ b/arch/powerpc/platforms/cell/pervasive.c
+@@ -65,7 +65,7 @@ static void cbe_power_save(void)
break;
default:
printk(KERN_WARNING "%s: unknown configuration\n",
break;
}
mtspr(SPRN_TSC_CELL, thread_switch_control);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/ras.c powerpc.git/arch/powerpc/platforms/cell/ras.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/cell/ras.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/cell/ras.c 2008-04-19 16:40:52.000000000 +0200
-@@ -132,7 +132,7 @@
+--- a/arch/powerpc/platforms/cell/ras.c
++++ b/arch/powerpc/platforms/cell/ras.c
+@@ -132,7 +132,7 @@ static int __init cbe_ptcal_enable_on_no
(unsigned int)(addr >> 32),
(unsigned int)(addr & 0xffffffff))) {
printk(KERN_ERR "%s: error enabling PTCAL on node %d!\n",
goto out_free_pages;
}
-@@ -162,7 +162,7 @@
+@@ -162,7 +162,7 @@ static int __init cbe_ptcal_enable(void)
if (!size)
return -ENODEV;
order = get_order(*size);
of_node_put(np);
-@@ -180,7 +180,7 @@
+@@ -180,7 +180,7 @@ static int __init cbe_ptcal_enable(void)
const u32 *nid = of_get_property(np, "node-id", NULL);
if (!nid) {
printk(KERN_ERR "%s: node %s is missing node-id?\n",
continue;
}
cbe_ptcal_enable_on_node(*nid, order);
-@@ -195,13 +195,13 @@
+@@ -195,13 +195,13 @@ static int cbe_ptcal_disable(void)
struct ptcal_area *area, *tmp;
int ret = 0;
area->nid);
ret = -EIO;
continue;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spu_base.c powerpc.git/arch/powerpc/platforms/cell/spu_base.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/cell/spu_base.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/cell/spu_base.c 2008-04-19 16:40:52.000000000 +0200
-@@ -165,7 +165,7 @@
+--- a/arch/powerpc/platforms/cell/spu_base.c
++++ b/arch/powerpc/platforms/cell/spu_base.c
+@@ -165,7 +165,7 @@ static int __spu_trap_data_seg(struct sp
struct spu_slb slb;
int psize;
slb.esid = (ea & ESID_MASK) | SLB_ESID_V;
-@@ -215,7 +215,7 @@
+@@ -215,7 +215,7 @@ static int __spu_trap_data_seg(struct sp
extern int hash_page(unsigned long ea, unsigned long access, unsigned long trap); //XXX
static int __spu_trap_data_map(struct spu *spu, unsigned long ea, u64 dsisr)
{
/* Handle kernel space hash faults immediately.
User hash faults need to be deferred to process context. */
-@@ -351,7 +351,7 @@
+@@ -351,7 +351,7 @@ spu_irq_class_1(int irq, void *data)
__spu_trap_data_seg(spu, dar);
spin_unlock(&spu->register_lock);
dar, dsisr);
if (stat & CLASS1_STORAGE_FAULT_INTR)
-@@ -726,7 +726,7 @@
+@@ -726,7 +726,7 @@ static int __init init_spu_base(void)
if (ret < 0) {
printk(KERN_WARNING "%s: Error initializing spus\n",
goto out_unregister_sysdev_class;
}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spu_callbacks.c powerpc.git/arch/powerpc/platforms/cell/spu_callbacks.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/cell/spu_callbacks.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/cell/spu_callbacks.c 2008-04-19 16:40:52.000000000 +0200
-@@ -54,7 +54,7 @@
+--- a/arch/powerpc/platforms/cell/spu_callbacks.c
++++ b/arch/powerpc/platforms/cell/spu_callbacks.c
+@@ -54,7 +54,7 @@ long spu_sys_callback(struct spu_syscall
long (*syscall)(u64 a1, u64 a2, u64 a3, u64 a4, u64 a5, u64 a6);
if (s->nr_ret >= ARRAY_SIZE(spu_syscall_table)) {
return -ENOSYS;
}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spu_manage.c powerpc.git/arch/powerpc/platforms/cell/spu_manage.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/cell/spu_manage.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/cell/spu_manage.c 2008-04-19 16:40:52.000000000 +0200
-@@ -92,7 +92,7 @@
+--- a/arch/powerpc/platforms/cell/spu_manage.c
++++ b/arch/powerpc/platforms/cell/spu_manage.c
+@@ -92,7 +92,7 @@ static int __init spu_map_interrupts_old
tmp = of_get_property(np->parent->parent, "node-id", NULL);
if (!tmp) {
nid = spu->node;
} else
nid = tmp[0];
-@@ -296,7 +296,7 @@
+@@ -296,7 +296,7 @@ static int __init of_enumerate_spus(int
ret = fn(node);
if (ret) {
printk(KERN_WARNING "%s: Error initializing %s\n",
break;
}
n++;
-@@ -327,7 +327,7 @@
+@@ -327,7 +327,7 @@ static int __init of_create_spu(struct s
if (!legacy_map) {
legacy_map = 1;
printk(KERN_WARNING "%s: Legacy device tree found, "
}
ret = spu_map_device_old(spu);
if (ret) {
-@@ -342,7 +342,7 @@
+@@ -342,7 +342,7 @@ static int __init of_create_spu(struct s
if (!legacy_irq) {
legacy_irq = 1;
printk(KERN_WARNING "%s: Legacy device tree found, "
}
ret = spu_map_interrupts_old(spu, spe);
if (ret) {
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spufs/coredump.c powerpc.git/arch/powerpc/platforms/cell/spufs/coredump.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/cell/spufs/coredump.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/coredump.c 2008-04-19 16:40:52.000000000 +0200
-@@ -133,8 +133,6 @@
+--- a/arch/powerpc/platforms/cell/spufs/coredump.c
++++ b/arch/powerpc/platforms/cell/spufs/coredump.c
+@@ -133,8 +133,6 @@ static struct spu_context *coredump_next
if (ctx->flags & SPU_CREATE_NOSCHED)
continue;
break;
}
-@@ -157,6 +155,9 @@
+@@ -157,6 +155,9 @@ int spufs_coredump_extra_notes_size(void
break;
size += rc;
}
return size;
-@@ -239,6 +240,9 @@
+@@ -239,6 +240,9 @@ int spufs_coredump_extra_notes_write(str
}
spu_release_saved(ctx);
}
return 0;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spufs/file.c powerpc.git/arch/powerpc/platforms/cell/spufs/file.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/cell/spufs/file.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/file.c 2008-04-19 16:40:52.000000000 +0200
-@@ -1337,7 +1337,7 @@
+--- a/arch/powerpc/platforms/cell/spufs/file.c
++++ b/arch/powerpc/platforms/cell/spufs/file.c
+@@ -1337,7 +1337,7 @@ static u64 spufs_signal1_type_get(struct
return ctx->ops->signal1_type_get(ctx);
}
DEFINE_SPUFS_ATTRIBUTE(spufs_signal1_type, spufs_signal1_type_get,
static int spufs_signal2_type_set(void *data, u64 val)
-@@ -1359,7 +1359,7 @@
+@@ -1359,7 +1359,7 @@ static u64 spufs_signal2_type_get(struct
return ctx->ops->signal2_type_get(ctx);
}
DEFINE_SPUFS_ATTRIBUTE(spufs_signal2_type, spufs_signal2_type_get,
#if SPUFS_MMAP_4K
static unsigned long spufs_mss_mmap_nopfn(struct vm_area_struct *vma,
-@@ -1556,7 +1556,7 @@
+@@ -1556,7 +1556,7 @@ void spufs_mfc_callback(struct spu *spu)
wake_up_all(&ctx->mfc_wq);
if (ctx->mfc_fasync) {
u32 free_elements, tagstatus;
unsigned int mask;
-@@ -1790,7 +1790,7 @@
+@@ -1790,7 +1790,7 @@ static unsigned int spufs_mfc_poll(struc
if (tagstatus & ctx->tagwait)
mask |= POLLIN | POLLRDNORM;
free_elements, tagstatus, ctx->tagwait);
return mask;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spufs/run.c powerpc.git/arch/powerpc/platforms/cell/spufs/run.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/cell/spufs/run.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/run.c 2008-04-19 16:40:52.000000000 +0200
-@@ -98,7 +98,7 @@
+--- a/arch/powerpc/platforms/cell/spufs/run.c
++++ b/arch/powerpc/platforms/cell/spufs/run.c
+@@ -98,7 +98,7 @@ static int spu_setup_isolated(struct spu
!= MFC_CNTL_PURGE_DMA_COMPLETE) {
if (time_after(jiffies, timeout)) {
printk(KERN_ERR "%s: timeout flushing MFC DMA queue\n",
ret = -EIO;
goto out;
}
-@@ -124,7 +124,7 @@
+@@ -124,7 +124,7 @@ static int spu_setup_isolated(struct spu
status_loading) {
if (time_after(jiffies, timeout)) {
printk(KERN_ERR "%s: timeout waiting for loader\n",
ret = -EIO;
goto out_drop_priv;
}
-@@ -134,7 +134,7 @@
+@@ -134,7 +134,7 @@ static int spu_setup_isolated(struct spu
if (!(status & SPU_STATUS_RUNNING)) {
/* If isolated LOAD has failed: run SPU, we will get a stop-and
* signal later. */
ctx->ops->runcntl_write(ctx, SPU_RUNCNTL_RUNNABLE);
ret = -EACCES;
goto out_drop_priv;
-@@ -142,7 +142,7 @@
+@@ -142,7 +142,7 @@ static int spu_setup_isolated(struct spu
if (!(status & SPU_STATUS_ISOLATED_STATE)) {
/* This isn't allowed by the CBEA, but check anyway */
ctx->ops->runcntl_write(ctx, SPU_RUNCNTL_STOP);
ret = -EINVAL;
goto out_drop_priv;
-@@ -282,7 +282,7 @@
+@@ -282,7 +282,7 @@ static int spu_handle_restartsys(struct
break;
default:
printk(KERN_WARNING "%s: unexpected return code %ld\n",
ret = 0;
}
return ret;
-@@ -323,6 +323,10 @@
+@@ -323,6 +323,10 @@ static int spu_process_callback(struct s
return -EINTR;
}
/* write result, jump over indirect pointer */
memcpy_toio(ls + ls_pointer, &spu_ret, sizeof(spu_ret));
ctx->ops->npc_write(ctx, npc);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/cell/spufs/switch.c powerpc.git/arch/powerpc/platforms/cell/spufs/switch.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/cell/spufs/switch.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/switch.c 2008-04-19 16:40:52.000000000 +0200
-@@ -1815,6 +1815,7 @@
+--- a/arch/powerpc/platforms/cell/spufs/switch.c
++++ b/arch/powerpc/platforms/cell/spufs/switch.c
+@@ -1815,6 +1815,7 @@ static void save_csa(struct spu_state *p
save_mfc_csr_ato(prev, spu); /* Step 24. */
save_mfc_tclass_id(prev, spu); /* Step 25. */
set_mfc_tclass_id(prev, spu); /* Step 26. */
purge_mfc_queue(prev, spu); /* Step 27. */
wait_purge_complete(prev, spu); /* Step 28. */
setup_mfc_sr1(prev, spu); /* Step 30. */
-@@ -1831,7 +1832,6 @@
+@@ -1831,7 +1832,6 @@ static void save_csa(struct spu_state *p
save_ppuint_mb(prev, spu); /* Step 41. */
save_ch_part1(prev, spu); /* Step 42. */
save_spu_mb(prev, spu); /* Step 43. */
reset_ch(prev, spu); /* Step 45. */
}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/beat.c powerpc.git/arch/powerpc/platforms/celleb/beat.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/celleb/beat.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/celleb/beat.c 2008-04-19 16:40:52.000000000 +0200
-@@ -48,6 +48,7 @@
+--- a/arch/powerpc/platforms/celleb/beat.c
++++ b/arch/powerpc/platforms/celleb/beat.c
+@@ -48,6 +48,7 @@ void beat_power_off(void)
}
u64 beat_halt_code = 0x1000000000000000UL;
void beat_halt(void)
{
-@@ -94,9 +95,8 @@
+@@ -94,9 +95,8 @@ ssize_t beat_nvram_read(char *buf, size_
len = count;
if (len > BEAT_NVRW_CNT)
len = BEAT_NVRW_CNT;
p += len;
i += len;
-@@ -121,9 +121,8 @@
+@@ -121,9 +121,8 @@ ssize_t beat_nvram_write(char *buf, size
len = count;
if (len > BEAT_NVRW_CNT)
len = BEAT_NVRW_CNT;
p += len;
i += len;
-@@ -149,13 +148,14 @@
+@@ -149,13 +148,14 @@ int64_t beat_get_term_char(u64 vterm, u6
u64 db[2];
s64 ret;
int64_t beat_put_term_char(u64 vterm, u64 len, u64 t1, u64 t2)
{
-@@ -163,8 +163,9 @@
+@@ -163,8 +163,9 @@ int64_t beat_put_term_char(u64 vterm, u6
db[0] = t1;
db[1] = t2;
void beat_power_save(void)
{
-@@ -261,7 +262,3 @@
+@@ -261,7 +262,3 @@ static int __init beat_event_init(void)
}
device_initcall(beat_event_init);
-EXPORT_SYMBOL(beat_get_term_char);
-EXPORT_SYMBOL(beat_put_term_char);
-EXPORT_SYMBOL(beat_halt_code);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/beat.h powerpc.git/arch/powerpc/platforms/celleb/beat.h
---- linux-2.6.25-rc9/arch/powerpc/platforms/celleb/beat.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/celleb/beat.h 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/celleb/beat.h
++++ b/arch/powerpc/platforms/celleb/beat.h
@@ -21,8 +21,8 @@
#ifndef _CELLEB_BEAT_H
#define _CELLEB_BEAT_H
int64_t beat_repository_encode(int, const char *, uint64_t[4]);
void beat_restart(char *);
void beat_power_off(void);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/beat_wrapper.h powerpc.git/arch/powerpc/platforms/celleb/beat_wrapper.h
---- linux-2.6.25-rc9/arch/powerpc/platforms/celleb/beat_wrapper.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/celleb/beat_wrapper.h 2008-04-19 16:40:52.000000000 +0200
-@@ -197,7 +197,8 @@
+--- a/arch/powerpc/platforms/celleb/beat_wrapper.h
++++ b/arch/powerpc/platforms/celleb/beat_wrapper.h
+@@ -197,7 +197,8 @@ static inline s64 beat_put_characters_to
u64 b[2];
memcpy(b, buffer, len);
}
static inline s64 beat_get_spe_privileged_state_1_registers(
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/htab.c powerpc.git/arch/powerpc/platforms/celleb/htab.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/celleb/htab.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/celleb/htab.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/celleb/htab.c
++++ b/arch/powerpc/platforms/celleb/htab.c
@@ -35,9 +35,9 @@
#include "beat_wrapper.h"
#endif
static DEFINE_SPINLOCK(beat_htab_lock);
-@@ -116,7 +116,8 @@
+@@ -116,7 +116,8 @@ static long beat_lpar_hpte_insert(unsign
hpte_r &= ~_PAGE_COHERENT;
spin_lock(&beat_htab_lock);
if (!(vflags & HPTE_V_BOLTED))
DBG_LOW(" full\n");
spin_unlock(&beat_htab_lock);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/interrupt.c powerpc.git/arch/powerpc/platforms/celleb/interrupt.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/celleb/interrupt.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/celleb/interrupt.c 2008-04-19 16:40:52.000000000 +0200
-@@ -34,7 +34,7 @@
+--- a/arch/powerpc/platforms/celleb/interrupt.c
++++ b/arch/powerpc/platforms/celleb/interrupt.c
+@@ -34,7 +34,7 @@ static DEFINE_SPINLOCK(beatic_irq_mask_l
static uint64_t beatic_irq_mask_enable[(MAX_IRQS+255)/64];
static uint64_t beatic_irq_mask_ack[(MAX_IRQS+255)/64];
/*
* In this implementation, "virq" == "IRQ plug number",
-@@ -49,13 +49,13 @@
+@@ -49,13 +49,13 @@ static inline void beatic_update_irq_mas
off = (irq_plug / 256) * 4;
masks[0] = beatic_irq_mask_enable[off + 0]
if (beat_set_interrupt_mask(irq_plug&~255UL,
masks[0], masks[1], masks[2], masks[3]) != 0)
panic("Failed to set mask IRQ!");
-@@ -96,7 +96,8 @@
+@@ -96,7 +96,8 @@ static void beatic_end_irq(unsigned int
s64 err;
unsigned long flags;
if ((err & 0xFFFFFFFF) != 0xFFFFFFF5) /* -11: wrong state */
panic("Failed to downcount IRQ! Error = %16lx", err);
-@@ -138,7 +139,8 @@
+@@ -138,7 +139,8 @@ static int beatic_pic_host_map(struct ir
struct irq_desc *desc = get_irq_desc(virq);
int64_t err;
return -EIO;
desc->status |= IRQ_LEVEL;
-@@ -202,22 +204,22 @@
+@@ -202,22 +204,22 @@ static inline unsigned int beatic_get_ir
beat_detect_pending_interrupts(i, pending);
__asm__ ("cntlzd %0,%1":"=r"(ub):
"r"(pending[0] & beatic_irq_mask_enable[i/64+0]
if (ub != 64)
return i + ub + 192;
}
-@@ -250,7 +252,7 @@
+@@ -250,7 +252,7 @@ void __init beatic_init_IRQ(void)
/* Allocate an irq host */
beatic_host = irq_alloc_host(NULL, IRQ_HOST_MAP_NOMAP, 0,
0);
BUG_ON(beatic_host == NULL);
irq_set_default_host(beatic_host);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/scc_epci.c powerpc.git/arch/powerpc/platforms/celleb/scc_epci.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/celleb/scc_epci.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/celleb/scc_epci.c 2008-04-19 16:40:52.000000000 +0200
-@@ -161,9 +161,9 @@
+--- a/arch/powerpc/platforms/celleb/scc_epci.c
++++ b/arch/powerpc/platforms/celleb/scc_epci.c
+@@ -161,9 +161,9 @@ static PCI_IO_ADDR celleb_epci_make_conf
if (bus != hose->bus)
addr = celleb_epci_get_epci_cfg(hose) +
(((bus->number & 0xff) << 16)
else
addr = celleb_epci_get_epci_cfg(hose) +
(((devfn & 0xff) << 8) | (where & 0xff));
-@@ -174,7 +174,7 @@
+@@ -174,7 +174,7 @@ static PCI_IO_ADDR celleb_epci_make_conf
}
static int celleb_epci_read_config(struct pci_bus *bus,
{
PCI_IO_ADDR epci_base;
PCI_IO_ADDR addr;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/scc_sio.c powerpc.git/arch/powerpc/platforms/celleb/scc_sio.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/celleb/scc_sio.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/celleb/scc_sio.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/celleb/scc_sio.c
++++ b/arch/powerpc/platforms/celleb/scc_sio.c
@@ -28,7 +28,7 @@
/* sio irq0=0xb00010022 irq0=0xb00010023 irq2=0xb00010024
static struct {
uint32_t offset;
-@@ -84,7 +84,7 @@
+@@ -84,7 +84,7 @@ static int __init txx9_serial_config(cha
int i;
for (;;) {
default:
return 0;
case 2:
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/spu_priv1.c powerpc.git/arch/powerpc/platforms/celleb/spu_priv1.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/celleb/spu_priv1.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/celleb/spu_priv1.c 2008-04-19 16:40:52.000000000 +0200
-@@ -183,8 +183,7 @@
+--- a/arch/powerpc/platforms/celleb/spu_priv1.c
++++ b/arch/powerpc/platforms/celleb/spu_priv1.c
+@@ -183,8 +183,7 @@ static u64 resource_allocation_enable_ge
return enable;
}
.int_mask_and = int_mask_and,
.int_mask_or = int_mask_or,
.int_mask_set = int_mask_set,
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/celleb/udbg_beat.c powerpc.git/arch/powerpc/platforms/celleb/udbg_beat.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/celleb/udbg_beat.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/celleb/udbg_beat.c 2008-04-19 16:40:52.000000000 +0200
-@@ -54,7 +54,8 @@
+--- a/arch/powerpc/platforms/celleb/udbg_beat.c
++++ b/arch/powerpc/platforms/celleb/udbg_beat.c
+@@ -54,7 +54,8 @@ static int udbg_getc_poll_beat(void)
if (inbuflen == 0) {
/* get some more chars. */
inbuflen = 0;
if (rc != 0)
inbuflen = 0; /* otherwise inbuflen is garbage */
}
-@@ -78,7 +79,7 @@
+@@ -78,7 +79,7 @@ static int udbg_getc_beat(void)
if (ch == -1) {
/* This shouldn't be needed...but... */
volatile unsigned long delay;
;
} else {
return ch;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c powerpc.git/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c 2008-04-19 16:40:52.000000000 +0200
-@@ -117,11 +117,11 @@
+--- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
++++ b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
+@@ -117,11 +117,11 @@ static void __init mpc7448_hpc2_init_IRQ
}
if (mpic_paddr == 0) {
(u32) mpic_paddr);
mpic = mpic_alloc(tsi_pic, mpic_paddr,
-@@ -140,17 +140,17 @@
+@@ -140,17 +140,17 @@ static void __init mpc7448_hpc2_init_IRQ
#ifdef CONFIG_PCI
tsi_pci = of_find_node_by_type(NULL, "pci");
if (tsi_pci == NULL) {
(u32) cascade_pci_irq);
tsi108_pci_int_init(cascade_node);
set_irq_data(cascade_pci_irq, mpic);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/embedded6xx/prpmc2800.c powerpc.git/arch/powerpc/platforms/embedded6xx/prpmc2800.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/embedded6xx/prpmc2800.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/embedded6xx/prpmc2800.c 2008-04-19 16:40:52.000000000 +0200
-@@ -49,13 +49,13 @@
+--- a/arch/powerpc/platforms/embedded6xx/prpmc2800.c
++++ b/arch/powerpc/platforms/embedded6xx/prpmc2800.c
+@@ -49,13 +49,13 @@ static void __init prpmc2800_setup_arch(
* ioremap mpp and gpp registers in case they are later
* needed by prpmc2800_reset_board().
*/
reg = of_get_property(np, "reg", NULL);
paddr = of_translate_address(np, reg);
of_node_put(np);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/iseries/exception.S powerpc.git/arch/powerpc/platforms/iseries/exception.S
---- linux-2.6.25-rc9/arch/powerpc/platforms/iseries/exception.S 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/iseries/exception.S 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/iseries/exception.S
++++ b/arch/powerpc/platforms/iseries/exception.S
@@ -38,11 +38,19 @@
.globl system_reset_iSeries
cmpwi 0,r24,0 /* Are we processor 0? */
bne 1f
b .__start_initialization_iSeries /* Start up the first processor */
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/iseries/ipl_parms.h powerpc.git/arch/powerpc/platforms/iseries/ipl_parms.h
---- linux-2.6.25-rc9/arch/powerpc/platforms/iseries/ipl_parms.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/iseries/ipl_parms.h 2008-04-19 16:40:52.000000000 +0200
-@@ -65,6 +65,4 @@
+--- a/arch/powerpc/platforms/iseries/ipl_parms.h
++++ b/arch/powerpc/platforms/iseries/ipl_parms.h
+@@ -65,6 +65,4 @@ struct ItIplParmsReal {
u64 xRsvd13; // Reserved x38-x3F
};
-extern struct ItIplParmsReal xItIplParmsReal;
-
#endif /* _ISERIES_IPL_PARMS_H */
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/iseries/lpardata.c powerpc.git/arch/powerpc/platforms/iseries/lpardata.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/iseries/lpardata.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/iseries/lpardata.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/iseries/lpardata.c
++++ b/arch/powerpc/platforms/iseries/lpardata.c
@@ -14,10 +14,10 @@
#include <asm/ptrace.h>
#include <asm/abs_addr.h>
.xDesc = 0xc8a5d9c4, /* "HvRD" ebcdic */
.xSize = sizeof(struct HvReleaseData),
.xVpdAreasPtrOffset = offsetof(struct naca_struct, xItVpdAreas),
-@@ -61,6 +61,63 @@
+@@ -61,6 +61,63 @@ struct naca_struct naca = {
.xRamDiskSize = 0,
};
extern void system_reset_iSeries(void);
extern void machine_check_iSeries(void);
extern void data_access_iSeries(void);
-@@ -129,7 +186,7 @@
+@@ -129,7 +186,7 @@ struct ItLpNaca itLpNaca = {
};
/* May be filled in by the hypervisor so cannot end up in the BSS */
/* May be filled in by the hypervisor so cannot end up in the BSS */
struct ItExtVpdPanel xItExtVpdPanel __attribute__((__section__(".data")));
-@@ -152,13 +209,54 @@
+@@ -152,13 +209,54 @@ u64 xMsVpd[3400] __attribute__((__sec
/* Space for Recovery Log Buffer */
/* May be filled in by the hypervisor so cannot end up in the BSS */
/* The LparMap data is now located at offset 0x6000 in head.S
* It was put there so that the HvReleaseData could address it
* with a 32-bit offset as required by the iSeries hypervisor
-@@ -167,7 +265,7 @@
+@@ -167,7 +265,7 @@ struct SpCommArea xSpCommArea = {
* the Naca via the HvReleaseData area. The HvReleaseData has the
* offset into the Naca of the pointer to the ItVpdAreas.
*/
.xSlicDesc = 0xc9a3e5c1, /* "ItVA" */
.xSlicSize = sizeof(struct ItVpdAreas),
.xSlicVpdEntries = ItVpdMaxEntries, /* # VPD array entries */
-@@ -185,7 +283,7 @@
+@@ -185,7 +283,7 @@ struct ItVpdAreas itVpdAreas = {
.xSlicVpdLens = { /* VPD lengths */
0,0,0, /* 0 - 2 */
sizeof(xItExtVpdPanel), /* 3 Extended VPD */
0, /* 5 */
sizeof(struct ItIplParmsReal),/* 6 length of IPL parms */
26992, /* 7 length of MS VPD */
-@@ -203,7 +301,7 @@
+@@ -203,7 +301,7 @@ struct ItVpdAreas itVpdAreas = {
.xSlicVpdAdrs = { /* VPD addresses */
0,0,0, /* 0 - 2 */
&xItExtVpdPanel, /* 3 Extended VPD */
0, /* 5 */
&xItIplParmsReal, /* 6 IPL parms */
&xMsVpd, /* 7 MS Vpd */
-@@ -219,10 +317,3 @@
+@@ -219,10 +317,3 @@ struct ItVpdAreas itVpdAreas = {
0,0
}
};
- .xSize = sizeof(struct ItLpRegSave),
- },
-};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/iseries/naca.h powerpc.git/arch/powerpc/platforms/iseries/naca.h
---- linux-2.6.25-rc9/arch/powerpc/platforms/iseries/naca.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/iseries/naca.h 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/iseries/naca.h
++++ b/arch/powerpc/platforms/iseries/naca.h
@@ -14,7 +14,7 @@
struct naca_struct {
void *xRamDisk; /* iSeries ramdisk 0x08 */
u64 xRamDiskSize; /* In pages 0x10 */
};
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/iseries/pci.c powerpc.git/arch/powerpc/platforms/iseries/pci.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/iseries/pci.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/iseries/pci.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/iseries/pci.c
++++ b/arch/powerpc/platforms/iseries/pci.c
@@ -23,6 +23,7 @@
#undef DEBUG
#include <linux/kernel.h>
#include <linux/list.h>
#include <linux/string.h>
-@@ -586,7 +587,7 @@
+@@ -586,7 +587,7 @@ static inline struct device_node *xlate_
static unsigned long last_jiffies;
static int num_printed;
last_jiffies = jiffies;
num_printed = 0;
}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/iseries/release_data.h powerpc.git/arch/powerpc/platforms/iseries/release_data.h
---- linux-2.6.25-rc9/arch/powerpc/platforms/iseries/release_data.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/iseries/release_data.h 2008-04-19 16:40:52.000000000 +0200
-@@ -58,6 +58,6 @@
+--- a/arch/powerpc/platforms/iseries/release_data.h
++++ b/arch/powerpc/platforms/iseries/release_data.h
+@@ -58,6 +58,6 @@ struct HvReleaseData {
char xRsvd3[20]; /* Reserved x2C-x3F */
};
+extern const struct HvReleaseData hvReleaseData;
#endif /* _ISERIES_RELEASE_DATA_H */
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/iseries/spcomm_area.h powerpc.git/arch/powerpc/platforms/iseries/spcomm_area.h
---- linux-2.6.25-rc9/arch/powerpc/platforms/iseries/spcomm_area.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/iseries/spcomm_area.h 2008-04-19 16:40:52.000000000 +0200
-@@ -31,6 +31,4 @@
+--- a/arch/powerpc/platforms/iseries/spcomm_area.h
++++ b/arch/powerpc/platforms/iseries/spcomm_area.h
+@@ -31,6 +31,4 @@ struct SpCommArea {
u8 xRsvd2[80]; // Reserved 030-07F
};
-extern struct SpCommArea xSpCommArea;
-
#endif /* _ISERIES_SPCOMM_AREA_H */
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/iseries/vpd_areas.h powerpc.git/arch/powerpc/platforms/iseries/vpd_areas.h
---- linux-2.6.25-rc9/arch/powerpc/platforms/iseries/vpd_areas.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/iseries/vpd_areas.h 2008-04-19 16:40:52.000000000 +0200
-@@ -80,9 +80,9 @@
+--- a/arch/powerpc/platforms/iseries/vpd_areas.h
++++ b/arch/powerpc/platforms/iseries/vpd_areas.h
+@@ -80,9 +80,9 @@ struct ItVpdAreas {
u32 xPlicDmaLens[ItDmaMaxEntries];// Array of DMA lengths 080-0A7
u32 xPlicDmaToks[ItDmaMaxEntries];// Array of DMA tokens 0A8-0CF
u32 xSlicVpdLens[ItVpdMaxEntries];// Array of VPD lengths 0D0-12F
+extern const struct ItVpdAreas itVpdAreas;
#endif /* _ISERIES_VPD_AREAS_H */
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/maple/pci.c powerpc.git/arch/powerpc/platforms/maple/pci.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/maple/pci.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/maple/pci.c 2008-04-19 16:40:52.000000000 +0200
-@@ -592,50 +592,3 @@
+--- a/arch/powerpc/platforms/maple/pci.c
++++ b/arch/powerpc/platforms/maple/pci.c
+@@ -592,50 +592,3 @@ int maple_pci_get_legacy_ide_irq(struct
}
return irq;
}
-}
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8111_IDE,
- fixup_maple_ide);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/maple/setup.c powerpc.git/arch/powerpc/platforms/maple/setup.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/maple/setup.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/maple/setup.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/maple/setup.c
++++ b/arch/powerpc/platforms/maple/setup.c
@@ -43,6 +43,7 @@
#include <linux/smp.h>
#include <linux/bitops.h>
#include <asm/mpic.h>
#include <asm/rtas.h>
#include <asm/udbg.h>
-@@ -319,7 +319,7 @@
+@@ -319,7 +319,7 @@ static int __init maple_probe(void)
return 1;
}
.name = "Maple",
.probe = maple_probe,
.setup_arch = maple_setup_arch,
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pasemi/dma_lib.c powerpc.git/arch/powerpc/platforms/pasemi/dma_lib.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/pasemi/dma_lib.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/pasemi/dma_lib.c 2008-03-17 14:03:32.000000000 +0100
+--- a/arch/powerpc/platforms/pasemi/dma_lib.c
++++ b/arch/powerpc/platforms/pasemi/dma_lib.c
@@ -17,6 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
static struct pasdma_status *dma_status;
-@@ -43,6 +46,8 @@
+@@ -43,6 +46,8 @@ static struct pci_dev *dma_pdev;
static DECLARE_BITMAP(txch_free, MAX_TXCH);
static DECLARE_BITMAP(rxch_free, MAX_RXCH);
/* pasemi_read_iob_reg - read IOB register
* @reg: Register to read (offset into PCI CFG space)
-@@ -373,6 +378,106 @@
+@@ -373,6 +378,106 @@ void pasemi_dma_free_buf(struct pasemi_d
}
EXPORT_SYMBOL(pasemi_dma_free_buf);
static void *map_onedev(struct pci_dev *p, int index)
{
struct device_node *dn;
-@@ -410,6 +515,7 @@
+@@ -410,6 +515,7 @@ int pasemi_dma_init(void)
struct resource res;
struct device_node *dn;
int i, intf, err = 0;
u32 tmp;
if (!machine_is(pasemi))
-@@ -478,6 +584,44 @@
+@@ -478,6 +584,44 @@ int pasemi_dma_init(void)
for (i = 0; i < MAX_RXCH; i++)
__set_bit(i, rxch_free);
printk(KERN_INFO "PA Semi PWRficient DMA library initialized "
"(%d tx, %d rx channels)\n", num_txch, num_rxch);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pasemi/iommu.c powerpc.git/arch/powerpc/platforms/pasemi/iommu.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/pasemi/iommu.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/pasemi/iommu.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/pasemi/iommu.c
++++ b/arch/powerpc/platforms/pasemi/iommu.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005-2007, PA Semi, Inc
static u32 iob_l1_emptyval;
static u32 iob_l2_emptyval;
static u32 *iob_l2_base;
-@@ -219,7 +218,7 @@
+@@ -219,7 +218,7 @@ int __init iob_init(struct device_node *
for (i = 0; i < 64; i++) {
/* Each L1 covers 32MB, i.e. 8K entries = 32K of ram */
regword = IOBMAP_L1E_V | (__pa(iob_l2_base + i*0x2000) >> 12);
}
/* set 2GB translation window, based at 0 */
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/powermac/setup.c powerpc.git/arch/powerpc/platforms/powermac/setup.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/powermac/setup.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/powermac/setup.c 2008-03-17 14:03:32.000000000 +0100
+--- a/arch/powerpc/platforms/powermac/setup.c
++++ b/arch/powerpc/platforms/powermac/setup.c
@@ -53,6 +53,7 @@
#include <linux/suspend.h>
#include <linux/of_device.h>
#include <asm/udbg.h>
#include "pmac.h"
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/ps3/device-init.c powerpc.git/arch/powerpc/platforms/ps3/device-init.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/ps3/device-init.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/ps3/device-init.c 2008-04-19 16:40:52.000000000 +0200
-@@ -499,41 +499,14 @@
+--- a/arch/powerpc/platforms/ps3/device-init.c
++++ b/arch/powerpc/platforms/ps3/device-init.c
+@@ -499,41 +499,14 @@ static int __init ps3_register_graphics_
}
/**
case PS3_DEV_TYPE_STOR_DISK:
result = ps3_setup_storage_dev(repo, PS3_MATCH_ID_STOR_DISK);
-@@ -572,6 +545,48 @@
+@@ -572,6 +545,48 @@ static int ps3_register_repository_devic
return result;
}
static void ps3_find_and_add_device(u64 bus_id, u64 dev_id)
{
struct ps3_repository_device repo;
-@@ -601,7 +616,7 @@
+@@ -601,7 +616,7 @@ found:
pr_debug("%s:%u: device %lu:%lu found after %u retries\n",
__func__, __LINE__, bus_id, dev_id, retries);
return;
}
-@@ -905,8 +920,7 @@
+@@ -905,8 +920,7 @@ static int __init ps3_register_devices(v
ps3_register_graphics_devices();
ps3_register_sound_devices();
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/ps3/htab.c powerpc.git/arch/powerpc/platforms/ps3/htab.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/ps3/htab.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/ps3/htab.c 2008-03-17 14:03:32.000000000 +0100
+--- a/arch/powerpc/platforms/ps3/htab.c
++++ b/arch/powerpc/platforms/ps3/htab.c
@@ -19,9 +19,10 @@
*/
#include <asm/udbg.h>
#include <asm/lv1call.h>
#include <asm/ps3fb.h>
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/ps3/interrupt.c powerpc.git/arch/powerpc/platforms/ps3/interrupt.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/ps3/interrupt.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/ps3/interrupt.c 2008-04-19 16:40:52.000000000 +0200
-@@ -709,7 +709,7 @@
+--- a/arch/powerpc/platforms/ps3/interrupt.c
++++ b/arch/powerpc/platforms/ps3/interrupt.c
+@@ -709,7 +709,7 @@ static unsigned int ps3_get_irq(void)
asm volatile("cntlzd %0,%1" : "=r" (plug) : "r" (x));
plug &= 0x3f;
pr_debug("%s:%d: no plug found: thread_id %lu\n", __func__,
__LINE__, pd->thread_id);
dump_bmp(&per_cpu(ps3_private, 0));
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/ps3/mm.c powerpc.git/arch/powerpc/platforms/ps3/mm.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/ps3/mm.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/ps3/mm.c 2008-03-17 14:03:32.000000000 +0100
+--- a/arch/powerpc/platforms/ps3/mm.c
++++ b/arch/powerpc/platforms/ps3/mm.c
@@ -21,9 +21,10 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <asm/udbg.h>
#include <asm/lv1call.h>
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/ps3/os-area.c powerpc.git/arch/powerpc/platforms/ps3/os-area.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/ps3/os-area.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/ps3/os-area.c 2008-03-17 14:03:32.000000000 +0100
+--- a/arch/powerpc/platforms/ps3/os-area.c
++++ b/arch/powerpc/platforms/ps3/os-area.c
@@ -24,8 +24,9 @@
#include <linux/fs.h>
#include <linux/syscalls.h>
#include "platform.h"
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/ps3/setup.c powerpc.git/arch/powerpc/platforms/ps3/setup.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/ps3/setup.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/ps3/setup.c 2008-04-19 16:40:52.000000000 +0200
-@@ -95,6 +95,14 @@
+--- a/arch/powerpc/platforms/ps3/setup.c
++++ b/arch/powerpc/platforms/ps3/setup.c
+@@ -95,6 +95,14 @@ static void ps3_power_off(void)
ps3_sys_manager_power_off(); /* never returns */
}
static void ps3_panic(char *str)
{
DBG("%s:%d %s\n", __func__, __LINE__, str);
-@@ -105,7 +113,8 @@
+@@ -105,7 +113,8 @@ static void ps3_panic(char *str)
printk(" Please press POWER button.\n");
printk("\n");
}
#if defined(CONFIG_FB_PS3) || defined(CONFIG_FB_PS3_MODULE) || \
-@@ -117,7 +126,7 @@
+@@ -117,7 +126,7 @@ static void __init prealloc(struct ps3_p
p->address = __alloc_bootmem(p->size, p->align, __pa(MAX_DMA_ADDRESS));
if (!p->address) {
p->name);
return;
}
-@@ -266,6 +275,7 @@
+@@ -266,6 +275,7 @@ define_machine(ps3) {
.progress = ps3_progress,
.restart = ps3_restart,
.power_off = ps3_power_off,
#if defined(CONFIG_KEXEC)
.kexec_cpu_down = ps3_kexec_cpu_down,
.machine_kexec = default_machine_kexec,
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/ps3/spu.c powerpc.git/arch/powerpc/platforms/ps3/spu.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/ps3/spu.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/ps3/spu.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/ps3/spu.c
++++ b/arch/powerpc/platforms/ps3/spu.c
@@ -27,6 +27,7 @@
#include <asm/spu.h>
#include <asm/spu_priv1.h>
#include "../cell/spufs/spufs.h"
#include "platform.h"
-@@ -140,6 +141,12 @@
+@@ -140,6 +141,12 @@ static void _dump_areas(unsigned int spe
pr_debug("%s:%d: shadow: %lxh\n", func, line, shadow);
}
static unsigned long get_vas_id(void)
{
unsigned long id;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/Makefile powerpc.git/arch/powerpc/platforms/pseries/Makefile
---- linux-2.6.25-rc9/arch/powerpc/platforms/pseries/Makefile 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/pseries/Makefile 2008-04-19 16:40:52.000000000 +0200
-@@ -18,3 +18,4 @@
+--- a/arch/powerpc/platforms/pseries/Makefile
++++ b/arch/powerpc/platforms/pseries/Makefile
+@@ -18,3 +18,4 @@ obj-$(CONFIG_HOTPLUG_CPU) += hotplug-cpu
obj-$(CONFIG_HVC_CONSOLE) += hvconsole.o
obj-$(CONFIG_HVCS) += hvcserver.o
obj-$(CONFIG_HCALL_STATS) += hvCall_inst.o
+obj-$(CONFIG_PHYP_DUMP) += phyp_dump.o
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/eeh.c powerpc.git/arch/powerpc/platforms/pseries/eeh.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/pseries/eeh.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/pseries/eeh.c 2008-04-19 16:40:52.000000000 +0200
-@@ -945,7 +945,6 @@
+--- a/arch/powerpc/platforms/pseries/eeh.c
++++ b/arch/powerpc/platforms/pseries/eeh.c
+@@ -945,7 +945,6 @@ static void *early_enable_eeh(struct dev
unsigned int rets[3];
struct eeh_early_enable_info *info = data;
int ret;
const u32 *class_code = of_get_property(dn, "class-code", NULL);
const u32 *vendor_id = of_get_property(dn, "vendor-id", NULL);
const u32 *device_id = of_get_property(dn, "device-id", NULL);
-@@ -959,8 +958,8 @@
+@@ -959,8 +958,8 @@ static void *early_enable_eeh(struct dev
pdn->eeh_freeze_count = 0;
pdn->eeh_false_positives = 0;
/* Ignore bad nodes. */
if (!class_code || !vendor_id || !device_id)
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/lpar.c powerpc.git/arch/powerpc/platforms/pseries/lpar.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/pseries/lpar.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/pseries/lpar.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/pseries/lpar.c
++++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -40,6 +40,7 @@
#include <asm/smp.h>
#ifdef DEBUG_LOW
#define DBG_LOW(fmt...) do { udbg_printf(fmt); } while(0)
-@@ -203,7 +204,6 @@
+@@ -203,7 +204,6 @@ void __init find_udbg_vterm(void)
struct device_node *stdout_node;
const u32 *termno;
const char *name;
/* find the boot console from /chosen/stdout */
if (!of_chosen)
-@@ -219,8 +219,6 @@
+@@ -219,8 +219,6 @@ void __init find_udbg_vterm(void)
printk(KERN_WARNING "stdout node missing 'name' property!\n");
goto out;
}
/* Check if it's a virtual terminal */
if (strncmp(name, "vty", 3) != 0)
-@@ -234,15 +232,13 @@
+@@ -234,15 +232,13 @@ void __init find_udbg_vterm(void)
udbg_putc = udbg_putcLP;
udbg_getc = udbg_getcLP;
udbg_getc_poll = udbg_getc_pollLP;
}
out:
of_node_put(stdout_node);
-@@ -520,6 +516,20 @@
+@@ -520,6 +516,20 @@ static void pSeries_lpar_hpte_invalidate
BUG_ON(lpar_rc != H_SUCCESS);
}
/* Flag bits for H_BULK_REMOVE */
#define HBR_REQUEST 0x4000000000000000UL
#define HBR_RESPONSE 0x8000000000000000UL
-@@ -597,6 +607,7 @@
+@@ -597,6 +607,7 @@ void __init hpte_init_lpar(void)
ppc_md.hpte_updateboltedpp = pSeries_lpar_hpte_updateboltedpp;
ppc_md.hpte_insert = pSeries_lpar_hpte_insert;
ppc_md.hpte_remove = pSeries_lpar_hpte_remove;
ppc_md.flush_hash_range = pSeries_lpar_flush_hash_range;
ppc_md.hpte_clear_all = pSeries_lpar_hptab_clear;
}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/pci_dlpar.c powerpc.git/arch/powerpc/platforms/pseries/pci_dlpar.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/pseries/pci_dlpar.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/pseries/pci_dlpar.c 2008-04-19 16:40:52.000000000 +0200
-@@ -123,7 +123,7 @@
+--- a/arch/powerpc/platforms/pseries/pci_dlpar.c
++++ b/arch/powerpc/platforms/pseries/pci_dlpar.c
+@@ -123,7 +123,7 @@ pcibios_pci_config_bridge(struct pci_dev
/* Add to children of PCI bridge dev->bus */
child_bus = pci_add_new_bus(dev->bus, dev, sec_busno);
if (!child_bus) {
return -EIO;
}
sprintf(child_bus->name, "PCI Bus #%02x", child_bus->number);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/phyp_dump.c powerpc.git/arch/powerpc/platforms/pseries/phyp_dump.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/pseries/phyp_dump.c 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pseries/phyp_dump.c 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/platforms/pseries/phyp_dump.c
@@ -0,0 +1,507 @@
+/*
+ * Hypervisor-assisted dump
+ return 0;
+}
+early_param("phyp_dump_reserve_size", early_phyp_dump_reserve_size);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/pseries.h powerpc.git/arch/powerpc/platforms/pseries/pseries.h
---- linux-2.6.25-rc9/arch/powerpc/platforms/pseries/pseries.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/pseries/pseries.h 2008-04-19 16:40:52.000000000 +0200
-@@ -38,4 +38,6 @@
+--- a/arch/powerpc/platforms/pseries/pseries.h
++++ b/arch/powerpc/platforms/pseries/pseries.h
+@@ -38,4 +38,6 @@ extern void pSeries_final_fixup(void);
/* Poweron flag used for enabling auto ups restart */
extern unsigned long rtas_poweron_auto;
+extern void find_udbg_vterm(void);
+
#endif /* _PSERIES_PSERIES_H */
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/reconfig.c powerpc.git/arch/powerpc/platforms/pseries/reconfig.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/pseries/reconfig.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/pseries/reconfig.c 2008-04-19 16:40:52.000000000 +0200
-@@ -222,14 +222,14 @@
+--- a/arch/powerpc/platforms/pseries/reconfig.c
++++ b/arch/powerpc/platforms/pseries/reconfig.c
+@@ -222,14 +222,14 @@ static char * parse_next_property(char *
tmp = strchr(buf, ' ');
if (!tmp) {
printk(KERN_ERR "property parse failed in %s at line %d\n",
return NULL;
}
-@@ -238,12 +238,12 @@
+@@ -238,12 +238,12 @@ static char * parse_next_property(char *
*length = simple_strtoul(tmp, &tmp, 10);
if (*length == -1) {
printk(KERN_ERR "property parse failed in %s at line %d\n",
return NULL;
}
-@@ -252,12 +252,12 @@
+@@ -252,12 +252,12 @@ static char * parse_next_property(char *
tmp += *length;
if (tmp > end) {
printk(KERN_ERR "property parse failed in %s at line %d\n",
return NULL;
}
tmp++;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/scanlog.c powerpc.git/arch/powerpc/platforms/pseries/scanlog.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/pseries/scanlog.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/pseries/scanlog.c 2008-04-19 16:40:52.000000000 +0200
-@@ -195,31 +195,30 @@
+--- a/arch/powerpc/platforms/pseries/scanlog.c
++++ b/arch/powerpc/platforms/pseries/scanlog.c
+@@ -195,31 +195,30 @@ const struct file_operations scanlog_fop
static int __init scanlog_init(void)
{
struct proc_dir_entry *ent;
}
static void __exit scanlog_cleanup(void)
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/setup.c powerpc.git/arch/powerpc/platforms/pseries/setup.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/pseries/setup.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/pseries/setup.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/pseries/setup.c
++++ b/arch/powerpc/platforms/pseries/setup.c
@@ -76,9 +76,6 @@
#define DBG(fmt...)
#endif
int fwnmi_active; /* TRUE if an FWNMI handler is present */
static void pseries_shared_idle_sleep(void);
-@@ -127,14 +124,60 @@
+@@ -127,14 +124,60 @@ void pseries_8259_cascade(unsigned int i
desc->chip->eoi(irq);
}
int naddr, n, i, opplen;
struct mpic *mpic;
-@@ -167,43 +210,13 @@
+@@ -167,43 +210,13 @@ static void __init pseries_mpic_init_IRQ
mpic_init(mpic);
/* Look for cascade */
}
static void pseries_lpar_enable_pmcs(void)
-@@ -235,7 +248,7 @@
+@@ -235,7 +248,7 @@ static void __init pseries_discover_pic(
smp_init_pseries_mpic();
return;
} else if (strstr(typep, "ppc-xicp")) {
setup_kexec_cpu_down_xics();
smp_init_pseries_xics();
return;
-@@ -393,6 +406,7 @@
+@@ -393,6 +406,7 @@ static void pseries_dedicated_idle_sleep
{
unsigned int cpu = smp_processor_id();
unsigned long start_snooze;
/*
* Indicate to the HV that we are idle. Now would be
-@@ -400,6 +414,7 @@
+@@ -400,6 +414,7 @@ static void pseries_dedicated_idle_sleep
*/
get_lppaca()->idle = 1;
get_lppaca()->donate_dedicated_cpu = 1;
/*
* We come in with interrupts disabled, and need_resched()
-@@ -432,6 +447,8 @@
+@@ -432,6 +447,8 @@ static void pseries_dedicated_idle_sleep
out:
HMT_medium();
get_lppaca()->donate_dedicated_cpu = 0;
get_lppaca()->idle = 0;
}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/xics.c powerpc.git/arch/powerpc/platforms/pseries/xics.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/pseries/xics.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/pseries/xics.c 2008-04-19 16:40:52.000000000 +0200
-@@ -516,6 +516,8 @@
+--- a/arch/powerpc/platforms/pseries/xics.c
++++ b/arch/powerpc/platforms/pseries/xics.c
+@@ -516,6 +516,8 @@ static struct irq_chip xics_pic_lpar = {
.set_affinity = xics_set_affinity
};
static int xics_host_match(struct irq_host *h, struct device_node *node)
{
-@@ -526,23 +528,13 @@
+@@ -526,23 +528,13 @@ static int xics_host_match(struct irq_ho
return !of_device_is_compatible(node, "chrp,iic");
}
return 0;
}
-@@ -561,27 +553,20 @@
+@@ -561,27 +553,20 @@ static int xics_host_xlate(struct irq_ho
return 0;
}
XICS_IRQ_SPURIOUS);
BUG_ON(xics_host == NULL);
irq_set_default_host(xics_host);
-@@ -655,52 +640,6 @@
+@@ -655,52 +640,6 @@ static void __init xics_init_one_node(st
}
}
void __init xics_init_IRQ(void)
{
struct device_node *np;
-@@ -733,8 +672,6 @@
+@@ -733,8 +672,6 @@ void __init xics_init_IRQ(void)
xics_setup_cpu();
ppc64_boot_msg(0x21, "XICS Done");
}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/xics.h powerpc.git/arch/powerpc/platforms/pseries/xics.h
---- linux-2.6.25-rc9/arch/powerpc/platforms/pseries/xics.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/pseries/xics.h 2008-04-19 16:40:52.000000000 +0200
-@@ -28,7 +28,4 @@
+--- a/arch/powerpc/platforms/pseries/xics.h
++++ b/arch/powerpc/platforms/pseries/xics.h
+@@ -28,7 +28,4 @@ struct xics_ipi_struct {
extern struct xics_ipi_struct xics_ipi_message[NR_CPUS] __cacheline_aligned;
-extern void pseries_8259_cascade(unsigned int irq, struct irq_desc *desc);
-
#endif /* _POWERPC_KERNEL_XICS_H */
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/Makefile powerpc.git/arch/powerpc/sysdev/Makefile
---- linux-2.6.25-rc9/arch/powerpc/sysdev/Makefile 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/Makefile 2008-04-19 16:40:52.000000000 +0200
-@@ -12,6 +12,7 @@
+--- a/arch/powerpc/sysdev/Makefile
++++ b/arch/powerpc/sysdev/Makefile
+@@ -12,6 +12,7 @@ obj-$(CONFIG_U3_DART) += dart_iommu.o
obj-$(CONFIG_MMIO_NVRAM) += mmio_nvram.o
obj-$(CONFIG_FSL_SOC) += fsl_soc.o
obj-$(CONFIG_FSL_PCI) += fsl_pci.o
obj-$(CONFIG_RAPIDIO) += fsl_rio.o
obj-$(CONFIG_TSI108_BRIDGE) += tsi108_pci.o tsi108_dev.o
obj-$(CONFIG_QUICC_ENGINE) += qe_lib/
-@@ -27,6 +28,7 @@
+@@ -27,6 +28,7 @@ obj-$(CONFIG_PPC_INDIRECT_PCI) += indire
obj-$(CONFIG_PPC_I8259) += i8259.o
obj-$(CONFIG_IPIC) += ipic.o
obj-$(CONFIG_4xx) += uic.o
obj-$(CONFIG_XILINX_VIRTEX) += xilinx_intc.o
obj-$(CONFIG_OF_RTC) += of_rtc.o
ifeq ($(CONFIG_PCI),y)
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/cpm1.c powerpc.git/arch/powerpc/sysdev/cpm1.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/cpm1.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/cpm1.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/sysdev/cpm1.c
++++ b/arch/powerpc/sysdev/cpm1.c
@@ -44,9 +44,6 @@
#define CPM_MAP_SIZE (0x4000)
cpm8xx_t __iomem *cpmp; /* Pointer to comm processor space */
immap_t __iomem *mpc8xx_immr;
static cpic8xx_t __iomem *cpic_reg;
-@@ -229,12 +226,7 @@
+@@ -229,12 +226,7 @@ void __init cpm_reset(void)
out_be32(&siu_conf->sc_sdcr, 1);
immr_unmap(siu_conf);
}
static DEFINE_SPINLOCK(cmd_lock);
-@@ -257,7 +249,7 @@
+@@ -257,7 +249,7 @@ int cpm_command(u32 command, u8 opcode)
if ((in_be16(&cpmp->cp_cpcr) & CPM_CR_FLG) == 0)
goto out;
ret = -EIO;
out:
spin_unlock_irqrestore(&cmd_lock, flags);
-@@ -293,110 +285,6 @@
+@@ -293,110 +285,6 @@ cpm_setbrg(uint brg, uint rate)
CPM_BRG_EN | CPM_BRG_DIV16);
}
struct cpm_ioport16 {
__be16 dir, par, odr_sor, dat, intr;
__be16 res[3];
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/cpm2.c powerpc.git/arch/powerpc/sysdev/cpm2.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/cpm2.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/cpm2.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/sysdev/cpm2.c
++++ b/arch/powerpc/sysdev/cpm2.c
@@ -46,10 +46,6 @@
#include <sysdev/fsl_soc.h>
cpm_cpm2_t __iomem *cpmp; /* Pointer to comm processor space */
/* We allocate this here because it is used almost exclusively for
-@@ -71,15 +67,17 @@
+@@ -71,15 +67,17 @@ void __init cpm2_reset(void)
/* Reclaim the DP memory for our use.
*/
}
static DEFINE_SPINLOCK(cmd_lock);
-@@ -99,7 +97,7 @@
+@@ -99,7 +97,7 @@ int cpm_command(u32 command, u8 opcode)
if ((in_be32(&cpmp->cp_cpcr) & CPM_CR_FLG) == 0)
goto out;
ret = -EIO;
out:
spin_unlock_irqrestore(&cmd_lock, flags);
-@@ -347,95 +345,6 @@
+@@ -347,95 +345,6 @@ int cpm2_smc_clk_setup(enum cpm_clk_targ
return ret;
}
struct cpm2_ioports {
u32 dir, par, sor, odr, dat;
u32 res[3];
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/cpm_common.c powerpc.git/arch/powerpc/sysdev/cpm_common.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/cpm_common.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/cpm_common.c 2008-04-19 16:40:52.000000000 +0200
-@@ -58,7 +58,6 @@
+--- a/arch/powerpc/sysdev/cpm_common.c
++++ b/arch/powerpc/sysdev/cpm_common.c
+@@ -58,7 +58,6 @@ void __init udbg_init_cpm(void)
}
#endif
static spinlock_t cpm_muram_lock;
static rh_block_t cpm_boot_muram_rh_block[16];
static rh_info_t cpm_muram_info;
-@@ -199,5 +198,3 @@
+@@ -199,5 +198,3 @@ dma_addr_t cpm_muram_dma(void __iomem *a
return muram_pbase + ((u8 __iomem *)addr - muram_vbase);
}
EXPORT_SYMBOL(cpm_muram_dma);
-
-#endif /* CONFIG_PPC_CPM_NEW_BINDING */
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/dart_iommu.c powerpc.git/arch/powerpc/sysdev/dart_iommu.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/dart_iommu.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/dart_iommu.c 2008-03-17 14:03:32.000000000 +0100
+--- a/arch/powerpc/sysdev/dart_iommu.c
++++ b/arch/powerpc/sysdev/dart_iommu.c
@@ -37,6 +37,7 @@
#include <linux/dma-mapping.h>
#include <linux/vmalloc.h>
#include <asm/ppc-pci.h>
#include "dart.h"
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/fsl_lbc.c powerpc.git/arch/powerpc/sysdev/fsl_lbc.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/fsl_lbc.c 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/fsl_lbc.c 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/sysdev/fsl_lbc.c
@@ -0,0 +1,129 @@
+/*
+ * Freescale LBC and UPM routines.
+ return 0;
+}
+EXPORT_SYMBOL(fsl_upm_find);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/fsl_soc.c powerpc.git/arch/powerpc/sysdev/fsl_soc.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/fsl_soc.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/fsl_soc.c 2008-04-19 16:40:52.000000000 +0200
-@@ -75,6 +75,33 @@
+--- a/arch/powerpc/sysdev/fsl_soc.c
++++ b/arch/powerpc/sysdev/fsl_soc.c
+@@ -75,6 +75,33 @@ phys_addr_t get_immrbase(void)
EXPORT_SYMBOL(get_immrbase);
#if defined(CONFIG_CPM2) || defined(CONFIG_QUICC_ENGINE) || defined(CONFIG_8xx)
static u32 brgfreq = -1;
-@@ -516,9 +543,9 @@
+@@ -516,9 +543,9 @@ arch_initcall(fsl_i2c_of_init);
static int __init mpc83xx_wdt_init(void)
{
struct resource r;
int ret;
np = of_find_compatible_node(NULL, "watchdog", "mpc83xx_wdt");
-@@ -528,19 +555,6 @@
+@@ -528,19 +555,6 @@ static int __init mpc83xx_wdt_init(void)
goto nodev;
}
memset(&r, 0, sizeof(r));
ret = of_address_to_resource(np, 0, &r);
-@@ -553,20 +567,16 @@
+@@ -553,20 +567,16 @@ static int __init mpc83xx_wdt_init(void)
goto err;
}
of_node_put(np);
nodev:
return ret;
-@@ -735,547 +745,6 @@
+@@ -735,547 +745,6 @@ err:
arch_initcall(fsl_usb_of_init);
static int __init of_fsl_spi_probe(char *type, char *compatible, u32 sysclk,
struct spi_board_info *board_infos,
unsigned int num_board_infos,
-@@ -1371,25 +840,9 @@
+@@ -1371,25 +840,9 @@ int __init fsl_spi_init(struct spi_board
sysclk = get_brgfreq();
#endif
if (sysclk == -1) {
}
ret = of_fsl_spi_probe(NULL, "fsl,spi", sysclk, board_infos,
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/fsl_soc.h powerpc.git/arch/powerpc/sysdev/fsl_soc.h
---- linux-2.6.25-rc9/arch/powerpc/sysdev/fsl_soc.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/fsl_soc.h 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/sysdev/fsl_soc.h
++++ b/arch/powerpc/sysdev/fsl_soc.h
@@ -7,6 +7,7 @@
extern phys_addr_t get_immrbase(void);
extern u32 get_brgfreq(void);
struct spi_board_info;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mpic.c powerpc.git/arch/powerpc/sysdev/mpic.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/mpic.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/mpic.c 2008-04-19 16:40:52.000000000 +0200
-@@ -175,13 +175,16 @@
+--- a/arch/powerpc/sysdev/mpic.c
++++ b/arch/powerpc/sysdev/mpic.c
+@@ -175,13 +175,16 @@ static inline void _mpic_write(enum mpic
switch(type) {
#ifdef CONFIG_PPC_DCR
case mpic_access_dcr:
}
}
-@@ -1000,7 +1003,7 @@
+@@ -1000,7 +1003,7 @@ struct mpic * __init mpic_alloc(struct d
const char *name)
{
struct mpic *mpic;
const char *vers;
int i;
int intvec_top;
-@@ -1064,7 +1067,8 @@
+@@ -1064,7 +1067,8 @@ struct mpic * __init mpic_alloc(struct d
/* Look for protected sources */
if (node) {
const u32 *psrc =
of_get_property(node, "protected-sources", &psize);
if (psrc) {
-@@ -1107,8 +1111,7 @@
+@@ -1107,8 +1111,7 @@ struct mpic * __init mpic_alloc(struct d
* in, try to obtain one
*/
if (paddr == 0 && !(mpic->flags & MPIC_USES_DCR)) {
BUG_ON(reg == NULL);
paddr = of_translate_address(node, reg);
BUG_ON(paddr == OF_BAD_ADDR);
-@@ -1137,12 +1140,13 @@
+@@ -1137,12 +1140,13 @@ struct mpic * __init mpic_alloc(struct d
* MPICs, num sources as well. On ISU MPICs, sources are counted
* as ISUs are added
*/
/* Map the per-CPU registers */
for (i = 0; i < mpic->num_cpus; i++) {
-@@ -1161,7 +1165,7 @@
+@@ -1161,7 +1165,7 @@ struct mpic * __init mpic_alloc(struct d
mpic->isu_mask = (1 << mpic->isu_shift) - 1;
/* Display version */
case 1:
vers = "1.0";
break;
-@@ -1321,7 +1325,7 @@
+@@ -1321,7 +1325,7 @@ void __init mpic_set_serial_int(struct m
void mpic_irq_set_priority(unsigned int irq, unsigned int pri)
{
struct mpic *mpic = mpic_find(irq, &is_ipi);
unsigned int src = mpic_irq_to_hw(irq);
unsigned long flags;
-@@ -1344,7 +1348,7 @@
+@@ -1344,7 +1348,7 @@ void mpic_irq_set_priority(unsigned int
unsigned int mpic_irq_get_priority(unsigned int irq)
{
struct mpic *mpic = mpic_find(irq, &is_ipi);
unsigned int src = mpic_irq_to_hw(irq);
unsigned long flags;
-@@ -1406,11 +1410,6 @@
+@@ -1406,11 +1410,6 @@ void mpic_cpu_set_priority(int prio)
mpic_cpu_write(MPIC_INFO(CPU_CURRENT_TASK_PRI), prio);
}
void mpic_teardown_this_cpu(int secondary)
{
struct mpic *mpic = mpic_primary;
-@@ -1430,6 +1429,10 @@
+@@ -1430,6 +1429,10 @@ void mpic_teardown_this_cpu(int secondar
/* Set current processor priority to max */
mpic_cpu_write(MPIC_INFO(CPU_CURRENT_TASK_PRI), 0xf);
spin_unlock_irqrestore(&mpic_lock, flags);
}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mv64x60_dev.c powerpc.git/arch/powerpc/sysdev/mv64x60_dev.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/mv64x60_dev.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/mv64x60_dev.c 2008-04-19 16:40:52.000000000 +0200
-@@ -127,7 +127,7 @@
+--- a/arch/powerpc/sysdev/mv64x60_dev.c
++++ b/arch/powerpc/sysdev/mv64x60_dev.c
+@@ -127,7 +127,7 @@ static int __init mv64x60_mpsc_device_se
if (err)
return err;
if (!prop)
return -ENODEV;
port_number = *(int *)prop;
-@@ -136,6 +136,7 @@
+@@ -136,6 +136,7 @@ static int __init mv64x60_mpsc_device_se
pdata.cache_mgmt = 1; /* All current revs need this set */
prop = of_get_property(np, "max_idle", NULL);
if (prop)
pdata.max_idle = *prop;
-@@ -205,30 +206,24 @@
+@@ -205,30 +206,24 @@ error:
/*
* Create mv64x60_eth platform devices
*/
{
struct resource r[1];
struct mv643xx_eth_platform_data pdata;
-@@ -239,16 +234,12 @@
+@@ -239,16 +234,12 @@ static int __init mv64x60_eth_device_set
const phandle *ph;
int err;
if (!prop)
return -ENODEV;
pdata.port_number = *prop;
-@@ -301,7 +292,7 @@
+@@ -301,7 +292,7 @@ static int __init mv64x60_eth_device_set
of_node_put(phy);
if (!pdev)
return -ENOMEM;
-@@ -345,21 +336,19 @@
+@@ -345,21 +336,19 @@ static int __init mv64x60_i2c_device_set
memset(&pdata, 0, sizeof(pdata));
pdev = platform_device_alloc(MV64XXX_I2C_CTLR_NAME, id);
if (!pdev)
-@@ -401,10 +390,7 @@
+@@ -401,10 +390,7 @@ static int __init mv64x60_wdt_device_set
memset(&pdata, 0, sizeof(pdata));
np = of_get_parent(np);
if (!np)
-@@ -441,27 +427,43 @@
+@@ -441,27 +427,43 @@ error:
static int __init mv64x60_device_setup(void)
{
if (np) {
if ((err = mv64x60_wdt_device_setup(np, id)))
goto error;
-@@ -489,10 +491,10 @@
+@@ -489,10 +491,10 @@ static int __init mv64x60_add_mpsc_conso
if (!np)
goto not_mpsc;
if (!prop)
goto not_mpsc;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mv64x60_pci.c powerpc.git/arch/powerpc/sysdev/mv64x60_pci.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/mv64x60_pci.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/mv64x60_pci.c 2008-04-19 16:40:52.000000000 +0200
-@@ -86,14 +86,14 @@
+--- a/arch/powerpc/sysdev/mv64x60_pci.c
++++ b/arch/powerpc/sysdev/mv64x60_pci.c
+@@ -86,14 +86,14 @@ static int __init mv64x60_sysfs_init(voi
struct platform_device *pdev;
const unsigned int *prop;
if (IS_ERR(pdev))
return PTR_ERR(pdev);
-@@ -166,6 +166,6 @@
+@@ -166,6 +166,6 @@ void __init mv64x60_pci_init(void)
{
struct device_node *np;
+ for_each_compatible_node(np, "pci", "marvell,mv64360-pci")
mv64x60_add_bridge(np);
}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mv64x60_pic.c powerpc.git/arch/powerpc/sysdev/mv64x60_pic.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/mv64x60_pic.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/mv64x60_pic.c 2008-04-19 16:40:52.000000000 +0200
-@@ -238,13 +238,13 @@
+--- a/arch/powerpc/sysdev/mv64x60_pic.c
++++ b/arch/powerpc/sysdev/mv64x60_pic.c
+@@ -238,13 +238,13 @@ void __init mv64x60_init_irq(void)
const unsigned int *reg;
unsigned long flags;
reg = of_get_property(np, "reg", &size);
paddr = of_translate_address(np, reg);
mv64x60_irq_reg_base = ioremap(paddr, reg[1]);
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/mv64x60_udbg.c powerpc.git/arch/powerpc/sysdev/mv64x60_udbg.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/mv64x60_udbg.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/mv64x60_udbg.c 2008-04-19 16:40:52.000000000 +0200
-@@ -85,7 +85,7 @@
+--- a/arch/powerpc/sysdev/mv64x60_udbg.c
++++ b/arch/powerpc/sysdev/mv64x60_udbg.c
+@@ -85,7 +85,7 @@ static void mv64x60_udbg_init(void)
if (!stdout)
return;
if (np == stdout)
break;
}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/ppc4xx_pci.c powerpc.git/arch/powerpc/sysdev/ppc4xx_pci.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/ppc4xx_pci.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/ppc4xx_pci.c 2008-04-19 16:40:52.000000000 +0200
-@@ -527,6 +527,7 @@
+--- a/arch/powerpc/sysdev/ppc4xx_pci.c
++++ b/arch/powerpc/sysdev/ppc4xx_pci.c
+@@ -527,6 +527,7 @@ static void __init ppc4xx_probe_pcix_bri
*
* ibm,plb-pciex-440spe
* ibm,plb-pciex-405ex
*
* Anything else will be rejected for now as they are all subtly
* different unfortunately.
-@@ -645,7 +646,7 @@
+@@ -645,7 +646,7 @@ static int __init ppc440spe_pciex_core_i
int time_out = 20;
/* Set PLL clock receiver to LVPECL */
/* Shouldn't we do all the calibration stuff etc... here ? */
if (ppc440spe_pciex_check_reset(np))
-@@ -659,8 +660,7 @@
+@@ -659,8 +660,7 @@ static int __init ppc440spe_pciex_core_i
}
/* De-assert reset of PCIe PLL, wait for lock */
udelay(3);
while (time_out) {
-@@ -712,9 +712,8 @@
+@@ -712,9 +712,8 @@ static int ppc440spe_pciex_init_port_hw(
mtdcri(SDR0, port->sdr_base + PESDRn_440SPE_HSSL7SET1,
0x35000000);
}
return 0;
}
-@@ -775,6 +774,115 @@
+@@ -775,6 +774,115 @@ static struct ppc4xx_pciex_hwops ppc440s
.setup_utl = ppc440speB_pciex_init_utl,
};
#endif /* CONFIG_44x */
#ifdef CONFIG_40x
-@@ -830,17 +938,9 @@
+@@ -830,17 +938,9 @@ static int ppc405ex_pciex_init_port_hw(s
* PCIe boards don't show this problem.
* This has to be re-tested and fixed in a later release!
*/
dcr_write(port->dcrs, DCRO_PEGPL_CFG, 0x10000000); /* guarded on */
-@@ -896,6 +996,8 @@
+@@ -896,6 +996,8 @@ static int __init ppc4xx_pciex_check_cor
else
ppc4xx_pciex_hwops = &ppc440speB_pcie_hwops;
}
#endif /* CONFIG_44x */
#ifdef CONFIG_40x
if (of_device_is_compatible(np, "ibm,plb-pciex-405ex"))
-@@ -1042,8 +1144,7 @@
+@@ -1042,8 +1144,7 @@ static int __init ppc4xx_pciex_port_init
port->link = 0;
}
msleep(100);
return 0;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/ppc4xx_pci.h powerpc.git/arch/powerpc/sysdev/ppc4xx_pci.h
---- linux-2.6.25-rc9/arch/powerpc/sysdev/ppc4xx_pci.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/ppc4xx_pci.h 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/sysdev/ppc4xx_pci.h
++++ b/arch/powerpc/sysdev/ppc4xx_pci.h
@@ -271,6 +271,59 @@
#define PESDR1_405EX_PHYSTA 0x044C
enum
{
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/ppc4xx_soc.c powerpc.git/arch/powerpc/sysdev/ppc4xx_soc.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/ppc4xx_soc.c 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/ppc4xx_soc.c 2008-04-19 16:40:52.000000000 +0200
+--- /dev/null
++++ b/arch/powerpc/sysdev/ppc4xx_soc.c
@@ -0,0 +1,200 @@
+/*
+ * IBM/AMCC PPC4xx SoC setup code
+ while (1)
+ ; /* Just in case the reset doesn't work */
+}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/qe.c powerpc.git/arch/powerpc/sysdev/qe_lib/qe.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/qe.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/qe_lib/qe.c 2008-04-19 16:40:52.000000000 +0200
-@@ -55,7 +55,7 @@
+--- a/arch/powerpc/sysdev/qe_lib/qe.c
++++ b/arch/powerpc/sysdev/qe_lib/qe.c
+@@ -55,7 +55,7 @@ struct qe_snum {
/* We allocate this here because it is used almost exclusively for
* the communication processor devices.
*/
EXPORT_SYMBOL(qe_immr);
static struct qe_snum snums[QE_NUM_OF_SNUM]; /* Dynamically allocated SNUMs */
-@@ -156,7 +156,7 @@
+@@ -156,7 +156,7 @@ EXPORT_SYMBOL(qe_issue_cmd);
*/
static unsigned int brg_clk = 0;
{
struct device_node *qe;
unsigned int size;
-@@ -180,6 +180,7 @@
+@@ -180,6 +180,7 @@ unsigned int get_brg_clk(void)
return brg_clk;
}
/* Program the BRG to the given sampling rate and multiplier
*
-@@ -197,7 +198,7 @@
+@@ -197,7 +198,7 @@ int qe_setbrg(enum qe_clock brg, unsigne
if ((brg < QE_BRG1) || (brg > QE_BRG16))
return -EINVAL;
if (divisor > QE_BRGC_DIVISOR_MAX + 1) {
div16 = QE_BRGC_DIV16;
-@@ -415,12 +416,6 @@
+@@ -415,12 +416,6 @@ void qe_muram_dump(void)
}
EXPORT_SYMBOL(qe_muram_dump);
/* The maximum number of RISCs we support */
#define MAX_QE_RISC 2
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/qe_io.c powerpc.git/arch/powerpc/sysdev/qe_lib/qe_io.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/qe_io.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/qe_lib/qe_io.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/sysdev/qe_lib/qe_io.c
++++ b/arch/powerpc/sysdev/qe_lib/qe_io.c
@@ -22,6 +22,7 @@
#include <linux/ioport.h>
#include <asm/prom.h>
#include <sysdev/fsl_soc.h>
-@@ -41,7 +42,7 @@
+@@ -41,7 +42,7 @@ struct port_regs {
#endif
};
static int num_par_io_ports = 0;
int par_io_init(struct device_node *np)
-@@ -165,7 +166,7 @@
+@@ -165,7 +166,7 @@ int par_io_of_config(struct device_node
}
ph = of_get_property(np, "pio-handle", NULL);
printk(KERN_ERR "pio-handle not available \n");
return -1;
}
-@@ -200,7 +201,7 @@
+@@ -200,7 +201,7 @@ static void dump_par_io(void)
{
unsigned int i;
for (i = 0; i < num_par_io_ports; i++) {
printk(KERN_INFO " cpodr[%u]=%08x\n", i,
in_be32(&par_io[i].cpodr));
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/ucc_fast.c powerpc.git/arch/powerpc/sysdev/qe_lib/ucc_fast.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/ucc_fast.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/qe_lib/ucc_fast.c 2008-04-19 16:40:52.000000000 +0200
-@@ -148,57 +148,57 @@
+--- a/arch/powerpc/sysdev/qe_lib/ucc_fast.c
++++ b/arch/powerpc/sysdev/qe_lib/ucc_fast.c
+@@ -148,57 +148,57 @@ int ucc_fast_init(struct ucc_fast_info *
/* check if the UCC port number is in range. */
if ((uf_info->ucc_num < 0) || (uf_info->ucc_num > UCC_MAX_NUM - 1)) {
return -ENOMEM;
}
-@@ -207,7 +207,7 @@
+@@ -207,7 +207,7 @@ int ucc_fast_init(struct ucc_fast_info *
/* Set the PHY base address */
uccf->uf_regs = ioremap(uf_info->regs, sizeof(struct ucc_fast));
if (uccf->uf_regs == NULL) {
return -ENOMEM;
}
-@@ -230,7 +230,7 @@
+@@ -230,7 +230,7 @@ int ucc_fast_init(struct ucc_fast_info *
/* Set UCC to fast type */
ret = ucc_set_type(uf_info->ucc_num, UCC_SPEED_TYPE_FAST);
if (ret) {
ucc_fast_free(uccf);
return ret;
}
-@@ -270,7 +270,7 @@
+@@ -270,7 +270,7 @@ int ucc_fast_init(struct ucc_fast_info *
qe_muram_alloc(uf_info->utfs, UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT);
if (IS_ERR_VALUE(uccf->ucc_fast_tx_virtual_fifo_base_offset)) {
printk(KERN_ERR "%s: cannot allocate MURAM for TX FIFO\n",
uccf->ucc_fast_tx_virtual_fifo_base_offset = 0;
ucc_fast_free(uccf);
return -ENOMEM;
-@@ -283,7 +283,7 @@
+@@ -283,7 +283,7 @@ int ucc_fast_init(struct ucc_fast_info *
UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT);
if (IS_ERR_VALUE(uccf->ucc_fast_rx_virtual_fifo_base_offset)) {
printk(KERN_ERR "%s: cannot allocate MURAM for RX FIFO\n",
uccf->ucc_fast_rx_virtual_fifo_base_offset = 0;
ucc_fast_free(uccf);
return -ENOMEM;
-@@ -314,7 +314,7 @@
+@@ -314,7 +314,7 @@ int ucc_fast_init(struct ucc_fast_info *
ucc_set_qe_mux_rxtx(uf_info->ucc_num, uf_info->rx_clock,
COMM_DIR_RX)) {
printk(KERN_ERR "%s: illegal value for RX clock\n",
ucc_fast_free(uccf);
return -EINVAL;
}
-@@ -323,7 +323,7 @@
+@@ -323,7 +323,7 @@ int ucc_fast_init(struct ucc_fast_info *
ucc_set_qe_mux_rxtx(uf_info->ucc_num, uf_info->tx_clock,
COMM_DIR_TX)) {
printk(KERN_ERR "%s: illegal value for TX clock\n",
ucc_fast_free(uccf);
return -EINVAL;
}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/ucc_slow.c powerpc.git/arch/powerpc/sysdev/qe_lib/ucc_slow.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/qe_lib/ucc_slow.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/qe_lib/ucc_slow.c 2008-04-19 16:40:52.000000000 +0200
-@@ -142,7 +142,7 @@
+--- a/arch/powerpc/sysdev/qe_lib/ucc_slow.c
++++ b/arch/powerpc/sysdev/qe_lib/ucc_slow.c
+@@ -142,7 +142,7 @@ int ucc_slow_init(struct ucc_slow_info *
/* check if the UCC port number is in range. */
if ((us_info->ucc_num < 0) || (us_info->ucc_num > UCC_MAX_NUM - 1)) {
return -EINVAL;
}
-@@ -161,7 +161,7 @@
+@@ -161,7 +161,7 @@ int ucc_slow_init(struct ucc_slow_info *
uccs = kzalloc(sizeof(struct ucc_slow_private), GFP_KERNEL);
if (!uccs) {
printk(KERN_ERR "%s: Cannot allocate private data\n",
return -ENOMEM;
}
-@@ -170,7 +170,7 @@
+@@ -170,7 +170,7 @@ int ucc_slow_init(struct ucc_slow_info *
/* Set the PHY base address */
uccs->us_regs = ioremap(us_info->regs, sizeof(struct ucc_slow));
if (uccs->us_regs == NULL) {
return -ENOMEM;
}
-@@ -189,7 +189,7 @@
+@@ -189,7 +189,7 @@ int ucc_slow_init(struct ucc_slow_info *
uccs->us_pram_offset =
qe_muram_alloc(UCC_SLOW_PRAM_SIZE, ALIGNMENT_OF_UCC_SLOW_PRAM);
if (IS_ERR_VALUE(uccs->us_pram_offset)) {
ucc_slow_free(uccs);
return -ENOMEM;
}
-@@ -202,7 +202,7 @@
+@@ -202,7 +202,7 @@ int ucc_slow_init(struct ucc_slow_info *
/* Set UCC to slow type */
ret = ucc_set_type(us_info->ucc_num, UCC_SPEED_TYPE_SLOW);
if (ret) {
ucc_slow_free(uccs);
return ret;
}
-@@ -216,7 +216,7 @@
+@@ -216,7 +216,7 @@ int ucc_slow_init(struct ucc_slow_info *
qe_muram_alloc(us_info->rx_bd_ring_len * sizeof(struct qe_bd),
QE_ALIGNMENT_OF_BD);
if (IS_ERR_VALUE(uccs->rx_base_offset)) {
us_info->rx_bd_ring_len);
uccs->rx_base_offset = 0;
ucc_slow_free(uccs);
-@@ -227,7 +227,7 @@
+@@ -227,7 +227,7 @@ int ucc_slow_init(struct ucc_slow_info *
qe_muram_alloc(us_info->tx_bd_ring_len * sizeof(struct qe_bd),
QE_ALIGNMENT_OF_BD);
if (IS_ERR_VALUE(uccs->tx_base_offset)) {
uccs->tx_base_offset = 0;
ucc_slow_free(uccs);
return -ENOMEM;
-@@ -317,7 +317,7 @@
+@@ -317,7 +317,7 @@ int ucc_slow_init(struct ucc_slow_info *
if (ucc_set_qe_mux_rxtx(us_info->ucc_num, us_info->rx_clock,
COMM_DIR_RX)) {
printk(KERN_ERR "%s: illegal value for RX clock\n",
ucc_slow_free(uccs);
return -EINVAL;
}
-@@ -325,7 +325,7 @@
+@@ -325,7 +325,7 @@ int ucc_slow_init(struct ucc_slow_info *
if (ucc_set_qe_mux_rxtx(us_info->ucc_num, us_info->tx_clock,
COMM_DIR_TX)) {
printk(KERN_ERR "%s: illegal value for TX clock\n",
ucc_slow_free(uccs);
return -EINVAL;
}
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/rtc_cmos_setup.c powerpc.git/arch/powerpc/sysdev/rtc_cmos_setup.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/rtc_cmos_setup.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/rtc_cmos_setup.c 2008-04-19 16:40:52.000000000 +0200
-@@ -56,3 +56,5 @@
+--- a/arch/powerpc/sysdev/rtc_cmos_setup.c
++++ b/arch/powerpc/sysdev/rtc_cmos_setup.c
+@@ -56,3 +56,5 @@ static int __init add_rtc(void)
return 0;
}
fs_initcall(add_rtc);
+
+MODULE_LICENSE("GPL");
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/tsi108_dev.c powerpc.git/arch/powerpc/sysdev/tsi108_dev.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/tsi108_dev.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/tsi108_dev.c 2008-04-19 16:40:52.000000000 +0200
-@@ -84,7 +84,7 @@
+--- a/arch/powerpc/sysdev/tsi108_dev.c
++++ b/arch/powerpc/sysdev/tsi108_dev.c
+@@ -84,7 +84,7 @@ static int __init tsi108_eth_of_init(voi
ret = of_address_to_resource(np, 0, &r[0]);
DBG("%s: name:start->end = %s:0x%lx-> 0x%lx\n",
if (ret)
goto err;
-@@ -93,7 +93,7 @@
+@@ -93,7 +93,7 @@ static int __init tsi108_eth_of_init(voi
r[1].end = irq_of_parse_and_map(np, 0);
r[1].flags = IORESOURCE_IRQ;
DBG("%s: name:start->end = %s:0x%lx-> 0x%lx\n",
tsi_eth_dev =
platform_device_register_simple("tsi-ethernet", i++, &r[0],
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/sysdev/tsi108_pci.c powerpc.git/arch/powerpc/sysdev/tsi108_pci.c
---- linux-2.6.25-rc9/arch/powerpc/sysdev/tsi108_pci.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/sysdev/tsi108_pci.c 2008-04-19 16:40:52.000000000 +0200
-@@ -207,7 +207,7 @@
+--- a/arch/powerpc/sysdev/tsi108_pci.c
++++ b/arch/powerpc/sysdev/tsi108_pci.c
+@@ -207,7 +207,7 @@ int __init tsi108_setup_pci(struct devic
/* PCI Config mapping */
tsi108_pci_cfg_base = (u32)ioremap(cfg_phys, TSI108_PCI_CFG_SIZE);
tsi108_pci_cfg_phys = cfg_phys;
tsi108_pci_cfg_base);
/* Fetch host bridge registers address */
-@@ -395,7 +395,7 @@
+@@ -395,7 +395,7 @@ static int pci_irq_host_xlate(struct irq
static int pci_irq_host_map(struct irq_host *h, unsigned int virq,
irq_hw_number_t hw)
{ unsigned int irq;
if ((virq >= 1) && (virq <= 4)){
irq = virq + IRQ_PCI_INTAD_BASE - 1;
get_irq_desc(irq)->status |= IRQ_LEVEL;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/xmon/xmon.c powerpc.git/arch/powerpc/xmon/xmon.c
---- linux-2.6.25-rc9/arch/powerpc/xmon/xmon.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/xmon/xmon.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/xmon/xmon.c
++++ b/arch/powerpc/xmon/xmon.c
@@ -45,7 +45,6 @@
#ifdef CONFIG_PPC64
#include <asm/hvcall.h>
#endif
#include "nonstdio.h"
-@@ -1244,15 +1243,12 @@
+@@ -1244,15 +1243,12 @@ static void get_function_bounds(unsigned
static int xmon_depth_to_print = 64;
#define REGS_OFFSET 16
#endif
-@@ -1318,7 +1314,7 @@
+@@ -1318,7 +1314,7 @@ static void xmon_show_stack(unsigned lon
/* Look for "regshere" marker to see if this is
an exception frame. */
if (mread(sp + MARKER_OFFSET, &marker, sizeof(unsigned long))
if (mread(sp + REGS_OFFSET, ®s, sizeof(regs))
!= sizeof(regs)) {
printf("Couldn't read registers at %lx\n",
-@@ -1598,7 +1594,6 @@
+@@ -1598,7 +1594,6 @@ void super_regs(void)
if (firmware_has_feature(FW_FEATURE_ISERIES)) {
struct paca_struct *ptrPaca;
struct lppaca *ptrLpPaca;
/* Dump out relevant Paca data areas. */
printf("Paca: \n");
-@@ -1611,15 +1606,6 @@
+@@ -1611,15 +1606,6 @@ void super_regs(void)
printf(" Saved Gpr3=%.16lx Saved Gpr4=%.16lx \n",
ptrLpPaca->saved_gpr3, ptrLpPaca->saved_gpr4);
printf(" Saved Gpr5=%.16lx \n", ptrLpPaca->saved_gpr5);
}
#endif
-diff -x .git -Nur linux-2.6.25-rc9/arch/ppc/8xx_io/commproc.c powerpc.git/arch/ppc/8xx_io/commproc.c
---- linux-2.6.25-rc9/arch/ppc/8xx_io/commproc.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/ppc/8xx_io/commproc.c 2008-03-17 14:03:32.000000000 +0100
+--- a/arch/ppc/8xx_io/commproc.c
++++ b/arch/ppc/8xx_io/commproc.c
@@ -43,7 +43,7 @@
({ \
u32 offset = offsetof(immap_t, member); \
addr; \
})
-diff -x .git -Nur linux-2.6.25-rc9/arch/ppc/8xx_io/fec.c powerpc.git/arch/ppc/8xx_io/fec.c
---- linux-2.6.25-rc9/arch/ppc/8xx_io/fec.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/ppc/8xx_io/fec.c 2008-04-19 16:40:52.000000000 +0200
-@@ -520,7 +520,7 @@
+--- a/arch/ppc/8xx_io/fec.c
++++ b/arch/ppc/8xx_io/fec.c
+@@ -520,7 +520,7 @@ fec_enet_interrupt(int irq, void * dev_i
#ifdef CONFIG_USE_MDIO
fec_enet_mii(dev);
#else
#endif /* CONFIG_USE_MDIO */
}
-@@ -1441,7 +1441,7 @@
+@@ -1441,7 +1441,7 @@ irqreturn_t mii_link_interrupt(int irq,
fecp->fec_ecntrl = ecntrl; /* restore old settings */
}
#else
#endif /* CONFIG_USE_MDIO */
#ifndef CONFIG_RPXCLASSIC
-diff -x .git -Nur linux-2.6.25-rc9/arch/ppc/kernel/head.S powerpc.git/arch/ppc/kernel/head.S
---- linux-2.6.25-rc9/arch/ppc/kernel/head.S 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/ppc/kernel/head.S 2008-03-17 14:03:32.000000000 +0100
-@@ -701,23 +701,6 @@
+--- a/arch/ppc/kernel/head.S
++++ b/arch/ppc/kernel/head.S
+@@ -701,23 +701,6 @@ load_up_altivec:
b fast_exception_return
/*
* giveup_altivec(tsk)
* Disable AltiVec for the task given as the argument,
* and save the AltiVec registers in its thread_struct.
-diff -x .git -Nur linux-2.6.25-rc9/arch/ppc/mm/init.c powerpc.git/arch/ppc/mm/init.c
---- linux-2.6.25-rc9/arch/ppc/mm/init.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/ppc/mm/init.c 2008-04-19 16:40:52.000000000 +0200
-@@ -109,7 +109,6 @@
+--- a/arch/ppc/mm/init.c
++++ b/arch/ppc/mm/init.c
+@@ -109,7 +109,6 @@ void show_mem(void)
printk("Mem-info:\n");
show_free_areas();
i = max_mapnr;
while (i-- > 0) {
total++;
-diff -x .git -Nur linux-2.6.25-rc9/arch/ppc/platforms/radstone_ppc7d.c powerpc.git/arch/ppc/platforms/radstone_ppc7d.c
---- linux-2.6.25-rc9/arch/ppc/platforms/radstone_ppc7d.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/ppc/platforms/radstone_ppc7d.c 2008-04-19 16:40:52.000000000 +0200
-@@ -512,7 +512,7 @@
+--- a/arch/ppc/platforms/radstone_ppc7d.c
++++ b/arch/ppc/platforms/radstone_ppc7d.c
+@@ -512,7 +512,7 @@ static void __init ppc7d_init_irq(void)
{
int irq;
i8259_init(0, 0);
mv64360_init_irq();
-@@ -569,7 +569,7 @@
+@@ -569,7 +569,7 @@ static int __init ppc7d_map_irq(struct p
};
const long min_idsel = 10, max_idsel = 14, irqs_per_slot = 4;
dev->vendor, dev->device, PCI_FUNC(dev->devfn), idsel, pin);
return PCI_IRQ_TABLE_LOOKUP;
-@@ -1300,7 +1300,7 @@
+@@ -1300,7 +1300,7 @@ static void ppc7d_init2(void)
u32 data;
u8 data8;
/* Wait for debugger? */
if (ppc7d_wait_debugger) {
-@@ -1333,7 +1333,7 @@
+@@ -1333,7 +1333,7 @@ static void ppc7d_init2(void)
ppc_md.set_rtc_time = ppc7d_set_rtc_time;
ppc_md.get_rtc_time = ppc7d_get_rtc_time;
}
/* Called from machine_init(), early, before any of the __init functions
-diff -x .git -Nur linux-2.6.25-rc9/arch/ppc/syslib/mpc52xx_setup.c powerpc.git/arch/ppc/syslib/mpc52xx_setup.c
---- linux-2.6.25-rc9/arch/ppc/syslib/mpc52xx_setup.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/ppc/syslib/mpc52xx_setup.c 2008-04-19 16:40:52.000000000 +0200
-@@ -279,7 +279,7 @@
+--- a/arch/ppc/syslib/mpc52xx_setup.c
++++ b/arch/ppc/syslib/mpc52xx_setup.c
+@@ -279,7 +279,7 @@ int mpc52xx_match_psc_function(int psc_i
int mpc52xx_set_psc_clkdiv(int psc_id, int clkdiv)
{
struct mpc52xx_cdm __iomem *cdm;
unsigned long flags;
u16 mclken_div;
-diff -x .git -Nur linux-2.6.25-rc9/arch/sparc64/Kconfig powerpc.git/arch/sparc64/Kconfig
---- linux-2.6.25-rc9/arch/sparc64/Kconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/sparc64/Kconfig 2008-03-17 14:03:36.000000000 +0100
-@@ -16,6 +16,7 @@
+--- a/arch/sparc64/Kconfig
++++ b/arch/sparc64/Kconfig
+@@ -16,6 +16,7 @@ config SPARC64
bool
default y
select HAVE_IDE
help
SPARC is a family of RISC microprocessors designed and marketed by
Sun Microsystems, incorporated. This port covers the newer 64-bit
-diff -x .git -Nur linux-2.6.25-rc9/drivers/block/viodasd.c powerpc.git/drivers/block/viodasd.c
---- linux-2.6.25-rc9/drivers/block/viodasd.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/block/viodasd.c 2008-04-19 16:40:53.000000000 +0200
-@@ -69,7 +69,7 @@
+--- a/drivers/block/viodasd.c
++++ b/drivers/block/viodasd.c
+@@ -69,7 +69,7 @@ MODULE_LICENSE("GPL");
enum {
PARTITION_SHIFT = 3,
MAX_DISKNO = HVMAXARCHITECTEDVIRTUALDISKS,
};
static DEFINE_SPINLOCK(viodasd_spinlock);
-diff -x .git -Nur linux-2.6.25-rc9/drivers/char/hvc_beat.c powerpc.git/drivers/char/hvc_beat.c
---- linux-2.6.25-rc9/drivers/char/hvc_beat.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/char/hvc_beat.c 2008-04-19 16:40:53.000000000 +0200
-@@ -78,8 +78,8 @@
+--- a/drivers/char/hvc_beat.c
++++ b/drivers/char/hvc_beat.c
+@@ -78,8 +78,8 @@ static int hvc_beat_put_chars(uint32_t v
for (rest = cnt; rest > 0; rest -= nlen) {
nlen = (rest > 16) ? 16 : rest;
memcpy(kb, buf, nlen);
}
return cnt;
}
-diff -x .git -Nur linux-2.6.25-rc9/drivers/char/xilinx_hwicap/buffer_icap.c powerpc.git/drivers/char/xilinx_hwicap/buffer_icap.c
---- linux-2.6.25-rc9/drivers/char/xilinx_hwicap/buffer_icap.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/char/xilinx_hwicap/buffer_icap.c 2008-04-19 16:40:53.000000000 +0200
+--- a/drivers/char/xilinx_hwicap/buffer_icap.c
++++ b/drivers/char/xilinx_hwicap/buffer_icap.c
@@ -74,7 +74,7 @@
/**
}
/**
-@@ -117,20 +117,8 @@
+@@ -117,20 +117,8 @@ static inline u32 buffer_icap_get_bram(v
**/
static inline bool buffer_icap_busy(void __iomem *base_address)
{
}
/**
-diff -x .git -Nur linux-2.6.25-rc9/drivers/char/xilinx_hwicap/buffer_icap.h powerpc.git/drivers/char/xilinx_hwicap/buffer_icap.h
---- linux-2.6.25-rc9/drivers/char/xilinx_hwicap/buffer_icap.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/char/xilinx_hwicap/buffer_icap.h 2008-04-19 16:40:53.000000000 +0200
+--- a/drivers/char/xilinx_hwicap/buffer_icap.h
++++ b/drivers/char/xilinx_hwicap/buffer_icap.h
@@ -44,8 +44,6 @@
#include <asm/io.h>
#include "xilinx_hwicap.h"
/* Loads a partial bitstream from system memory. */
int buffer_icap_set_configuration(struct hwicap_drvdata *drvdata, u32 *data,
u32 Size);
-@@ -54,4 +52,7 @@
+@@ -54,4 +52,7 @@ int buffer_icap_set_configuration(struct
int buffer_icap_get_configuration(struct hwicap_drvdata *drvdata, u32 *data,
u32 Size);
+void buffer_icap_reset(struct hwicap_drvdata *drvdata);
+
#endif
-diff -x .git -Nur linux-2.6.25-rc9/drivers/char/xilinx_hwicap/fifo_icap.c powerpc.git/drivers/char/xilinx_hwicap/fifo_icap.c
---- linux-2.6.25-rc9/drivers/char/xilinx_hwicap/fifo_icap.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/char/xilinx_hwicap/fifo_icap.c 2008-04-19 16:40:53.000000000 +0200
+--- a/drivers/char/xilinx_hwicap/fifo_icap.c
++++ b/drivers/char/xilinx_hwicap/fifo_icap.c
@@ -78,13 +78,6 @@
#define XHI_CR_READ_MASK 0x00000002 /* Read from ICAP to FIFO */
#define XHI_CR_WRITE_MASK 0x00000001 /* Write from FIFO to ICAP */
#define XHI_WFO_MAX_VACANCY 1024 /* Max Write FIFO Vacancy, in words */
#define XHI_RFO_MAX_OCCUPANCY 256 /* Max Read FIFO Occupancy, in words */
-@@ -152,13 +145,35 @@
+@@ -152,13 +145,35 @@ static inline void fifo_icap_start_readb
}
/**
return (status & XHI_SR_DONE_MASK) ? 0 : 1;
}
-diff -x .git -Nur linux-2.6.25-rc9/drivers/char/xilinx_hwicap/fifo_icap.h powerpc.git/drivers/char/xilinx_hwicap/fifo_icap.h
---- linux-2.6.25-rc9/drivers/char/xilinx_hwicap/fifo_icap.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/char/xilinx_hwicap/fifo_icap.h 2008-04-19 16:40:53.000000000 +0200
-@@ -56,6 +56,7 @@
+--- a/drivers/char/xilinx_hwicap/fifo_icap.h
++++ b/drivers/char/xilinx_hwicap/fifo_icap.h
+@@ -56,6 +56,7 @@ int fifo_icap_set_configuration(
u32 *FrameBuffer,
u32 NumWords);
void fifo_icap_reset(struct hwicap_drvdata *drvdata);
void fifo_icap_flush_fifo(struct hwicap_drvdata *drvdata);
-diff -x .git -Nur linux-2.6.25-rc9/drivers/char/xilinx_hwicap/xilinx_hwicap.c powerpc.git/drivers/char/xilinx_hwicap/xilinx_hwicap.c
---- linux-2.6.25-rc9/drivers/char/xilinx_hwicap/xilinx_hwicap.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/char/xilinx_hwicap/xilinx_hwicap.c 2008-04-19 16:40:53.000000000 +0200
+--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
++++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
@@ -36,7 +36,7 @@
*****************************************************************************/
/* An array, which is set to true when the device is registered. */
static bool probed_devices[HWICAP_DEVICES];
static struct mutex icap_sem;
-@@ -250,8 +246,26 @@
+@@ -250,8 +246,26 @@ static int hwicap_get_configuration_regi
* Create the data to be written to the ICAP.
*/
buffer[index++] = XHI_DUMMY_PACKET;
buffer[index++] = hwicap_type_1_read(reg) | 1;
buffer[index++] = XHI_NOOP_PACKET;
buffer[index++] = XHI_NOOP_PACKET;
-@@ -587,7 +601,7 @@
+@@ -587,7 +601,7 @@ static int __devinit hwicap_setup(struct
probed_devices[id] = 1;
mutex_unlock(&icap_sem);
drvdata = kzalloc(sizeof(struct hwicap_drvdata), GFP_KERNEL);
if (!drvdata) {
-@@ -664,12 +678,14 @@
+@@ -664,12 +678,14 @@ static int __devinit hwicap_setup(struct
static struct hwicap_driver_config buffer_icap_config = {
.get_configuration = buffer_icap_get_configuration,
.set_configuration = buffer_icap_set_configuration,
.reset = fifo_icap_reset,
};
-@@ -690,7 +706,7 @@
+@@ -690,7 +706,7 @@ static int __devexit hwicap_remove(struc
dev_set_drvdata(dev, NULL);
mutex_lock(&icap_sem);
mutex_unlock(&icap_sem);
return 0; /* success */
}
-@@ -830,23 +846,12 @@
+@@ -830,23 +846,12 @@ static int __init hwicap_module_init(voi
icap_class = class_create(THIS_MODULE, "xilinx_config");
mutex_init(&icap_sem);
retval = platform_driver_register(&hwicap_platform_driver);
-@@ -871,7 +876,7 @@
+@@ -871,7 +876,7 @@ static int __init hwicap_module_init(voi
static void __exit hwicap_module_cleanup(void)
{
class_destroy(icap_class);
-diff -x .git -Nur linux-2.6.25-rc9/drivers/char/xilinx_hwicap/xilinx_hwicap.h powerpc.git/drivers/char/xilinx_hwicap/xilinx_hwicap.h
---- linux-2.6.25-rc9/drivers/char/xilinx_hwicap/xilinx_hwicap.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/char/xilinx_hwicap/xilinx_hwicap.h 2008-04-19 16:40:53.000000000 +0200
-@@ -65,10 +65,27 @@
+--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.h
++++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.h
+@@ -65,10 +65,27 @@ struct hwicap_drvdata {
};
struct hwicap_driver_config {
void (*reset)(struct hwicap_drvdata *drvdata);
};
-@@ -163,6 +180,13 @@
+@@ -163,6 +180,13 @@ struct config_registers {
/* Constant to use for CRC check when CRC has been disabled */
#define XHI_DISABLED_AUTO_CRC 0x0000DEFCUL
/**
* hwicap_type_1_read - Generates a Type 1 read packet header.
* @reg: is the address of the register to be read back.
-diff -x .git -Nur linux-2.6.25-rc9/drivers/mtd/nand/fsl_elbc_nand.c powerpc.git/drivers/mtd/nand/fsl_elbc_nand.c
---- linux-2.6.25-rc9/drivers/mtd/nand/fsl_elbc_nand.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/mtd/nand/fsl_elbc_nand.c 2008-04-19 16:40:54.000000000 +0200
+--- a/drivers/mtd/nand/fsl_elbc_nand.c
++++ b/drivers/mtd/nand/fsl_elbc_nand.c
@@ -36,207 +36,12 @@
#include <linux/mtd/partitions.h>
struct fsl_elbc_ctrl;
/* mtd information per set */
-@@ -261,7 +66,7 @@
+@@ -261,7 +66,7 @@ struct fsl_elbc_ctrl {
/* device info */
struct device *dev;
int irq;
wait_queue_head_t irq_wait;
unsigned int irq_status; /* status read from LTESR by irq handler */
-@@ -322,7 +127,7 @@
+@@ -322,7 +127,7 @@ static void set_addr(struct mtd_info *mt
struct nand_chip *chip = mtd->priv;
struct fsl_elbc_mtd *priv = chip->priv;
struct fsl_elbc_ctrl *ctrl = priv->ctrl;
int buf_num;
ctrl->page = page_addr;
-@@ -363,7 +168,7 @@
+@@ -363,7 +168,7 @@ static int fsl_elbc_run_command(struct m
struct nand_chip *chip = mtd->priv;
struct fsl_elbc_mtd *priv = chip->priv;
struct fsl_elbc_ctrl *ctrl = priv->ctrl;
/* Setup the FMR[OP] to execute without write protection */
out_be32(&lbc->fmr, priv->fmr | 3);
-@@ -406,7 +211,7 @@
+@@ -406,7 +211,7 @@ static void fsl_elbc_do_read(struct nand
{
struct fsl_elbc_mtd *priv = chip->priv;
struct fsl_elbc_ctrl *ctrl = priv->ctrl;
if (priv->page_size) {
out_be32(&lbc->fir,
-@@ -439,7 +244,7 @@
+@@ -439,7 +244,7 @@ static void fsl_elbc_cmdfunc(struct mtd_
struct nand_chip *chip = mtd->priv;
struct fsl_elbc_mtd *priv = chip->priv;
struct fsl_elbc_ctrl *ctrl = priv->ctrl;
ctrl->use_mdr = 0;
-@@ -775,7 +580,7 @@
+@@ -775,7 +580,7 @@ static int fsl_elbc_wait(struct mtd_info
{
struct fsl_elbc_mtd *priv = chip->priv;
struct fsl_elbc_ctrl *ctrl = priv->ctrl;
if (ctrl->status != LTESR_CC)
return NAND_STATUS_FAIL;
-@@ -807,7 +612,7 @@
+@@ -807,7 +612,7 @@ static int fsl_elbc_chip_init_tail(struc
struct nand_chip *chip = mtd->priv;
struct fsl_elbc_mtd *priv = chip->priv;
struct fsl_elbc_ctrl *ctrl = priv->ctrl;
unsigned int al;
/* calculate FMR Address Length field */
-@@ -922,7 +727,7 @@
+@@ -922,7 +727,7 @@ static void fsl_elbc_write_page(struct m
static int fsl_elbc_chip_init(struct fsl_elbc_mtd *priv)
{
struct fsl_elbc_ctrl *ctrl = priv->ctrl;
struct nand_chip *chip = &priv->chip;
dev_dbg(priv->dev, "eLBC Set Information for bank %d\n", priv->bank);
-@@ -986,7 +791,7 @@
+@@ -986,7 +791,7 @@ static int fsl_elbc_chip_remove(struct f
static int fsl_elbc_chip_probe(struct fsl_elbc_ctrl *ctrl,
struct device_node *node)
{
struct fsl_elbc_mtd *priv;
struct resource res;
#ifdef CONFIG_MTD_PARTITIONS
-@@ -1083,7 +888,7 @@
+@@ -1083,7 +888,7 @@ err:
static int __devinit fsl_elbc_ctrl_init(struct fsl_elbc_ctrl *ctrl)
{
/* clear event registers */
setbits32(&lbc->ltesr, LTESR_NAND_MASK);
-@@ -1128,7 +933,7 @@
+@@ -1128,7 +933,7 @@ static int __devexit fsl_elbc_ctrl_remov
static irqreturn_t fsl_elbc_ctrl_irq(int irqno, void *data)
{
struct fsl_elbc_ctrl *ctrl = data;
__be32 status = in_be32(&lbc->ltesr) & LTESR_NAND_MASK;
if (status) {
-diff -x .git -Nur linux-2.6.25-rc9/drivers/net/Makefile powerpc.git/drivers/net/Makefile
---- linux-2.6.25-rc9/drivers/net/Makefile 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/net/Makefile 2008-03-17 14:03:55.000000000 +0100
-@@ -218,7 +218,8 @@
+--- a/drivers/net/Makefile
++++ b/drivers/net/Makefile
+@@ -219,7 +219,8 @@ obj-$(CONFIG_SMC911X) += smc911x.o
obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
obj-$(CONFIG_DM9000) += dm9000.o
obj-$(CONFIG_FEC_8XX) += fec_8xx/
obj-$(CONFIG_MLX4_CORE) += mlx4/
obj-$(CONFIG_ENC28J60) += enc28j60.o
-diff -x .git -Nur linux-2.6.25-rc9/drivers/net/iseries_veth.c powerpc.git/drivers/net/iseries_veth.c
---- linux-2.6.25-rc9/drivers/net/iseries_veth.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/net/iseries_veth.c 2008-04-19 16:40:54.000000000 +0200
-@@ -308,7 +308,8 @@
+--- a/drivers/net/iseries_veth.c
++++ b/drivers/net/iseries_veth.c
+@@ -308,7 +308,8 @@ static void veth_complete_allocation(voi
static int veth_allocate_events(HvLpIndex rlp, int number)
{
mf_allocate_lp_events(rlp, HvLpEvent_Type_VirtualLan,
sizeof(struct veth_lpevent), number,
-diff -x .git -Nur linux-2.6.25-rc9/drivers/net/pasemi_mac.c powerpc.git/drivers/net/pasemi_mac.c
---- linux-2.6.25-rc9/drivers/net/pasemi_mac.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/net/pasemi_mac.c 2008-04-19 16:40:54.000000000 +0200
+--- a/drivers/net/pasemi_mac.c
++++ b/drivers/net/pasemi_mac.c
@@ -55,15 +55,10 @@
* - Multiqueue RX/TX
*/
MODULE_LICENSE("GPL");
MODULE_AUTHOR ("Olof Johansson <olof@lixom.net>");
MODULE_DESCRIPTION("PA Semi PWRficient Ethernet driver");
-@@ -94,6 +79,8 @@
+@@ -94,6 +79,8 @@ static int debug = -1; /* -1 == use DEFA
module_param(debug, int, 0);
MODULE_PARM_DESC(debug, "PA Semi MAC bitmapped debugging message enable value");
static int translation_enabled(void)
{
#if defined(CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE)
-@@ -322,6 +309,104 @@
+@@ -322,6 +309,104 @@ static int pasemi_mac_unmap_tx_skb(struc
return (nfrags + 3) & ~1;
}
static int pasemi_mac_setup_rx_resources(const struct net_device *dev)
{
struct pasemi_mac_rxring *ring;
-@@ -445,7 +530,7 @@
+@@ -445,7 +530,7 @@ pasemi_mac_setup_tx_resources(const stru
cfg = PAS_DMA_TXCHAN_CFG_TY_IFACE |
PAS_DMA_TXCHAN_CFG_TATTR(mac->dma_if) |
PAS_DMA_TXCHAN_CFG_UP |
if (translation_enabled())
cfg |= PAS_DMA_TXCHAN_CFG_TRD | PAS_DMA_TXCHAN_CFG_TRR;
-@@ -810,13 +895,21 @@
+@@ -810,13 +895,21 @@ restart:
u64 mactx = TX_DESC(txring, i);
struct sk_buff *skb;
if (unlikely(mactx & XCT_MACTX_O))
/* Not yet transmitted */
break;
-@@ -1041,13 +1134,7 @@
+@@ -1041,13 +1134,7 @@ static int pasemi_mac_open(struct net_de
{
struct pasemi_mac *mac = netdev_priv(dev);
unsigned int flags;
flags = PAS_MAC_CFG_TXP_FCE | PAS_MAC_CFG_TXP_FPC(3) |
PAS_MAC_CFG_TXP_SL(3) | PAS_MAC_CFG_TXP_COB(0xf) |
-@@ -1064,6 +1151,19 @@
+@@ -1064,6 +1151,19 @@ static int pasemi_mac_open(struct net_de
if (!mac->tx)
goto out_tx_ring;
/* 0x3ff with 33MHz clock is about 31us */
write_iob_reg(PAS_IOB_DMA_COM_TIMEOUTCFG,
PAS_IOB_DMA_COM_TIMEOUTCFG_TCNT(0x3ff));
-@@ -1247,7 +1347,7 @@
+@@ -1247,7 +1347,7 @@ static int pasemi_mac_close(struct net_d
{
struct pasemi_mac *mac = netdev_priv(dev);
unsigned int sta;
rxch = rx_ring(mac)->chan.chno;
txch = tx_ring(mac)->chan.chno;
-@@ -1292,6 +1392,13 @@
+@@ -1292,6 +1392,13 @@ static int pasemi_mac_close(struct net_d
free_irq(mac->tx->chan.irq, mac->tx);
free_irq(mac->rx->chan.irq, mac->rx);
/* Free resources */
pasemi_mac_free_rx_resources(mac);
pasemi_mac_free_tx_resources(mac);
-@@ -1299,35 +1406,113 @@
+@@ -1299,35 +1406,113 @@ static int pasemi_mac_close(struct net_d
return 0;
}
nfrags = skb_shinfo(skb)->nr_frags;
-@@ -1350,24 +1535,46 @@
+@@ -1350,24 +1535,46 @@ static int pasemi_mac_start_tx(struct sk
}
}
TX_DESC(txring, fill) = mactx;
TX_DESC_INFO(txring, fill).dma = nfrags;
fill++;
-@@ -1441,12 +1648,33 @@
+@@ -1441,12 +1648,33 @@ static int pasemi_mac_poll(struct napi_s
return pkts;
}
if (new_mtu < PE_MIN_MTU || new_mtu > PE_MAX_MTU)
return -EINVAL;
-@@ -1468,6 +1696,16 @@
+@@ -1468,6 +1696,16 @@ static int pasemi_mac_change_mtu(struct
pasemi_mac_pause_rxint(mac);
pasemi_mac_clean_rx(rx_ring(mac), RX_RING_SIZE);
pasemi_mac_free_rx_buffers(mac);
}
/* Change maxf, i.e. what size frames are accepted.
-@@ -1482,6 +1720,7 @@
+@@ -1482,6 +1720,7 @@ static int pasemi_mac_change_mtu(struct
/* MTU + ETH_HLEN + VLAN_HLEN + 2 64B cachelines */
mac->bufsz = new_mtu + ETH_HLEN + ETH_FCS_LEN + LOCAL_SKB_ALIGN + 128;
if (running) {
write_dma_reg(PAS_DMA_RXINT_RCMDSTA(mac->dma_if),
rcmdsta | PAS_DMA_RXINT_RCMDSTA_EN);
-@@ -1494,7 +1733,7 @@
+@@ -1494,7 +1733,7 @@ static int pasemi_mac_change_mtu(struct
pasemi_mac_intf_enable(mac);
}
}
static int __devinit
-@@ -1528,7 +1767,7 @@
+@@ -1528,7 +1767,7 @@ pasemi_mac_probe(struct pci_dev *pdev, c
netif_napi_add(dev, &mac->napi, pasemi_mac_poll, 64);
dev->features = NETIF_F_IP_CSUM | NETIF_F_LLTX | NETIF_F_SG |
mac->lro_mgr.max_aggr = LRO_MAX_AGGR;
mac->lro_mgr.max_desc = MAX_LRO_DESCRIPTORS;
-@@ -1588,8 +1827,12 @@
+@@ -1588,8 +1827,12 @@ pasemi_mac_probe(struct pci_dev *pdev, c
dev->mtu = PE_DEF_MTU;
/* 1500 MTU + ETH_HLEN + VLAN_HLEN + 2 64B cachelines */
mac->bufsz = dev->mtu + ETH_HLEN + ETH_FCS_LEN + LOCAL_SKB_ALIGN + 128;
if (err)
goto out;
-diff -x .git -Nur linux-2.6.25-rc9/drivers/net/pasemi_mac.h powerpc.git/drivers/net/pasemi_mac.h
---- linux-2.6.25-rc9/drivers/net/pasemi_mac.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/net/pasemi_mac.h 2008-03-17 14:03:59.000000000 +0100
+--- a/drivers/net/pasemi_mac.h
++++ b/drivers/net/pasemi_mac.h
@@ -26,7 +26,14 @@
#include <linux/spinlock.h>
#include <linux/phy.h>
struct pasemi_mac_txring {
struct pasemi_dmachan chan; /* Must be first */
-@@ -51,6 +58,15 @@
+@@ -51,6 +58,15 @@ struct pasemi_mac_rxring {
struct pasemi_mac *mac; /* Needed in intr handler */
};
struct pasemi_mac {
struct net_device *netdev;
struct pci_dev *pdev;
-@@ -60,10 +76,12 @@
+@@ -60,10 +76,12 @@ struct pasemi_mac {
struct napi_struct napi;
int bufsz; /* RX ring buffer size */
u8 mac_addr[6];
-@@ -74,6 +92,7 @@
+@@ -74,6 +92,7 @@ struct pasemi_mac {
struct pasemi_mac_txring *tx;
struct pasemi_mac_rxring *rx;
char tx_irq_name[10]; /* "eth%d tx" */
char rx_irq_name[10]; /* "eth%d rx" */
int link;
-@@ -90,6 +109,16 @@
+@@ -90,6 +109,16 @@ struct pasemi_mac_buffer {
dma_addr_t dma;
};
/* PCI register offsets and formats */
-@@ -101,6 +130,7 @@
+@@ -101,6 +130,7 @@ enum {
PAS_MAC_CFG_ADR0 = 0x8c,
PAS_MAC_CFG_ADR1 = 0x90,
PAS_MAC_CFG_TXP = 0x98,
PAS_MAC_IPC_CHNL = 0x208,
};
-@@ -172,6 +202,8 @@
+@@ -172,6 +202,8 @@ enum {
#define PAS_MAC_CFG_TXP_TIFG(x) (((x) << PAS_MAC_CFG_TXP_TIFG_S) & \
PAS_MAC_CFG_TXP_TIFG_M)
#define PAS_MAC_IPC_CHNL_DCHNO_M 0x003f0000
#define PAS_MAC_IPC_CHNL_DCHNO_S 16
#define PAS_MAC_IPC_CHNL_DCHNO(x) (((x) << PAS_MAC_IPC_CHNL_DCHNO_S) & \
-@@ -181,4 +213,5 @@
+@@ -181,4 +213,5 @@ enum {
#define PAS_MAC_IPC_CHNL_BCH(x) (((x) << PAS_MAC_IPC_CHNL_BCH_S) & \
PAS_MAC_IPC_CHNL_BCH_M)
+
#endif /* PASEMI_MAC_H */
-diff -x .git -Nur linux-2.6.25-rc9/drivers/net/pasemi_mac_ethtool.c powerpc.git/drivers/net/pasemi_mac_ethtool.c
---- linux-2.6.25-rc9/drivers/net/pasemi_mac_ethtool.c 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/drivers/net/pasemi_mac_ethtool.c 2008-03-17 14:03:59.000000000 +0100
+--- /dev/null
++++ b/drivers/net/pasemi_mac_ethtool.c
@@ -0,0 +1,159 @@
+/*
+ * Copyright (C) 2006-2008 PA Semi, Inc
+ .get_ethtool_stats = pasemi_mac_get_ethtool_stats,
+};
+
-diff -x .git -Nur linux-2.6.25-rc9/drivers/net/ps3_gelic_net.c powerpc.git/drivers/net/ps3_gelic_net.c
---- linux-2.6.25-rc9/drivers/net/ps3_gelic_net.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/net/ps3_gelic_net.c 2008-04-19 16:40:54.000000000 +0200
-@@ -1266,6 +1266,85 @@
+--- a/drivers/net/ps3_gelic_net.c
++++ b/drivers/net/ps3_gelic_net.c
+@@ -1266,6 +1266,85 @@ int gelic_net_set_rx_csum(struct net_dev
return 0;
}
static struct ethtool_ops gelic_ether_ethtool_ops = {
.get_drvinfo = gelic_net_get_drvinfo,
.get_settings = gelic_ether_get_settings,
-@@ -1274,6 +1353,8 @@
+@@ -1274,6 +1353,8 @@ static struct ethtool_ops gelic_ether_et
.set_tx_csum = ethtool_op_set_tx_csum,
.get_rx_csum = gelic_net_get_rx_csum,
.set_rx_csum = gelic_net_set_rx_csum,
};
/**
-diff -x .git -Nur linux-2.6.25-rc9/drivers/net/ps3_gelic_net.h powerpc.git/drivers/net/ps3_gelic_net.h
---- linux-2.6.25-rc9/drivers/net/ps3_gelic_net.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/net/ps3_gelic_net.h 2008-04-19 16:40:54.000000000 +0200
-@@ -182,12 +182,32 @@
+--- a/drivers/net/ps3_gelic_net.h
++++ b/drivers/net/ps3_gelic_net.h
+@@ -182,12 +182,32 @@ enum gelic_lv1_net_control_code {
GELIC_LV1_GET_ETH_PORT_STATUS = 2,
GELIC_LV1_SET_NEGOTIATION_MODE = 3,
GELIC_LV1_GET_VLAN_ID = 4,
/* status returened from GET_ETH_PORT_STATUS */
enum gelic_lv1_ether_port_status {
GELIC_LV1_ETHER_LINK_UP = 0x0000000000000001L,
-diff -x .git -Nur linux-2.6.25-rc9/drivers/net/ucc_geth.c powerpc.git/drivers/net/ucc_geth.c
---- linux-2.6.25-rc9/drivers/net/ucc_geth.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/net/ucc_geth.c 2008-04-19 16:40:54.000000000 +0200
-@@ -3852,7 +3852,13 @@
+--- a/drivers/net/ucc_geth.c
++++ b/drivers/net/ucc_geth.c
+@@ -3853,7 +3853,13 @@ static int ucc_geth_probe(struct of_devi
ugeth_vdbg("%s: IN", __FUNCTION__);
ucc_num = *prop - 1;
if ((ucc_num < 0) || (ucc_num > 7))
return -ENODEV;
-diff -x .git -Nur linux-2.6.25-rc9/drivers/net/ucc_geth_mii.c powerpc.git/drivers/net/ucc_geth_mii.c
---- linux-2.6.25-rc9/drivers/net/ucc_geth_mii.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/net/ucc_geth_mii.c 2008-04-19 16:40:54.000000000 +0200
-@@ -203,9 +203,14 @@
+--- a/drivers/net/ucc_geth_mii.c
++++ b/drivers/net/ucc_geth_mii.c
+@@ -203,9 +203,14 @@ static int uec_mdio_probe(struct of_devi
if ((res.start >= tempres.start) &&
(res.end <= tempres.end)) {
/* set this UCC to be the MII master */
ucc_set_qe_mux_mii_mng(*id - 1);
-diff -x .git -Nur linux-2.6.25-rc9/drivers/of/Kconfig powerpc.git/drivers/of/Kconfig
---- linux-2.6.25-rc9/drivers/of/Kconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/of/Kconfig 2008-04-19 16:40:55.000000000 +0200
+--- a/drivers/of/Kconfig
++++ b/drivers/of/Kconfig
@@ -1,3 +1,15 @@
config OF_DEVICE
def_bool y
+ depends on OF && I2C
+ help
+ OpenFirmware I2C accessors
-diff -x .git -Nur linux-2.6.25-rc9/drivers/of/Makefile powerpc.git/drivers/of/Makefile
---- linux-2.6.25-rc9/drivers/of/Makefile 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/of/Makefile 2008-04-19 16:40:55.000000000 +0200
+--- a/drivers/of/Makefile
++++ b/drivers/of/Makefile
@@ -1,2 +1,4 @@
obj-y = base.o
obj-$(CONFIG_OF_DEVICE) += device.o platform.o
+obj-$(CONFIG_OF_GPIO) += gpio.o
+obj-$(CONFIG_OF_I2C) += i2c.o
-diff -x .git -Nur linux-2.6.25-rc9/drivers/of/base.c powerpc.git/drivers/of/base.c
---- linux-2.6.25-rc9/drivers/of/base.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/of/base.c 2008-04-19 16:40:55.000000000 +0200
-@@ -117,6 +117,32 @@
+--- a/drivers/of/base.c
++++ b/drivers/of/base.c
+@@ -117,6 +117,32 @@ int of_device_is_compatible(const struct
EXPORT_SYMBOL(of_device_is_compatible);
/**
* of_get_parent - Get a node's parent if any
* @node: Node to get parent
*
-diff -x .git -Nur linux-2.6.25-rc9/drivers/of/gpio.c powerpc.git/drivers/of/gpio.c
---- linux-2.6.25-rc9/drivers/of/gpio.c 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/drivers/of/gpio.c 2008-04-19 16:40:55.000000000 +0200
+--- /dev/null
++++ b/drivers/of/gpio.c
@@ -0,0 +1,242 @@
+/*
+ * OF helpers for the GPIO API
+ return ret;
+}
+EXPORT_SYMBOL(of_mm_gpiochip_add);
-diff -x .git -Nur linux-2.6.25-rc9/drivers/of/i2c.c powerpc.git/drivers/of/i2c.c
---- linux-2.6.25-rc9/drivers/of/i2c.c 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/drivers/of/i2c.c 2008-04-19 16:40:55.000000000 +0200
+--- /dev/null
++++ b/drivers/of/i2c.c
@@ -0,0 +1,115 @@
+/*
+ * OF helpers for the I2C API
+ }
+}
+EXPORT_SYMBOL(of_register_i2c_devices);
-diff -x .git -Nur linux-2.6.25-rc9/drivers/ps3/ps3-sys-manager.c powerpc.git/drivers/ps3/ps3-sys-manager.c
---- linux-2.6.25-rc9/drivers/ps3/ps3-sys-manager.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/ps3/ps3-sys-manager.c 2008-04-19 16:40:55.000000000 +0200
+--- a/drivers/ps3/ps3-sys-manager.c
++++ b/drivers/ps3/ps3-sys-manager.c
@@ -24,6 +24,7 @@
#include <linux/reboot.h>
#include <asm/ps3.h>
#include "vuart.h"
-@@ -187,6 +188,7 @@
+@@ -187,6 +188,7 @@ enum ps3_sys_manager_next_op {
* controller, and bluetooth controller.
* @PS3_SM_WAKE_RTC:
* @PS3_SM_WAKE_RTC_ERROR:
* @PS3_SM_WAKE_P_O_R: Power on reset.
*
* Additional wakeup sources when specifying PS3_SM_NEXT_OP_SYS_SHUTDOWN.
-@@ -200,10 +202,19 @@
+@@ -200,10 +202,19 @@ enum ps3_sys_manager_wake_source {
PS3_SM_WAKE_DEFAULT = 0,
PS3_SM_WAKE_RTC = 0x00000040,
PS3_SM_WAKE_RTC_ERROR = 0x00000080,
* enum ps3_sys_manager_cmd - Command from system manager to guest.
*
* The guest completes the actions needed, then acks or naks the command via
-@@ -581,6 +592,23 @@
+@@ -581,6 +592,23 @@ fail_id:
return -EIO;
}
/**
* ps3_sys_manager_final_power_off - The final platform machine_power_off routine.
*
-@@ -601,13 +629,9 @@
+@@ -601,13 +629,9 @@ static void ps3_sys_manager_final_power_
ps3_vuart_cancel_async(dev);
ps3_sys_manager_send_next_op(dev, PS3_SM_NEXT_OP_SYS_SHUTDOWN,
}
/**
-@@ -638,14 +662,42 @@
+@@ -638,14 +662,42 @@ static void ps3_sys_manager_final_restar
ps3_sys_manager_send_attr(dev, 0);
ps3_sys_manager_send_next_op(dev, PS3_SM_NEXT_OP_SYS_REBOOT,
/**
* ps3_sys_manager_work - Asynchronous read handler.
-diff -x .git -Nur linux-2.6.25-rc9/drivers/ps3/sys-manager-core.c powerpc.git/drivers/ps3/sys-manager-core.c
---- linux-2.6.25-rc9/drivers/ps3/sys-manager-core.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/ps3/sys-manager-core.c 2008-04-19 16:40:55.000000000 +0200
+--- a/drivers/ps3/sys-manager-core.c
++++ b/drivers/ps3/sys-manager-core.c
@@ -19,6 +19,7 @@
*/
#include <asm/ps3.h>
/**
-@@ -50,10 +51,7 @@
+@@ -50,10 +51,7 @@ void ps3_sys_manager_power_off(void)
if (ps3_sys_manager_ops.power_off)
ps3_sys_manager_ops.power_off(ps3_sys_manager_ops.dev);
}
void ps3_sys_manager_restart(void)
-@@ -61,8 +59,14 @@
+@@ -61,8 +59,14 @@ void ps3_sys_manager_restart(void)
if (ps3_sys_manager_ops.restart)
ps3_sys_manager_ops.restart(ps3_sys_manager_ops.dev);
+ lv1_pause(1);
}
+
-diff -x .git -Nur linux-2.6.25-rc9/drivers/serial/cpm_uart/cpm_uart.h powerpc.git/drivers/serial/cpm_uart/cpm_uart.h
---- linux-2.6.25-rc9/drivers/serial/cpm_uart/cpm_uart.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/serial/cpm_uart/cpm_uart.h 2008-04-19 16:40:55.000000000 +0200
-@@ -92,6 +92,9 @@
+--- a/drivers/serial/cpm_uart/cpm_uart.h
++++ b/drivers/serial/cpm_uart/cpm_uart.h
+@@ -92,6 +92,9 @@ extern struct uart_cpm_port cpm_uart_por
/* these are located in their respective files */
void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd);
int cpm_uart_init_portdesc(void);
int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con);
void cpm_uart_freebuf(struct uart_cpm_port *pinfo);
-diff -x .git -Nur linux-2.6.25-rc9/drivers/serial/cpm_uart/cpm_uart_core.c powerpc.git/drivers/serial/cpm_uart/cpm_uart_core.c
---- linux-2.6.25-rc9/drivers/serial/cpm_uart/cpm_uart_core.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/serial/cpm_uart/cpm_uart_core.c 2008-04-19 16:40:55.000000000 +0200
-@@ -966,24 +966,23 @@
+--- a/drivers/serial/cpm_uart/cpm_uart_core.c
++++ b/drivers/serial/cpm_uart/cpm_uart_core.c
+@@ -966,24 +966,23 @@ static int cpm_uart_init_port(struct dev
if (!mem)
return -ENOMEM;
}
pinfo->tx_nrfifos = TX_NUM_FIFO;
-@@ -1007,7 +1006,7 @@
+@@ -1007,7 +1006,7 @@ static int cpm_uart_init_port(struct dev
return cpm_uart_request_port(&pinfo->port);
out_pram:
out_mem:
iounmap(mem);
return ret;
-diff -x .git -Nur linux-2.6.25-rc9/drivers/serial/cpm_uart/cpm_uart_cpm1.c powerpc.git/drivers/serial/cpm_uart/cpm_uart_cpm1.c
---- linux-2.6.25-rc9/drivers/serial/cpm_uart/cpm_uart_cpm1.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/serial/cpm_uart/cpm_uart_cpm1.c 2008-04-19 16:40:55.000000000 +0200
+--- a/drivers/serial/cpm_uart/cpm_uart_cpm1.c
++++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.c
@@ -45,6 +45,8 @@
#include <linux/serial_core.h>
#include <linux/kernel.h>
#include "cpm_uart.h"
/**************************************************************/
-@@ -54,6 +56,18 @@
+@@ -54,6 +56,18 @@ void cpm_line_cr_cmd(struct uart_cpm_por
{
cpm_command(port->command, cmd);
}
#else
void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd)
{
-diff -x .git -Nur linux-2.6.25-rc9/drivers/serial/cpm_uart/cpm_uart_cpm2.c powerpc.git/drivers/serial/cpm_uart/cpm_uart_cpm2.c
---- linux-2.6.25-rc9/drivers/serial/cpm_uart/cpm_uart_cpm2.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/serial/cpm_uart/cpm_uart_cpm2.c 2008-04-19 16:40:55.000000000 +0200
+--- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c
++++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
@@ -41,6 +41,9 @@
#include <asm/io.h>
#include <asm/irq.h>
#include <linux/serial_core.h>
#include <linux/kernel.h>
-@@ -54,6 +57,55 @@
+@@ -54,6 +57,55 @@ void cpm_line_cr_cmd(struct uart_cpm_por
{
cpm_command(port->command, cmd);
}
#else
void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd)
{
-diff -x .git -Nur linux-2.6.25-rc9/drivers/serial/of_serial.c powerpc.git/drivers/serial/of_serial.c
---- linux-2.6.25-rc9/drivers/serial/of_serial.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/serial/of_serial.c 2008-04-19 16:40:55.000000000 +0200
-@@ -56,7 +56,9 @@
+--- a/drivers/serial/of_serial.c
++++ b/drivers/serial/of_serial.c
+@@ -56,7 +56,9 @@ static int __devinit of_platform_serial_
port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP
| UPF_FIXED_PORT;
port->dev = &ofdev->dev;
return 0;
}
-diff -x .git -Nur linux-2.6.25-rc9/drivers/serial/ucc_uart.c powerpc.git/drivers/serial/ucc_uart.c
---- linux-2.6.25-rc9/drivers/serial/ucc_uart.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/drivers/serial/ucc_uart.c 2008-04-19 16:40:55.000000000 +0200
-@@ -1270,10 +1270,18 @@
+--- a/drivers/serial/ucc_uart.c
++++ b/drivers/serial/ucc_uart.c
+@@ -1270,10 +1270,18 @@ static int ucc_uart_probe(struct of_devi
/* Get the UCC number (device ID) */
/* UCCs are numbered 1-7 */
kfree(qe_port);
return -ENODEV;
}
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/Kbuild powerpc.git/include/asm-powerpc/Kbuild
---- linux-2.6.25-rc9/include/asm-powerpc/Kbuild 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/Kbuild 2008-04-19 16:40:57.000000000 +0200
+--- a/include/asm-powerpc/Kbuild
++++ b/include/asm-powerpc/Kbuild
@@ -1,5 +1,6 @@
include include/asm-generic/Kbuild.asm
header-y += auxvec.h
header-y += ioctls.h
header-y += mman.h
-@@ -23,7 +24,6 @@
+@@ -23,7 +24,6 @@ header-y += sigcontext.h
header-y += statfs.h
header-y += ps3fb.h
unifdef-y += asm-compat.h
unifdef-y += bootx.h
unifdef-y += byteorder.h
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/abs_addr.h powerpc.git/include/asm-powerpc/abs_addr.h
---- linux-2.6.25-rc9/include/asm-powerpc/abs_addr.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/abs_addr.h 2008-03-17 14:04:35.000000000 +0100
+--- a/include/asm-powerpc/abs_addr.h
++++ b/include/asm-powerpc/abs_addr.h
@@ -12,10 +12,11 @@
* 2 of the License, or (at your option) any later version.
*/
#include <asm/firmware.h>
struct mschunks_map {
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/bitops.h powerpc.git/include/asm-powerpc/bitops.h
---- linux-2.6.25-rc9/include/asm-powerpc/bitops.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/bitops.h 2008-04-19 16:40:57.000000000 +0200
-@@ -312,24 +312,26 @@
+--- a/include/asm-powerpc/bitops.h
++++ b/include/asm-powerpc/bitops.h
+@@ -312,24 +312,26 @@ static __inline__ int fls(unsigned int x
asm ("cntlzw %0,%1" : "=r" (lz) : "r" (x));
return 32 - lz;
}
/* Little-endian versions */
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/cpm.h powerpc.git/include/asm-powerpc/cpm.h
---- linux-2.6.25-rc9/include/asm-powerpc/cpm.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/cpm.h 2008-04-19 16:40:57.000000000 +0200
+--- a/include/asm-powerpc/cpm.h
++++ b/include/asm-powerpc/cpm.h
@@ -4,6 +4,20 @@
#include <linux/compiler.h>
#include <linux/types.h>
/* Buffer descriptors used by many of the CPM protocols. */
typedef struct cpm_buf_desc {
ushort cbd_sc; /* Status and Control */
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/cpm1.h powerpc.git/include/asm-powerpc/cpm1.h
---- linux-2.6.25-rc9/include/asm-powerpc/cpm1.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/cpm1.h 2008-04-19 16:40:57.000000000 +0200
+--- a/include/asm-powerpc/cpm1.h
++++ b/include/asm-powerpc/cpm1.h
@@ -28,19 +28,6 @@
#define CPM_CR_CHAN ((ushort)0x00f0)
#define CPM_CR_FLG ((ushort)0x0001)
/* Channel numbers.
*/
#define CPM_CR_CH_SCC1 ((ushort)0x0000)
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/cpm2.h powerpc.git/include/asm-powerpc/cpm2.h
---- linux-2.6.25-rc9/include/asm-powerpc/cpm2.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/cpm2.h 2008-04-19 16:40:57.000000000 +0200
+--- a/include/asm-powerpc/cpm2.h
++++ b/include/asm-powerpc/cpm2.h
@@ -71,18 +71,9 @@
#define CPM_CR_FCC_PAGE(x) (x + 0x04)
#define mk_cr_cmd(PG, SBC, MCN, OP) \
((PG << 26) | (SBC << 21) | (MCN << 6) | OP)
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/cputhreads.h powerpc.git/include/asm-powerpc/cputhreads.h
---- linux-2.6.25-rc9/include/asm-powerpc/cputhreads.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/cputhreads.h 2008-03-17 14:04:35.000000000 +0100
-@@ -35,7 +35,7 @@
+--- a/include/asm-powerpc/cputhreads.h
++++ b/include/asm-powerpc/cputhreads.h
+@@ -35,7 +35,7 @@ static inline cpumask_t cpu_thread_mask_
res = CPU_MASK_NONE;
for (i = 0; i < NR_CPUS; i += threads_per_core) {
if (cpus_intersects(threads, tmp))
cpu_set(i, res);
}
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/dcr-native.h powerpc.git/include/asm-powerpc/dcr-native.h
---- linux-2.6.25-rc9/include/asm-powerpc/dcr-native.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/dcr-native.h 2008-04-19 16:40:57.000000000 +0200
-@@ -82,6 +82,19 @@
+--- a/include/asm-powerpc/dcr-native.h
++++ b/include/asm-powerpc/dcr-native.h
+@@ -82,6 +82,19 @@ static inline void __mtdcri(int base_add
spin_unlock_irqrestore(&dcr_ind_lock, flags);
}
#define mfdcri(base, reg) __mfdcri(DCRN_ ## base ## _CONFIG_ADDR, \
DCRN_ ## base ## _CONFIG_DATA, \
reg)
-@@ -90,6 +103,10 @@
+@@ -90,6 +103,10 @@ static inline void __mtdcri(int base_add
DCRN_ ## base ## _CONFIG_DATA, \
reg, data)
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_DCR_NATIVE_H */
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/dcr-regs.h powerpc.git/include/asm-powerpc/dcr-regs.h
---- linux-2.6.25-rc9/include/asm-powerpc/dcr-regs.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/dcr-regs.h 2008-04-19 16:40:57.000000000 +0200
+--- a/include/asm-powerpc/dcr-regs.h
++++ b/include/asm-powerpc/dcr-regs.h
@@ -68,4 +68,82 @@
#define SDR0_UART3 0x0123
#define SDR0_CUST0 0x4000
+#define L2C_SNP_ESR 0x00000800
+
#endif /* __DCR_REGS_H__ */
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/exception.h powerpc.git/include/asm-powerpc/exception.h
---- linux-2.6.25-rc9/include/asm-powerpc/exception.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/exception.h 2008-04-19 16:40:57.000000000 +0200
-@@ -228,18 +228,18 @@
+--- a/include/asm-powerpc/exception.h
++++ b/include/asm-powerpc/exception.h
+@@ -228,18 +228,18 @@ label##_pSeries: \
BEGIN_FW_FTR_SECTION; \
stb r11,PACAHARDIRQEN(r13); \
END_FW_FTR_SECTION_IFCLR(FW_FEATURE_ISERIES); \
#endif /* CONFIG_PPC_ISERIES */
#define ENABLE_INTS \
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/fsl_lbc.h powerpc.git/include/asm-powerpc/fsl_lbc.h
---- linux-2.6.25-rc9/include/asm-powerpc/fsl_lbc.h 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/fsl_lbc.h 2008-04-19 16:40:57.000000000 +0200
+--- /dev/null
++++ b/include/asm-powerpc/fsl_lbc.h
@@ -0,0 +1,311 @@
+/* Freescale Local Bus Controller
+ *
+}
+
+#endif /* __ASM_FSL_LBC_H */
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/gpio.h powerpc.git/include/asm-powerpc/gpio.h
---- linux-2.6.25-rc9/include/asm-powerpc/gpio.h 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/gpio.h 2008-04-19 16:40:57.000000000 +0200
+--- /dev/null
++++ b/include/asm-powerpc/gpio.h
@@ -0,0 +1,56 @@
+/*
+ * Generic GPIO API implementation for PowerPC.
+#endif /* CONFIG_HAVE_GPIO_LIB */
+
+#endif /* __ASM_POWERPC_GPIO_H */
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/hw_irq.h powerpc.git/include/asm-powerpc/hw_irq.h
---- linux-2.6.25-rc9/include/asm-powerpc/hw_irq.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/hw_irq.h 2008-04-19 16:40:57.000000000 +0200
-@@ -27,7 +27,7 @@
+--- a/include/asm-powerpc/hw_irq.h
++++ b/include/asm-powerpc/hw_irq.h
+@@ -27,7 +27,7 @@ static inline unsigned long local_get_fl
return flags;
}
{
unsigned long flags, zero;
-@@ -39,14 +39,15 @@
+@@ -39,14 +39,15 @@ static inline unsigned long local_irq_di
return flags;
}
#define __hard_irq_enable() __mtmsrd(mfmsr() | MSR_EE, 1)
#define __hard_irq_disable() __mtmsrd(mfmsr() & ~MSR_EE, 1)
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/immap_qe.h powerpc.git/include/asm-powerpc/immap_qe.h
---- linux-2.6.25-rc9/include/asm-powerpc/immap_qe.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/immap_qe.h 2008-04-19 16:40:57.000000000 +0200
+--- a/include/asm-powerpc/immap_qe.h
++++ b/include/asm-powerpc/immap_qe.h
@@ -20,6 +20,7 @@
#ifdef __KERNEL__
#define QE_IMMAP_SIZE (1024 * 1024) /* 1MB from 1MB+IMMR */
-@@ -468,7 +469,7 @@
+@@ -468,7 +469,7 @@ struct qe_immap {
u8 res18[0xC0000]; /* 0x140000 - 0x200000 */
} __attribute__ ((packed));
extern phys_addr_t get_qe_base(void);
static inline unsigned long immrbar_virt_to_phys(void *address)
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/irqflags.h powerpc.git/include/asm-powerpc/irqflags.h
---- linux-2.6.25-rc9/include/asm-powerpc/irqflags.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/irqflags.h 2008-04-19 16:40:57.000000000 +0200
+--- a/include/asm-powerpc/irqflags.h
++++ b/include/asm-powerpc/irqflags.h
@@ -2,30 +2,43 @@
* include/asm-powerpc/irqflags.h
*
#endif
#endif
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/iseries/alpaca.h powerpc.git/include/asm-powerpc/iseries/alpaca.h
---- linux-2.6.25-rc9/include/asm-powerpc/iseries/alpaca.h 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/iseries/alpaca.h 2008-04-19 16:40:57.000000000 +0200
+--- /dev/null
++++ b/include/asm-powerpc/iseries/alpaca.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright © 2008 Stephen Rothwell IBM Corporation
+};
+
+#endif /* _ASM_POWERPC_ISERIES_ALPACA_H */
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/iseries/it_lp_reg_save.h powerpc.git/include/asm-powerpc/iseries/it_lp_reg_save.h
---- linux-2.6.25-rc9/include/asm-powerpc/iseries/it_lp_reg_save.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/iseries/it_lp_reg_save.h 1970-01-01 01:00:00.000000000 +0100
+--- a/include/asm-powerpc/iseries/it_lp_reg_save.h
++++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2001 Mike Corrigan IBM Corporation
-extern struct ItLpRegSave iseries_reg_save[];
-
-#endif /* _ASM_POWERPC_ISERIES_IT_LP_REG_SAVE_H */
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/lmb.h powerpc.git/include/asm-powerpc/lmb.h
---- linux-2.6.25-rc9/include/asm-powerpc/lmb.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/lmb.h 2008-04-19 16:40:57.000000000 +0200
+--- a/include/asm-powerpc/lmb.h
++++ b/include/asm-powerpc/lmb.h
@@ -1,81 +1,15 @@
#ifndef _ASM_POWERPC_LMB_H
#define _ASM_POWERPC_LMB_H
-
-#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_LMB_H */
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/machdep.h powerpc.git/include/asm-powerpc/machdep.h
---- linux-2.6.25-rc9/include/asm-powerpc/machdep.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/machdep.h 2008-04-19 16:40:57.000000000 +0200
-@@ -68,6 +68,8 @@
+--- a/include/asm-powerpc/machdep.h
++++ b/include/asm-powerpc/machdep.h
+@@ -68,6 +68,8 @@ struct machdep_calls {
unsigned long vflags,
int psize, int ssize);
long (*hpte_remove)(unsigned long hpte_group);
void (*flush_hash_range)(unsigned long number, int local);
/* special for kexec, to be called in real mode, linar mapping is
-@@ -196,9 +198,6 @@
+@@ -196,9 +198,6 @@ struct machdep_calls {
May be NULL. */
void (*init)(void);
void (*kgdb_map_scc)(void);
/*
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/macio.h powerpc.git/include/asm-powerpc/macio.h
---- linux-2.6.25-rc9/include/asm-powerpc/macio.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/macio.h 2008-04-19 16:40:57.000000000 +0200
+--- a/include/asm-powerpc/macio.h
++++ b/include/asm-powerpc/macio.h
@@ -2,7 +2,7 @@
#define __MACIO_ASIC_H__
#ifdef __KERNEL__
extern struct bus_type macio_bus_type;
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/mmu-40x.h powerpc.git/include/asm-powerpc/mmu-40x.h
---- linux-2.6.25-rc9/include/asm-powerpc/mmu-40x.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/mmu-40x.h 2008-04-19 16:40:57.000000000 +0200
+--- a/include/asm-powerpc/mmu-40x.h
++++ b/include/asm-powerpc/mmu-40x.h
@@ -53,8 +53,6 @@
#ifndef __ASSEMBLY__
typedef struct {
unsigned long id;
unsigned long vdso_base;
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/mmu-44x.h powerpc.git/include/asm-powerpc/mmu-44x.h
---- linux-2.6.25-rc9/include/asm-powerpc/mmu-44x.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/mmu-44x.h 2008-04-19 16:40:57.000000000 +0200
+--- a/include/asm-powerpc/mmu-44x.h
++++ b/include/asm-powerpc/mmu-44x.h
@@ -53,8 +53,6 @@
#ifndef __ASSEMBLY__
typedef struct {
unsigned long id;
unsigned long vdso_base;
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/mmu-8xx.h powerpc.git/include/asm-powerpc/mmu-8xx.h
---- linux-2.6.25-rc9/include/asm-powerpc/mmu-8xx.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/mmu-8xx.h 2008-04-19 16:40:57.000000000 +0200
+--- a/include/asm-powerpc/mmu-8xx.h
++++ b/include/asm-powerpc/mmu-8xx.h
@@ -136,8 +136,6 @@
#define SPRN_M_TW 799
typedef struct {
unsigned long id;
unsigned long vdso_base;
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/mmu-fsl-booke.h powerpc.git/include/asm-powerpc/mmu-fsl-booke.h
---- linux-2.6.25-rc9/include/asm-powerpc/mmu-fsl-booke.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/mmu-fsl-booke.h 2008-04-19 16:40:57.000000000 +0200
+--- a/include/asm-powerpc/mmu-fsl-booke.h
++++ b/include/asm-powerpc/mmu-fsl-booke.h
@@ -73,12 +73,6 @@
#ifndef __ASSEMBLY__
typedef struct {
unsigned long id;
unsigned long vdso_base;
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/mmu-hash32.h powerpc.git/include/asm-powerpc/mmu-hash32.h
---- linux-2.6.25-rc9/include/asm-powerpc/mmu-hash32.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/mmu-hash32.h 2008-04-19 16:40:57.000000000 +0200
-@@ -84,8 +84,6 @@
+--- a/include/asm-powerpc/mmu-hash32.h
++++ b/include/asm-powerpc/mmu-hash32.h
+@@ -84,8 +84,6 @@ typedef struct {
unsigned long vdso_base;
} mm_context_t;
#endif /* !__ASSEMBLY__ */
#endif /* _ASM_POWERPC_MMU_HASH32_H_ */
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/mmu-hash64.h powerpc.git/include/asm-powerpc/mmu-hash64.h
---- linux-2.6.25-rc9/include/asm-powerpc/mmu-hash64.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/mmu-hash64.h 2008-04-19 16:40:57.000000000 +0200
-@@ -469,9 +469,6 @@
+--- a/include/asm-powerpc/mmu-hash64.h
++++ b/include/asm-powerpc/mmu-hash64.h
+@@ -469,9 +469,6 @@ static inline unsigned long get_vsid(uns
VSID_MODULUS_256M)
#define KERNEL_VSID(ea) VSID_SCRAMBLE(GET_ESID(ea))
#endif /* __ASSEMBLY__ */
#endif /* _ASM_POWERPC_MMU_HASH64_H_ */
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/paca.h powerpc.git/include/asm-powerpc/paca.h
---- linux-2.6.25-rc9/include/asm-powerpc/paca.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/paca.h 2008-04-19 16:40:57.000000000 +0200
-@@ -42,10 +42,7 @@
+--- a/include/asm-powerpc/paca.h
++++ b/include/asm-powerpc/paca.h
+@@ -42,10 +42,7 @@ struct task_struct;
* Defines the layout of the paca.
*
* This structure is not directly accessed by firmware or the service
*/
struct paca_struct {
/*
-@@ -55,14 +52,7 @@
+@@ -55,14 +52,7 @@ struct paca_struct {
* avoid cacheline bouncing.
*/
/*
* MAGIC: the spinlock functions in arch/powerpc/lib/locks.c
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/page.h powerpc.git/include/asm-powerpc/page.h
---- linux-2.6.25-rc9/include/asm-powerpc/page.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/page.h 2008-04-19 16:40:57.000000000 +0200
+--- a/include/asm-powerpc/page.h
++++ b/include/asm-powerpc/page.h
@@ -53,6 +53,7 @@
#define PAGE_OFFSET ASM_CONST(CONFIG_KERNEL_START)
#ifdef CONFIG_FLATMEM
#define pfn_valid(pfn) ((pfn) < max_mapnr)
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/page_32.h powerpc.git/include/asm-powerpc/page_32.h
---- linux-2.6.25-rc9/include/asm-powerpc/page_32.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/page_32.h 2008-04-19 16:40:57.000000000 +0200
+--- a/include/asm-powerpc/page_32.h
++++ b/include/asm-powerpc/page_32.h
@@ -3,8 +3,6 @@
#define VM_DATA_DEFAULT_FLAGS VM_DATA_DEFAULT_FLAGS32
#ifdef CONFIG_NOT_COHERENT_CACHE
#define ARCH_KMALLOC_MINALIGN L1_CACHE_BYTES
#endif
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/pasemi_dma.h powerpc.git/include/asm-powerpc/pasemi_dma.h
---- linux-2.6.25-rc9/include/asm-powerpc/pasemi_dma.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/pasemi_dma.h 2008-03-17 14:04:35.000000000 +0100
+--- a/include/asm-powerpc/pasemi_dma.h
++++ b/include/asm-powerpc/pasemi_dma.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006 PA Semi, Inc
*
* Hardware register layout and descriptor formats for the on-board
* DMA engine on PA Semi PWRficient. Used by ethernet, function and security
-@@ -40,6 +40,11 @@
+@@ -40,6 +40,11 @@ enum {
PAS_DMA_COM_TXSTA = 0x104, /* Transmit Status Register */
PAS_DMA_COM_RXCMD = 0x108, /* Receive Command Register */
PAS_DMA_COM_RXSTA = 0x10c, /* Receive Status Register */
};
-@@ -123,11 +128,16 @@
+@@ -123,11 +128,16 @@ enum {
#define PAS_DMA_TXCHAN_TCMDSTA_DA 0x00000100
#define PAS_DMA_TXCHAN_CFG(c) (0x304+(c)*_PAS_DMA_TXCHAN_STRIDE)
#define PAS_DMA_TXCHAN_CFG_TY_IFACE 0x00000000 /* Type = interface */
#define PAS_DMA_TXCHAN_CFG_WT_S 6
#define PAS_DMA_TXCHAN_CFG_WT(x) (((x) << PAS_DMA_TXCHAN_CFG_WT_S) & \
PAS_DMA_TXCHAN_CFG_WT_M)
-@@ -394,11 +404,62 @@
+@@ -394,11 +404,62 @@ enum {
XCT_COPY_LLEN_M)
#define XCT_COPY_SE 0x0000000000000001ull
#define CTRL_CMD_REG_S 0
#define CTRL_CMD_REG(x) ((((long)(x)) << CTRL_CMD_REG_S) & \
CTRL_CMD_REG_M)
-@@ -461,6 +522,16 @@
+@@ -461,6 +522,16 @@ extern void *pasemi_dma_alloc_buf(struct
extern void pasemi_dma_free_buf(struct pasemi_dmachan *chan, int size,
dma_addr_t *handle);
/* Initialize the library, must be called before any other functions */
extern int pasemi_dma_init(void);
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/pci-bridge.h powerpc.git/include/asm-powerpc/pci-bridge.h
---- linux-2.6.25-rc9/include/asm-powerpc/pci-bridge.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/pci-bridge.h 2008-04-19 16:40:57.000000000 +0200
-@@ -117,7 +117,7 @@
+--- a/include/asm-powerpc/pci-bridge.h
++++ b/include/asm-powerpc/pci-bridge.h
+@@ -117,7 +117,7 @@ struct pci_controller {
#ifndef CONFIG_PPC64
{
return bus->sysdata;
}
-@@ -235,7 +235,7 @@
+@@ -235,7 +235,7 @@ extern void pcibios_fixup_new_pci_device
extern int pcibios_remove_root_bus(struct pci_controller *phb);
{
struct device_node *busdn = bus->sysdata;
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/pgtable-ppc32.h powerpc.git/include/asm-powerpc/pgtable-ppc32.h
---- linux-2.6.25-rc9/include/asm-powerpc/pgtable-ppc32.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/pgtable-ppc32.h 2008-04-19 16:40:57.000000000 +0200
-@@ -98,9 +98,6 @@
+--- a/include/asm-powerpc/pgtable-ppc32.h
++++ b/include/asm-powerpc/pgtable-ppc32.h
+@@ -98,9 +98,6 @@ extern int icache_44x_need_flush;
#define USER_PTRS_PER_PGD (TASK_SIZE / PGDIR_SIZE)
#define FIRST_USER_ADDRESS 0
#define pte_ERROR(e) \
printk("%s:%d: bad pte %llx.\n", __FILE__, __LINE__, \
(unsigned long long)pte_val(e))
-@@ -420,7 +417,8 @@
+@@ -420,7 +417,8 @@ extern int icache_44x_need_flush;
#define _PAGE_IO (_PAGE_KERNEL | _PAGE_NO_CACHE | _PAGE_GUARDED)
#define _PAGE_RAM (_PAGE_KERNEL | _PAGE_HWEXEC)
/* We want the debuggers to be able to set breakpoints anywhere, so
* don't write protect the kernel text */
#define _PAGE_RAM_TEXT _PAGE_RAM
-@@ -692,7 +690,7 @@
+@@ -692,7 +690,7 @@ extern pgprot_t phys_mem_access_prot(str
#define pmd_page_vaddr(pmd) \
((unsigned long) (pmd_val(pmd) & PAGE_MASK))
#define pmd_page(pmd) \
#endif
/* to find an entry in a kernel page-table-directory */
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/phyp_dump.h powerpc.git/include/asm-powerpc/phyp_dump.h
---- linux-2.6.25-rc9/include/asm-powerpc/phyp_dump.h 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/phyp_dump.h 2008-04-19 16:40:57.000000000 +0200
+--- /dev/null
++++ b/include/asm-powerpc/phyp_dump.h
@@ -0,0 +1,47 @@
+/*
+ * Hypervisor-assisted dump
+
+#endif /* CONFIG_PHYP_DUMP */
+#endif /* _PPC64_PHYP_DUMP_H */
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/pmi.h powerpc.git/include/asm-powerpc/pmi.h
---- linux-2.6.25-rc9/include/asm-powerpc/pmi.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/pmi.h 2008-04-19 16:40:57.000000000 +0200
+--- a/include/asm-powerpc/pmi.h
++++ b/include/asm-powerpc/pmi.h
@@ -29,8 +29,6 @@
#ifdef __KERNEL__
#define PMI_TYPE_FREQ_CHANGE 0x01
#define PMI_READ_TYPE 0
#define PMI_READ_DATA0 1
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/ppc4xx.h powerpc.git/include/asm-powerpc/ppc4xx.h
---- linux-2.6.25-rc9/include/asm-powerpc/ppc4xx.h 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/ppc4xx.h 2008-04-19 16:40:57.000000000 +0200
+--- /dev/null
++++ b/include/asm-powerpc/ppc4xx.h
@@ -0,0 +1,18 @@
+/*
+ * PPC4xx Prototypes and definitions
+extern void ppc4xx_reset_system(char *cmd);
+
+#endif /* __ASM_POWERPC_PPC4xx_H__ */
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/ps3.h powerpc.git/include/asm-powerpc/ps3.h
---- linux-2.6.25-rc9/include/asm-powerpc/ps3.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/ps3.h 2008-04-19 16:40:57.000000000 +0200
-@@ -434,8 +434,11 @@
+--- a/include/asm-powerpc/ps3.h
++++ b/include/asm-powerpc/ps3.h
+@@ -434,8 +434,11 @@ struct ps3_sys_manager_ops {
};
void ps3_sys_manager_register_ops(const struct ps3_sys_manager_ops *ops);
struct ps3_prealloc {
const char *name;
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/ptrace.h powerpc.git/include/asm-powerpc/ptrace.h
---- linux-2.6.25-rc9/include/asm-powerpc/ptrace.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/ptrace.h 2008-04-19 16:40:57.000000000 +0200
-@@ -58,6 +58,11 @@
+--- a/include/asm-powerpc/ptrace.h
++++ b/include/asm-powerpc/ptrace.h
+@@ -58,6 +58,11 @@ struct pt_regs {
#define __ARCH_WANT_COMPAT_SYS_PTRACE
#define STACK_FRAME_OVERHEAD 112 /* size of minimum stack frame */
/* Size of dummy stack frame allocated when calling signal handler. */
#define __SIGNAL_FRAMESIZE 128
-@@ -66,6 +71,10 @@
+@@ -66,6 +71,10 @@ struct pt_regs {
#else /* __powerpc64__ */
#define STACK_FRAME_OVERHEAD 16 /* size of minimum stack frame */
/* Size of stack frame allocated when calling signal handler. */
#define __SIGNAL_FRAMESIZE 64
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/qe.h powerpc.git/include/asm-powerpc/qe.h
---- linux-2.6.25-rc9/include/asm-powerpc/qe.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/qe.h 2008-04-19 16:40:57.000000000 +0200
-@@ -85,6 +85,7 @@
+--- a/include/asm-powerpc/qe.h
++++ b/include/asm-powerpc/qe.h
+@@ -85,6 +85,7 @@ extern int par_io_data_set(u8 port, u8 p
/* QE internal API */
int qe_issue_cmd(u32 cmd, u32 device, u8 mcn_protocol, u32 cmd_input);
enum qe_clock qe_clock_source(const char *source);
int qe_setbrg(enum qe_clock brg, unsigned int rate, unsigned int multiplier);
int qe_get_snum(void);
void qe_put_snum(u8 snum);
-@@ -92,7 +93,16 @@
+@@ -92,7 +93,16 @@ unsigned long qe_muram_alloc(int size, i
int qe_muram_free(unsigned long offset);
unsigned long qe_muram_alloc_fixed(unsigned long offset, int size);
void qe_muram_dump(void);
/* Structure that defines QE firmware binary files.
*
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/rwsem.h powerpc.git/include/asm-powerpc/rwsem.h
---- linux-2.6.25-rc9/include/asm-powerpc/rwsem.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/rwsem.h 2008-04-19 16:40:57.000000000 +0200
-@@ -32,11 +32,20 @@
+--- a/include/asm-powerpc/rwsem.h
++++ b/include/asm-powerpc/rwsem.h
+@@ -32,11 +32,20 @@ struct rw_semaphore {
#define RWSEM_ACTIVE_WRITE_BIAS (RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS)
spinlock_t wait_lock;
struct list_head wait_list;
#define DECLARE_RWSEM(name) \
struct rw_semaphore name = __RWSEM_INITIALIZER(name)
-@@ -46,12 +55,15 @@
+@@ -46,12 +55,15 @@ extern struct rw_semaphore *rwsem_down_w
extern struct rw_semaphore *rwsem_wake(struct rw_semaphore *sem);
extern struct rw_semaphore *rwsem_downgrade_wake(struct rw_semaphore *sem);
/*
* lock for reading
-@@ -78,7 +90,7 @@
+@@ -78,7 +90,7 @@ static inline int __down_read_trylock(st
/*
* lock for writing
*/
{
int tmp;
-@@ -88,6 +100,11 @@
+@@ -88,6 +100,11 @@ static inline void __down_write(struct r
rwsem_down_write_failed(sem);
}
static inline int __down_write_trylock(struct rw_semaphore *sem)
{
int tmp;
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/sparsemem.h powerpc.git/include/asm-powerpc/sparsemem.h
---- linux-2.6.25-rc9/include/asm-powerpc/sparsemem.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/sparsemem.h 2008-04-19 16:40:57.000000000 +0200
+--- a/include/asm-powerpc/sparsemem.h
++++ b/include/asm-powerpc/sparsemem.h
@@ -15,6 +15,7 @@
#ifdef CONFIG_MEMORY_HOTPLUG
#ifdef CONFIG_NUMA
extern int hot_add_scn_to_nid(unsigned long scn_addr);
#else
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/spinlock.h powerpc.git/include/asm-powerpc/spinlock.h
---- linux-2.6.25-rc9/include/asm-powerpc/spinlock.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/spinlock.h 2008-04-19 16:40:57.000000000 +0200
+--- a/include/asm-powerpc/spinlock.h
++++ b/include/asm-powerpc/spinlock.h
@@ -19,6 +19,7 @@
*
* (the type definitions are in asm/spinlock_types.h)
#ifdef CONFIG_PPC64
#include <asm/paca.h>
#include <asm/hvcall.h>
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/string.h powerpc.git/include/asm-powerpc/string.h
---- linux-2.6.25-rc9/include/asm-powerpc/string.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/string.h 2008-04-19 16:40:57.000000000 +0200
+--- a/include/asm-powerpc/string.h
++++ b/include/asm-powerpc/string.h
@@ -7,6 +7,7 @@
#define __HAVE_ARCH_STRNCPY
#define __HAVE_ARCH_STRLEN
#define __HAVE_ARCH_STRCAT
#define __HAVE_ARCH_MEMSET
#define __HAVE_ARCH_MEMCPY
-@@ -18,6 +19,7 @@
+@@ -18,6 +19,7 @@ extern char * strcpy(char *,const char *
extern char * strncpy(char *,const char *, __kernel_size_t);
extern __kernel_size_t strlen(const char *);
extern int strcmp(const char *,const char *);
extern char * strcat(char *, const char *);
extern void * memset(void *,int,__kernel_size_t);
extern void * memcpy(void *,const void *,__kernel_size_t);
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-powerpc/types.h powerpc.git/include/asm-powerpc/types.h
---- linux-2.6.25-rc9/include/asm-powerpc/types.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/asm-powerpc/types.h 2008-04-19 16:40:57.000000000 +0200
-@@ -84,6 +84,13 @@
+--- a/include/asm-powerpc/types.h
++++ b/include/asm-powerpc/types.h
+@@ -84,6 +84,13 @@ typedef unsigned long long u64;
typedef __vector128 vector128;
#ifdef __powerpc64__
typedef u64 dma_addr_t;
#else
-diff -x .git -Nur linux-2.6.25-rc9/include/asm-sparc64/lmb.h powerpc.git/include/asm-sparc64/lmb.h
---- linux-2.6.25-rc9/include/asm-sparc64/lmb.h 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/include/asm-sparc64/lmb.h 2008-03-17 14:04:36.000000000 +0100
+--- /dev/null
++++ b/include/asm-sparc64/lmb.h
@@ -0,0 +1,10 @@
+#ifndef _SPARC64_LMB_H
+#define _SPARC64_LMB_H
+#define LMB_REAL_LIMIT 0
+
+#endif /* !(_SPARC64_LMB_H) */
-diff -x .git -Nur linux-2.6.25-rc9/include/linux/lmb.h powerpc.git/include/linux/lmb.h
---- linux-2.6.25-rc9/include/linux/lmb.h 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/include/linux/lmb.h 2008-04-19 16:40:57.000000000 +0200
+--- /dev/null
++++ b/include/linux/lmb.h
@@ -0,0 +1,85 @@
+#ifndef _LINUX_LMB_H
+#define _LINUX_LMB_H
+#endif /* __KERNEL__ */
+
+#endif /* _LINUX_LMB_H */
-diff -x .git -Nur linux-2.6.25-rc9/include/linux/of.h powerpc.git/include/linux/of.h
---- linux-2.6.25-rc9/include/linux/of.h 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/include/linux/of.h 2008-04-19 16:40:57.000000000 +0200
-@@ -62,6 +62,7 @@
+--- a/include/linux/of.h
++++ b/include/linux/of.h
+@@ -62,6 +62,7 @@ extern struct property *of_find_property
int *lenp);
extern int of_device_is_compatible(const struct device_node *device,
const char *);
extern const void *of_get_property(const struct device_node *node,
const char *name,
int *lenp);
-diff -x .git -Nur linux-2.6.25-rc9/include/linux/of_gpio.h powerpc.git/include/linux/of_gpio.h
---- linux-2.6.25-rc9/include/linux/of_gpio.h 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/include/linux/of_gpio.h 2008-04-19 16:40:57.000000000 +0200
+--- /dev/null
++++ b/include/linux/of_gpio.h
@@ -0,0 +1,69 @@
+/*
+ * OF helpers for the GPIO API
+#endif /* CONFIG_OF_GPIO */
+
+#endif /* __LINUX_OF_GPIO_H */
-diff -x .git -Nur linux-2.6.25-rc9/include/linux/of_i2c.h powerpc.git/include/linux/of_i2c.h
---- linux-2.6.25-rc9/include/linux/of_i2c.h 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/include/linux/of_i2c.h 2008-04-19 16:40:57.000000000 +0200
+--- /dev/null
++++ b/include/linux/of_i2c.h
@@ -0,0 +1,24 @@
+/*
+ * Generic I2C API implementation for PowerPC.
+#endif /* CONFIG_OF_I2C */
+
+#endif /* __LINUX_OF_I2C_H */
-diff -x .git -Nur linux-2.6.25-rc9/lib/Kconfig powerpc.git/lib/Kconfig
---- linux-2.6.25-rc9/lib/Kconfig 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/lib/Kconfig 2008-03-17 14:04:43.000000000 +0100
-@@ -141,4 +141,7 @@
+--- a/lib/Kconfig
++++ b/lib/Kconfig
+@@ -141,4 +141,7 @@ config HAS_DMA
config CHECK_SIGNATURE
bool
+ boolean
+
endmenu
-diff -x .git -Nur linux-2.6.25-rc9/lib/Makefile powerpc.git/lib/Makefile
---- linux-2.6.25-rc9/lib/Makefile 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/lib/Makefile 2008-03-17 14:04:43.000000000 +0100
-@@ -70,6 +70,8 @@
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -70,6 +70,8 @@ obj-$(CONFIG_FAULT_INJECTION) += fault-i
lib-$(CONFIG_GENERIC_BUG) += bug.o
hostprogs-y := gen_crc32table
clean-files := crc32table.h
-diff -x .git -Nur linux-2.6.25-rc9/lib/lmb.c powerpc.git/lib/lmb.c
---- linux-2.6.25-rc9/lib/lmb.c 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/lib/lmb.c 2008-04-19 16:40:59.000000000 +0200
+--- /dev/null
++++ b/lib/lmb.c
@@ -0,0 +1,428 @@
+/*
+ * Procedures for maintaining information about logical memory blocks.
projects / openwrt.git / blobdiff