-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
+--- a/Documentation/kernel-parameters.txt
++++ b/Documentation/kernel-parameters.txt
@@ -930,6 +930,8 @@
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
+--- a/Documentation/powerpc/booting-without-of.txt
++++ b/Documentation/powerpc/booting-without-of.txt
@@ -59,12 +59,39 @@
p) Freescale Synchronous Serial Interface
q) USB EHCI controllers
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
+--- a/arch/powerpc/Kconfig
++++ b/arch/powerpc/Kconfig
@@ -49,6 +49,19 @@
bool
default y
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
+--- a/arch/powerpc/Kconfig.debug
++++ b/arch/powerpc/Kconfig.debug
@@ -269,7 +269,7 @@
hex "CPM UART early debug transmit descriptor address"
depends on PPC_EARLY_DEBUG_CPM
default "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
+--- a/arch/powerpc/Makefile
++++ b/arch/powerpc/Makefile
@@ -71,13 +71,11 @@
LDFLAGS_vmlinux := -Bstatic
$(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
+--- a/arch/powerpc/boot/Makefile
++++ b/arch/powerpc/boot/Makefile
@@ -40,6 +40,7 @@
$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
# 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
+--- a/arch/powerpc/boot/bamboo.c
++++ b/arch/powerpc/boot/bamboo.c
@@ -33,7 +33,8 @@
ibm440ep_fixup_clocks(sysclk, 11059200, 25000000);
ibm4xx_sdram_fixup_memsize();
}
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"
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
+--- a/arch/powerpc/boot/cuboot-pq2.c
++++ b/arch/powerpc/boot/cuboot-pq2.c
@@ -128,7 +128,7 @@
u8 *soc_regs;
int i, len;
}
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
+--- a/arch/powerpc/boot/cuboot-rainier.c
++++ b/arch/powerpc/boot/cuboot-rainier.c
@@ -42,7 +42,8 @@
ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
}
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
+--- a/arch/powerpc/boot/cuboot-sequoia.c
++++ b/arch/powerpc/boot/cuboot-sequoia.c
@@ -42,7 +42,8 @@
ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
}
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
+--- a/arch/powerpc/boot/cuboot-taishan.c
++++ b/arch/powerpc/boot/cuboot-taishan.c
@@ -40,7 +40,8 @@
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
+--- a/arch/powerpc/boot/cuboot-warp.c
++++ b/arch/powerpc/boot/cuboot-warp.c
@@ -24,7 +24,7 @@
ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
ibm4xx_sdram_fixup_memsize();
}
-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
+--- a/arch/powerpc/boot/devtree.c
++++ b/arch/powerpc/boot/devtree.c
@@ -350,3 +350,23 @@
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
*
>;
};
};
-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
*
>;
};
};
-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
+--- a/arch/powerpc/boot/ebony.c
++++ b/arch/powerpc/boot/ebony.c
@@ -75,7 +75,8 @@
ibm440gp_fixup_clocks(sysclk, 6 * 1843200);
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
+--- a/arch/powerpc/boot/mpc52xx-psc.c
++++ b/arch/powerpc/boot/mpc52xx-psc.c
@@ -51,14 +51,9 @@
int mpc5200_psc_console_init(void *devp, struct serial_console_data *scdp)
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
+--- a/arch/powerpc/boot/mpsc.c
++++ b/arch/powerpc/boot/mpsc.c
@@ -141,7 +141,7 @@
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
+--- a/arch/powerpc/boot/mv64x60.c
++++ b/arch/powerpc/boot/mv64x60.c
@@ -535,7 +535,7 @@
u32 v[2];
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
+--- a/arch/powerpc/boot/mv64x60_i2c.c
++++ b/arch/powerpc/boot/mv64x60_i2c.c
@@ -185,7 +185,7 @@
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
+--- a/arch/powerpc/boot/ns16550.c
++++ b/arch/powerpc/boot/ns16550.c
@@ -55,15 +55,9 @@
int ns16550_console_init(void *devp, struct serial_console_data *scdp)
{
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
+--- a/arch/powerpc/boot/ops.h
++++ b/arch/powerpc/boot/ops.h
@@ -95,6 +95,7 @@
int dt_xlate_addr(void *node, u32 *buf, int buflen, unsigned long *xlated_addr);
int dt_is_compatible(void *node, const char *compat);
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
+--- a/arch/powerpc/boot/prpmc2800.c
++++ b/arch/powerpc/boot/prpmc2800.c
@@ -344,20 +344,20 @@
acc_bits);
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.
- . = __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"
((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
+--- a/arch/powerpc/boot/serial.c
++++ b/arch/powerpc/boot/serial.c
@@ -119,7 +119,7 @@
if (dt_is_compatible(devp, "ns16550"))
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
+--- a/arch/powerpc/boot/treeboot-walnut.c
++++ b/arch/powerpc/boot/treeboot-walnut.c
@@ -68,7 +68,7 @@
ibm4xx_quiesce_eth((u32 *)0xef600800, NULL);
ibm4xx_fixup_ebc_ranges("/plb/ebc");
}
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
+--- a/arch/powerpc/boot/wrapper
++++ b/arch/powerpc/boot/wrapper
@@ -174,7 +174,7 @@
*-mpc83*)
platformo=$object/cuboot-83xx.o
${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
#
# 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
#
# 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
#
# 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
+--- a/arch/powerpc/configs/maple_defconfig
++++ b/arch/powerpc/configs/maple_defconfig
@@ -333,7 +333,7 @@
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_STANDALONE=y
CONFIG_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
#
# 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
#
# 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
#
# 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
#
# 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
#
# 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
+--- a/arch/powerpc/kernel/Makefile
++++ b/arch/powerpc/kernel/Makefile
@@ -67,6 +67,7 @@
obj-$(CONFIG_SMP) += smp.o
obj-$(CONFIG_KPROBES) += kprobes.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>
#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
_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
+--- a/arch/powerpc/kernel/cputable.c
++++ b/arch/powerpc/kernel/cputable.c
@@ -36,6 +36,8 @@
extern void __setup_cpu_440gx(unsigned long offset, struct cpu_spec* spec);
extern void __setup_cpu_440grx(unsigned long offset, struct cpu_spec* spec);
* 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
+--- a/arch/powerpc/kernel/entry_32.S
++++ b/arch/powerpc/kernel/entry_32.S
@@ -110,9 +110,9 @@
stw r11,PT_REGS(r12)
#if defined(CONFIG_40x) || defined(CONFIG_BOOKE)
.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>
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>
* 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
+--- a/arch/powerpc/kernel/head_44x.S
++++ b/arch/powerpc/kernel/head_44x.S
@@ -211,7 +211,7 @@
SET_IVOR(12, WatchdogTimer);
SET_IVOR(13, DataTLBError);
/*
* 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>
/* 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 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
+--- a/arch/powerpc/kernel/head_fsl_booke.S
++++ b/arch/powerpc/kernel/head_fsl_booke.S
@@ -68,7 +68,9 @@
mr r29,r5
mr r28,r6
/*
* 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
+--- a/arch/powerpc/kernel/ibmebus.c
++++ b/arch/powerpc/kernel/ibmebus.c
@@ -183,7 +183,7 @@
ret = ibmebus_create_device(child);
if (ret) {
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
+--- a/arch/powerpc/kernel/iommu.c
++++ b/arch/powerpc/kernel/iommu.c
@@ -520,7 +520,7 @@
unsigned int order;
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
+--- a/arch/powerpc/kernel/irq.c
++++ b/arch/powerpc/kernel/irq.c
@@ -114,7 +114,7 @@
: : "r" (enable), "i" (offsetof(struct paca_struct, soft_enabled)));
}
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
+--- a/arch/powerpc/kernel/isa-bridge.c
++++ b/arch/powerpc/kernel/isa-bridge.c
@@ -80,13 +80,13 @@
* (size depending on dev->n_addr_cells)
* cell 5: the size of the range
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
+--- a/arch/powerpc/kernel/lparcfg.c
++++ b/arch/powerpc/kernel/lparcfg.c
@@ -226,7 +226,7 @@
unsigned char *local_buffer = kmalloc(SPLPAR_MAXLENGTH, GFP_KERNEL);
if (!local_buffer) {
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 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>
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
+--- a/arch/powerpc/kernel/process.c
++++ b/arch/powerpc/kernel/process.c
@@ -868,11 +868,6 @@
flush_spe_to_thread(current);
error = do_execve(filename, (char __user * __user *) a1,
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>
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
+--- a/arch/powerpc/kernel/prom_init.c
++++ b/arch/powerpc/kernel/prom_init.c
@@ -2240,6 +2240,14 @@
if (rv != PROM_ERROR && (strcmp(prop, "chrp") == 0))
prom_setprop(node, "/", "device_type", "efika", sizeof("efika"));
/* 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>
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
+--- a/arch/powerpc/kernel/rtas_flash.c
++++ b/arch/powerpc/kernel/rtas_flash.c
@@ -807,7 +807,7 @@
rtas_block_ctor);
if (!flash_block_cache) {
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
+--- a/arch/powerpc/kernel/rtas_pci.c
++++ b/arch/powerpc/kernel/rtas_pci.c
@@ -56,21 +56,6 @@
return 0;
}
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>
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
+--- a/arch/powerpc/kernel/setup_32.c
++++ b/arch/powerpc/kernel/setup_32.c
@@ -172,6 +172,18 @@
}
__setup("l2cr=", ppc_setup_l2cr);
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>
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
+--- a/arch/powerpc/kernel/sys_ppc32.c
++++ b/arch/powerpc/kernel/sys_ppc32.c
@@ -368,11 +368,6 @@
error = compat_do_execve(filename, compat_ptr(a1), compat_ptr(a2), regs);
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
+--- a/arch/powerpc/kernel/vio.c
++++ b/arch/powerpc/kernel/vio.c
@@ -139,7 +139,7 @@
*/
int vio_register_driver(struct vio_driver *viodrv)
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>
__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
+--- a/arch/powerpc/lib/rheap.c
++++ b/arch/powerpc/lib/rheap.c
@@ -54,7 +54,7 @@
new_blocks = max_blocks - info->max_blocks;
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
+--- a/arch/powerpc/lib/string.S
++++ b/arch/powerpc/lib/string.S
@@ -75,6 +75,20 @@
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
+--- a/arch/powerpc/math-emu/fabs.c
++++ b/arch/powerpc/math-emu/fabs.c
@@ -9,7 +9,7 @@
frD[1] = frB[1];
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
+--- a/arch/powerpc/math-emu/fadd.c
++++ b/arch/powerpc/math-emu/fadd.c
@@ -14,7 +14,7 @@
int ret = 0;
#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
+--- a/arch/powerpc/math-emu/fadds.c
++++ b/arch/powerpc/math-emu/fadds.c
@@ -15,7 +15,7 @@
int ret = 0;
#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
+--- a/arch/powerpc/math-emu/fcmpo.c
++++ b/arch/powerpc/math-emu/fcmpo.c
@@ -15,7 +15,7 @@
int ret = 0;
#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
+--- a/arch/powerpc/math-emu/fcmpu.c
++++ b/arch/powerpc/math-emu/fcmpu.c
@@ -14,7 +14,7 @@
long cmp;
#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
+--- a/arch/powerpc/math-emu/fctiw.c
++++ b/arch/powerpc/math-emu/fctiw.c
@@ -16,7 +16,7 @@
frD[1] = r;
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
+--- a/arch/powerpc/math-emu/fctiwz.c
++++ b/arch/powerpc/math-emu/fctiwz.c
@@ -23,7 +23,7 @@
__FPU_FPSCR = fpscr;
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
+--- a/arch/powerpc/math-emu/fdiv.c
++++ b/arch/powerpc/math-emu/fdiv.c
@@ -14,7 +14,7 @@
int ret = 0;
#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
+--- a/arch/powerpc/math-emu/fdivs.c
++++ b/arch/powerpc/math-emu/fdivs.c
@@ -15,7 +15,7 @@
int ret = 0;
#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
+--- a/arch/powerpc/math-emu/fmadd.c
++++ b/arch/powerpc/math-emu/fmadd.c
@@ -16,7 +16,7 @@
int ret = 0;
#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
+--- a/arch/powerpc/math-emu/fmadds.c
++++ b/arch/powerpc/math-emu/fmadds.c
@@ -17,7 +17,7 @@
int ret = 0;
#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
+--- a/arch/powerpc/math-emu/fmr.c
++++ b/arch/powerpc/math-emu/fmr.c
@@ -9,7 +9,7 @@
frD[1] = frB[1];
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
+--- a/arch/powerpc/math-emu/fmsub.c
++++ b/arch/powerpc/math-emu/fmsub.c
@@ -16,7 +16,7 @@
int ret = 0;
#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
+--- a/arch/powerpc/math-emu/fmsubs.c
++++ b/arch/powerpc/math-emu/fmsubs.c
@@ -17,7 +17,7 @@
int ret = 0;
#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
+--- a/arch/powerpc/math-emu/fmul.c
++++ b/arch/powerpc/math-emu/fmul.c
@@ -14,7 +14,7 @@
int ret = 0;
#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
+--- a/arch/powerpc/math-emu/fmuls.c
++++ b/arch/powerpc/math-emu/fmuls.c
@@ -15,7 +15,7 @@
int ret = 0;
#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
+--- a/arch/powerpc/math-emu/fnabs.c
++++ b/arch/powerpc/math-emu/fnabs.c
@@ -9,7 +9,7 @@
frD[1] = frB[1];
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
+--- a/arch/powerpc/math-emu/fneg.c
++++ b/arch/powerpc/math-emu/fneg.c
@@ -9,7 +9,7 @@
frD[1] = frB[1];
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
+--- a/arch/powerpc/math-emu/fnmadd.c
++++ b/arch/powerpc/math-emu/fnmadd.c
@@ -16,7 +16,7 @@
int ret = 0;
#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
+--- a/arch/powerpc/math-emu/fnmadds.c
++++ b/arch/powerpc/math-emu/fnmadds.c
@@ -17,7 +17,7 @@
int ret = 0;
#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
+--- a/arch/powerpc/math-emu/fnmsub.c
++++ b/arch/powerpc/math-emu/fnmsub.c
@@ -16,7 +16,7 @@
int ret = 0;
#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
+--- a/arch/powerpc/math-emu/fnmsubs.c
++++ b/arch/powerpc/math-emu/fnmsubs.c
@@ -17,7 +17,7 @@
int ret = 0;
#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
+--- a/arch/powerpc/math-emu/fres.c
++++ b/arch/powerpc/math-emu/fres.c
@@ -6,7 +6,7 @@
fres(void *frD, void *frB)
{
#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
+--- a/arch/powerpc/math-emu/frsp.c
++++ b/arch/powerpc/math-emu/frsp.c
@@ -12,7 +12,7 @@
FP_DECL_D(B);
#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
+--- a/arch/powerpc/math-emu/frsqrte.c
++++ b/arch/powerpc/math-emu/frsqrte.c
@@ -6,7 +6,7 @@
frsqrte(void *frD, void *frB)
{
#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
+--- a/arch/powerpc/math-emu/fsel.c
++++ b/arch/powerpc/math-emu/fsel.c
@@ -11,7 +11,7 @@
FP_DECL_D(A);
#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
+--- a/arch/powerpc/math-emu/fsqrt.c
++++ b/arch/powerpc/math-emu/fsqrt.c
@@ -13,7 +13,7 @@
int ret = 0;
#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
+--- a/arch/powerpc/math-emu/fsqrts.c
++++ b/arch/powerpc/math-emu/fsqrts.c
@@ -14,7 +14,7 @@
int ret = 0;
#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
+--- a/arch/powerpc/math-emu/fsub.c
++++ b/arch/powerpc/math-emu/fsub.c
@@ -14,7 +14,7 @@
int ret = 0;
#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
+--- a/arch/powerpc/math-emu/fsubs.c
++++ b/arch/powerpc/math-emu/fsubs.c
@@ -15,7 +15,7 @@
int ret = 0;
#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
+--- a/arch/powerpc/math-emu/lfd.c
++++ b/arch/powerpc/math-emu/lfd.c
@@ -11,7 +11,7 @@
if (copy_from_user(frD, ea, sizeof(double)))
return -EFAULT;
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
+--- a/arch/powerpc/math-emu/lfs.c
++++ b/arch/powerpc/math-emu/lfs.c
@@ -14,7 +14,7 @@
float f;
#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
+--- a/arch/powerpc/math-emu/mcrfs.c
++++ b/arch/powerpc/math-emu/mcrfs.c
@@ -10,7 +10,7 @@
u32 value, clear;
#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
+--- a/arch/powerpc/math-emu/mffs.c
++++ b/arch/powerpc/math-emu/mffs.c
@@ -10,7 +10,7 @@
frD[1] = __FPU_FPSCR;
#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
+--- a/arch/powerpc/math-emu/mtfsb0.c
++++ b/arch/powerpc/math-emu/mtfsb0.c
@@ -11,7 +11,7 @@
__FPU_FPSCR &= ~(1 << (31 - crbD));
#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
+--- a/arch/powerpc/math-emu/mtfsb1.c
++++ b/arch/powerpc/math-emu/mtfsb1.c
@@ -11,7 +11,7 @@
__FPU_FPSCR |= (1 << (31 - crbD));
#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
+--- a/arch/powerpc/math-emu/mtfsf.c
++++ b/arch/powerpc/math-emu/mtfsf.c
@@ -38,7 +38,7 @@
__FPU_FPSCR |= (frB[1] & mask);
#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
+--- a/arch/powerpc/math-emu/mtfsfi.c
++++ b/arch/powerpc/math-emu/mtfsfi.c
@@ -16,7 +16,7 @@
__FPU_FPSCR |= (IMM & 0xf) << ((7 - crfD) << 2);
#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
+--- a/arch/powerpc/math-emu/stfd.c
++++ b/arch/powerpc/math-emu/stfd.c
@@ -7,7 +7,7 @@
{
#if 0
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
+--- a/arch/powerpc/math-emu/stfiwx.c
++++ b/arch/powerpc/math-emu/stfiwx.c
@@ -6,7 +6,7 @@
stfiwx(u32 *frS, void *ea)
{
#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
+--- a/arch/powerpc/math-emu/stfs.c
++++ b/arch/powerpc/math-emu/stfs.c
@@ -15,7 +15,7 @@
int err;
#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
+--- a/arch/powerpc/mm/40x_mmu.c
++++ b/arch/powerpc/mm/40x_mmu.c
@@ -97,7 +97,7 @@
phys_addr_t p;
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
+--- a/arch/powerpc/mm/44x_mmu.c
++++ b/arch/powerpc/mm/44x_mmu.c
@@ -67,7 +67,7 @@
/* Pin in enough TLBs to cover any lowmem not covered by the
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
+--- a/arch/powerpc/mm/Makefile
++++ b/arch/powerpc/mm/Makefile
@@ -6,7 +6,7 @@
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>
+ __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>
#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>
/* 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>
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>
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
+--- a/arch/powerpc/mm/mmu_decl.h
++++ b/arch/powerpc/mm/mmu_decl.h
@@ -48,9 +48,11 @@
extern unsigned long ioremap_bot;
/* ...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
+--- a/arch/powerpc/mm/pgtable_32.c
++++ b/arch/powerpc/mm/pgtable_32.c
@@ -281,12 +281,13 @@
*/
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>
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
+--- a/arch/powerpc/oprofile/cell/spu_task_sync.c
++++ b/arch/powerpc/oprofile/cell/spu_task_sync.c
@@ -68,7 +68,7 @@
if (spu_num >= num_spu_nodes) {
printk(KERN_ERR "SPU_PROF: "
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
+--- a/arch/powerpc/oprofile/cell/vma_map.c
++++ b/arch/powerpc/oprofile/cell/vma_map.c
@@ -72,7 +72,7 @@
kzalloc(sizeof(struct vma_to_fileoffset_map), GFP_KERNEL);
if (!new) {
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
+--- a/arch/powerpc/oprofile/op_model_cell.c
++++ b/arch/powerpc/oprofile/op_model_cell.c
@@ -216,7 +216,7 @@
* failure to stop OProfile.
*/
}
/* 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>
+ .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
+ .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>
+ .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>
+ .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>
+ .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
+--- a/arch/powerpc/platforms/44x/Kconfig
++++ b/arch/powerpc/platforms/44x/Kconfig
@@ -67,6 +67,25 @@
See http://www.pikatechnologies.com/ and follow the "PIKA for Computer
Telephony Developers" link for more information.
# 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>
+ .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>
+ .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>
+ .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
+--- a/arch/powerpc/platforms/44x/misc_44x.S
++++ b/arch/powerpc/platforms/44x/misc_44x.S
@@ -44,14 +44,3 @@
sync
isync
- 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>
+ .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>
+ .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>
+ .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>
+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>
.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
+--- a/arch/powerpc/platforms/52xx/lite5200.c
++++ b/arch/powerpc/platforms/52xx/lite5200.c
@@ -63,7 +63,7 @@
of_node_put(np);
if (!cdm) {
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
+--- a/arch/powerpc/platforms/82xx/Kconfig
++++ b/arch/powerpc/platforms/82xx/Kconfig
@@ -11,7 +11,6 @@
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
+--- a/arch/powerpc/platforms/83xx/mpc837x_rdb.c
++++ b/arch/powerpc/platforms/83xx/mpc837x_rdb.c
@@ -46,6 +46,7 @@
static struct of_device_id mpc837x_ids[] = {
{ .type = "soc", },
{},
};
-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
+--- a/arch/powerpc/platforms/83xx/usb.c
++++ b/arch/powerpc/platforms/83xx/usb.c
@@ -129,7 +129,7 @@
if (immr_node && of_device_is_compatible(immr_node, "fsl,mpc8315-immr"))
clrsetbits_be32(immap + MPC83XX_SCCR_OFFS,
/* 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
+--- a/arch/powerpc/platforms/85xx/Kconfig
++++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -19,7 +19,6 @@
config MPC8560_ADS
bool "Freescale MPC8560 ADS"
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
+--- a/arch/powerpc/platforms/85xx/Makefile
++++ b/arch/powerpc/platforms/85xx/Makefile
@@ -10,3 +10,4 @@
obj-$(CONFIG_TQM85xx) += tqm85xx.o
obj-$(CONFIG_SBC8560) += sbc8560.o
obj-$(CONFIG_SBC8548) += sbc8548.o
+obj-$(CONFIG_KSI8560) += ksi8560.o
-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
+--- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c
++++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
@@ -165,7 +165,7 @@
int 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>
/*
* 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
+--- a/arch/powerpc/platforms/86xx/Kconfig
++++ b/arch/powerpc/platforms/86xx/Kconfig
@@ -11,6 +11,12 @@
help
This option enables support for the MPC8641 HPCN board.
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
+--- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
++++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
@@ -52,7 +52,7 @@
}
machine_device_initcall(mpc86xx_hpcd, mpc8610_declare_of_platform_devices);
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
+--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
++++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -55,7 +55,7 @@
}
#endif /* CONFIG_PCI */
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
+--- a/arch/powerpc/platforms/8xx/Kconfig
++++ b/arch/powerpc/platforms/8xx/Kconfig
@@ -18,7 +18,6 @@
config MPC86XADS
bool "MPC86XADS"
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
+--- a/arch/powerpc/platforms/8xx/m8xx_setup.c
++++ b/arch/powerpc/platforms/8xx/m8xx_setup.c
@@ -111,17 +111,12 @@
/* 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
+--- a/arch/powerpc/platforms/Kconfig
++++ b/arch/powerpc/platforms/Kconfig
@@ -290,13 +290,7 @@
config PPC_CPM_NEW_BINDING
bool
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
+--- a/arch/powerpc/platforms/Kconfig.cputype
++++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -41,11 +41,13 @@
bool "AMCC 40x"
select PPC_DCR_NATIVE
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>
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
+--- a/arch/powerpc/platforms/cell/pervasive.c
++++ b/arch/powerpc/platforms/cell/pervasive.c
@@ -65,7 +65,7 @@
break;
default:
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
+--- a/arch/powerpc/platforms/cell/ras.c
++++ b/arch/powerpc/platforms/cell/ras.c
@@ -132,7 +132,7 @@
(unsigned int)(addr >> 32),
(unsigned int)(addr & 0xffffffff))) {
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
+--- a/arch/powerpc/platforms/cell/spu_base.c
++++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -165,7 +165,7 @@
struct spu_slb slb;
int psize;
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
+--- a/arch/powerpc/platforms/cell/spu_callbacks.c
++++ b/arch/powerpc/platforms/cell/spu_callbacks.c
@@ -54,7 +54,7 @@
long (*syscall)(u64 a1, u64 a2, u64 a3, u64 a4, u64 a5, u64 a6);
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
+--- a/arch/powerpc/platforms/cell/spu_manage.c
++++ b/arch/powerpc/platforms/cell/spu_manage.c
@@ -92,7 +92,7 @@
tmp = of_get_property(np->parent->parent, "node-id", NULL);
}
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
+--- a/arch/powerpc/platforms/cell/spufs/coredump.c
++++ b/arch/powerpc/platforms/cell/spufs/coredump.c
@@ -133,8 +133,6 @@
if (ctx->flags & SPU_CREATE_NOSCHED)
continue;
}
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
+--- a/arch/powerpc/platforms/cell/spufs/file.c
++++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -1337,7 +1337,7 @@
return ctx->ops->signal1_type_get(ctx);
}
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
+--- a/arch/powerpc/platforms/cell/spufs/run.c
++++ b/arch/powerpc/platforms/cell/spufs/run.c
@@ -98,7 +98,7 @@
!= MFC_CNTL_PURGE_DMA_COMPLETE) {
if (time_after(jiffies, timeout)) {
/* 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
+--- a/arch/powerpc/platforms/cell/spufs/switch.c
++++ b/arch/powerpc/platforms/cell/spufs/switch.c
@@ -1815,6 +1815,7 @@
save_mfc_csr_ato(prev, spu); /* Step 24. */
save_mfc_tclass_id(prev, spu); /* Step 25. */
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
+--- a/arch/powerpc/platforms/celleb/beat.c
++++ b/arch/powerpc/platforms/celleb/beat.c
@@ -48,6 +48,7 @@
}
-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
+--- a/arch/powerpc/platforms/celleb/beat_wrapper.h
++++ b/arch/powerpc/platforms/celleb/beat_wrapper.h
@@ -197,7 +197,8 @@
u64 b[2];
}
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"
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
+--- a/arch/powerpc/platforms/celleb/interrupt.c
++++ b/arch/powerpc/platforms/celleb/interrupt.c
@@ -34,7 +34,7 @@
static uint64_t beatic_irq_mask_enable[(MAX_IRQS+255)/64];
static uint64_t beatic_irq_mask_ack[(MAX_IRQS+255)/64];
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
+--- a/arch/powerpc/platforms/celleb/scc_epci.c
++++ b/arch/powerpc/platforms/celleb/scc_epci.c
@@ -161,9 +161,9 @@
if (bus != hose->bus)
addr = celleb_epci_get_epci_cfg(hose) +
{
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
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
+--- a/arch/powerpc/platforms/celleb/spu_priv1.c
++++ b/arch/powerpc/platforms/celleb/spu_priv1.c
@@ -183,8 +183,7 @@
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
+--- a/arch/powerpc/platforms/celleb/udbg_beat.c
++++ b/arch/powerpc/platforms/celleb/udbg_beat.c
@@ -54,7 +54,8 @@
if (inbuflen == 0) {
/* get some more chars. */
;
} 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
+--- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
++++ b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
@@ -117,11 +117,11 @@
}
(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
+--- a/arch/powerpc/platforms/embedded6xx/prpmc2800.c
++++ b/arch/powerpc/platforms/embedded6xx/prpmc2800.c
@@ -49,13 +49,13 @@
* ioremap mpp and gpp registers in case they are later
* needed by prpmc2800_reset_board().
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
+--- a/arch/powerpc/platforms/iseries/ipl_parms.h
++++ b/arch/powerpc/platforms/iseries/ipl_parms.h
@@ -65,6 +65,4 @@
u64 xRsvd13; // Reserved x38-x3F
};
-extern struct ItIplParmsReal xItIplParmsReal;
-
#endif /* _ISERIES_IPL_PARMS_H */
-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>
- .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
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
+--- a/arch/powerpc/platforms/iseries/release_data.h
++++ b/arch/powerpc/platforms/iseries/release_data.h
@@ -58,6 +58,6 @@
char xRsvd3[20]; /* Reserved x2C-x3F */
};
+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
+--- a/arch/powerpc/platforms/iseries/spcomm_area.h
++++ b/arch/powerpc/platforms/iseries/spcomm_area.h
@@ -31,6 +31,4 @@
u8 xRsvd2[80]; // Reserved 030-07F
};
-extern struct SpCommArea xSpCommArea;
-
#endif /* _ISERIES_SPCOMM_AREA_H */
-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
+--- a/arch/powerpc/platforms/iseries/vpd_areas.h
++++ b/arch/powerpc/platforms/iseries/vpd_areas.h
@@ -80,9 +80,9 @@
u32 xPlicDmaLens[ItDmaMaxEntries];// Array of DMA lengths 080-0A7
u32 xPlicDmaToks[ItDmaMaxEntries];// Array of DMA tokens 0A8-0CF
+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
+--- a/arch/powerpc/platforms/maple/pci.c
++++ b/arch/powerpc/platforms/maple/pci.c
@@ -592,50 +592,3 @@
}
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>
.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
*/
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
}
/* 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
+--- a/arch/powerpc/platforms/ps3/device-init.c
++++ b/arch/powerpc/platforms/ps3/device-init.c
@@ -499,41 +499,14 @@
}
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
+--- a/arch/powerpc/platforms/ps3/interrupt.c
++++ b/arch/powerpc/platforms/ps3/interrupt.c
@@ -709,7 +709,7 @@
asm volatile("cntlzd %0,%1" : "=r" (plug) : "r" (x));
plug &= 0x3f;
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
+--- a/arch/powerpc/platforms/ps3/setup.c
++++ b/arch/powerpc/platforms/ps3/setup.c
@@ -95,6 +95,14 @@
ps3_sys_manager_power_off(); /* never returns */
}
#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>
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
+--- a/arch/powerpc/platforms/pseries/Makefile
++++ b/arch/powerpc/platforms/pseries/Makefile
@@ -18,3 +18,4 @@
obj-$(CONFIG_HVC_CONSOLE) += hvconsole.o
obj-$(CONFIG_HVCS) += hvcserver.o
obj-$(CONFIG_HCALL_STATS) += hvCall_inst.o
+obj-$(CONFIG_PHYP_DUMP) += phyp_dump.o
-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
+--- a/arch/powerpc/platforms/pseries/eeh.c
++++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -945,7 +945,6 @@
unsigned int rets[3];
struct eeh_early_enable_info *info = data;
/* 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>
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
+--- a/arch/powerpc/platforms/pseries/pci_dlpar.c
++++ b/arch/powerpc/platforms/pseries/pci_dlpar.c
@@ -123,7 +123,7 @@
/* Add to children of PCI bridge dev->bus */
child_bus = pci_add_new_bus(dev->bus, dev, sec_busno);
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
+--- a/arch/powerpc/platforms/pseries/pseries.h
++++ b/arch/powerpc/platforms/pseries/pseries.h
@@ -38,4 +38,6 @@
/* Poweron flag used for enabling auto ups restart */
extern unsigned long rtas_poweron_auto;
+extern void find_udbg_vterm(void);
+
#endif /* _PSERIES_PSERIES_H */
-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
+--- a/arch/powerpc/platforms/pseries/reconfig.c
++++ b/arch/powerpc/platforms/pseries/reconfig.c
@@ -222,14 +222,14 @@
tmp = strchr(buf, ' ');
if (!tmp) {
return NULL;
}
tmp++;
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/scanlog.c powerpc.git/arch/powerpc/platforms/pseries/scanlog.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/pseries/scanlog.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/pseries/scanlog.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/pseries/scanlog.c
++++ b/arch/powerpc/platforms/pseries/scanlog.c
@@ -195,31 +195,30 @@
static int __init scanlog_init(void)
{
}
static void __exit scanlog_cleanup(void)
-diff -x .git -Nur linux-2.6.25-rc9/arch/powerpc/platforms/pseries/setup.c powerpc.git/arch/powerpc/platforms/pseries/setup.c
---- linux-2.6.25-rc9/arch/powerpc/platforms/pseries/setup.c 2008-04-11 22:32:29.000000000 +0200
-+++ powerpc.git/arch/powerpc/platforms/pseries/setup.c 2008-04-19 16:40:52.000000000 +0200
+--- a/arch/powerpc/platforms/pseries/setup.c
++++ b/arch/powerpc/platforms/pseries/setup.c
@@ -76,9 +76,6 @@
#define DBG(fmt...)
#endif
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
+--- a/arch/powerpc/platforms/pseries/xics.c
++++ b/arch/powerpc/platforms/pseries/xics.c
@@ -516,6 +516,8 @@
.set_affinity = xics_set_affinity
};
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
+--- a/arch/powerpc/platforms/pseries/xics.h
++++ b/arch/powerpc/platforms/pseries/xics.h
@@ -28,7 +28,4 @@
extern struct xics_ipi_struct xics_ipi_message[NR_CPUS] __cacheline_aligned;
-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
+--- a/arch/powerpc/sysdev/Makefile
++++ b/arch/powerpc/sysdev/Makefile
@@ -12,6 +12,7 @@
obj-$(CONFIG_MMIO_NVRAM) += mmio_nvram.o
obj-$(CONFIG_FSL_SOC) += fsl_soc.o
obj-$(CONFIG_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)
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>
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
+--- a/arch/powerpc/sysdev/cpm_common.c
++++ b/arch/powerpc/sysdev/cpm_common.c
@@ -58,7 +58,6 @@
}
#endif
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
+--- a/arch/powerpc/sysdev/fsl_soc.c
++++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -75,6 +75,33 @@
EXPORT_SYMBOL(get_immrbase);
}
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
+--- a/arch/powerpc/sysdev/mpic.c
++++ b/arch/powerpc/sysdev/mpic.c
@@ -175,13 +175,16 @@
switch(type) {
#ifdef CONFIG_PPC_DCR
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
+--- a/arch/powerpc/sysdev/mv64x60_dev.c
++++ b/arch/powerpc/sysdev/mv64x60_dev.c
@@ -127,7 +127,7 @@
if (err)
return err;
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
+--- a/arch/powerpc/sysdev/mv64x60_pci.c
++++ b/arch/powerpc/sysdev/mv64x60_pci.c
@@ -86,14 +86,14 @@
struct platform_device *pdev;
const unsigned int *prop;
+ 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
+--- a/arch/powerpc/sysdev/mv64x60_pic.c
++++ b/arch/powerpc/sysdev/mv64x60_pic.c
@@ -238,13 +238,13 @@
const unsigned int *reg;
unsigned long flags;
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
+--- a/arch/powerpc/sysdev/mv64x60_udbg.c
++++ b/arch/powerpc/sysdev/mv64x60_udbg.c
@@ -85,7 +85,7 @@
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
+--- a/arch/powerpc/sysdev/ppc4xx_pci.c
++++ b/arch/powerpc/sysdev/ppc4xx_pci.c
@@ -527,6 +527,7 @@
*
* ibm,plb-pciex-440spe
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
+--- a/arch/powerpc/sysdev/qe_lib/qe.c
++++ b/arch/powerpc/sysdev/qe_lib/qe.c
@@ -55,7 +55,7 @@
/* We allocate this here because it is used almost exclusively for
* the communication processor devices.
/* 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>
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
+--- a/arch/powerpc/sysdev/qe_lib/ucc_fast.c
++++ b/arch/powerpc/sysdev/qe_lib/ucc_fast.c
@@ -148,57 +148,57 @@
/* check if the UCC port number is in range. */
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
+--- a/arch/powerpc/sysdev/qe_lib/ucc_slow.c
++++ b/arch/powerpc/sysdev/qe_lib/ucc_slow.c
@@ -142,7 +142,7 @@
/* check if the UCC port number is in range. */
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
+--- a/arch/powerpc/sysdev/rtc_cmos_setup.c
++++ b/arch/powerpc/sysdev/rtc_cmos_setup.c
@@ -56,3 +56,5 @@
return 0;
}
fs_initcall(add_rtc);
+
+MODULE_LICENSE("GPL");
-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
+--- a/arch/powerpc/sysdev/tsi108_dev.c
++++ b/arch/powerpc/sysdev/tsi108_dev.c
@@ -84,7 +84,7 @@
ret = of_address_to_resource(np, 0, &r[0]);
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
+--- a/arch/powerpc/sysdev/tsi108_pci.c
++++ b/arch/powerpc/sysdev/tsi108_pci.c
@@ -207,7 +207,7 @@
/* PCI Config mapping */
tsi108_pci_cfg_base = (u32)ioremap(cfg_phys, TSI108_PCI_CFG_SIZE);
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
-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
+--- a/arch/ppc/8xx_io/fec.c
++++ b/arch/ppc/8xx_io/fec.c
@@ -520,7 +520,7 @@
#ifdef CONFIG_USE_MDIO
fec_enet_mii(dev);
#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
+--- a/arch/ppc/kernel/head.S
++++ b/arch/ppc/kernel/head.S
@@ -701,23 +701,6 @@
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
+--- a/arch/ppc/mm/init.c
++++ b/arch/ppc/mm/init.c
@@ -109,7 +109,6 @@
printk("Mem-info:\n");
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
+--- a/arch/ppc/platforms/radstone_ppc7d.c
++++ b/arch/ppc/platforms/radstone_ppc7d.c
@@ -512,7 +512,7 @@
{
int irq;
}
/* 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
+--- a/arch/ppc/syslib/mpc52xx_setup.c
++++ b/arch/ppc/syslib/mpc52xx_setup.c
@@ -279,7 +279,7 @@
int mpc52xx_set_psc_clkdiv(int psc_id, int clkdiv)
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
+--- a/arch/sparc64/Kconfig
++++ b/arch/sparc64/Kconfig
@@ -16,6 +16,7 @@
bool
default y
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
+--- a/drivers/block/viodasd.c
++++ b/drivers/block/viodasd.c
@@ -69,7 +69,7 @@
enum {
PARTITION_SHIFT = 3,
};
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
+--- a/drivers/char/hvc_beat.c
++++ b/drivers/char/hvc_beat.c
@@ -78,8 +78,8 @@
for (rest = cnt; rest > 0; rest -= nlen) {
nlen = (rest > 16) ? 16 : rest;
}
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 @@
/**
}
/**
-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"
+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 */
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
+--- a/drivers/char/xilinx_hwicap/fifo_icap.h
++++ b/drivers/char/xilinx_hwicap/fifo_icap.h
@@ -56,6 +56,7 @@
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 @@
*****************************************************************************/
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
+--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.h
++++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.h
@@ -65,10 +65,27 @@
};
/**
* 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>
__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_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
+--- a/drivers/net/iseries_veth.c
++++ b/drivers/net/iseries_veth.c
@@ -308,7 +308,8 @@
static int veth_allocate_events(HvLpIndex rlp, int number)
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
*/
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>
+
#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
+--- a/drivers/net/ps3_gelic_net.c
++++ b/drivers/net/ps3_gelic_net.c
@@ -1266,6 +1266,85 @@
return 0;
}
};
/**
-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
+--- a/drivers/net/ps3_gelic_net.h
++++ b/drivers/net/ps3_gelic_net.h
@@ -182,12 +182,32 @@
GELIC_LV1_GET_ETH_PORT_STATUS = 2,
GELIC_LV1_SET_NEGOTIATION_MODE = 3,
/* 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 @@
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
+--- a/drivers/net/ucc_geth_mii.c
++++ b/drivers/net/ucc_geth_mii.c
@@ -203,9 +203,14 @@
if ((res.start >= tempres.start) &&
(res.end <= tempres.end)) {
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
+--- a/drivers/of/base.c
++++ b/drivers/of/base.c
@@ -117,6 +117,32 @@
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>
/**
* 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 @@
*/
+ 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
+--- a/drivers/serial/cpm_uart/cpm_uart.h
++++ b/drivers/serial/cpm_uart/cpm_uart.h
@@ -92,6 +92,9 @@
/* these are located in their respective files */
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
+--- a/drivers/serial/cpm_uart/cpm_uart_core.c
++++ b/drivers/serial/cpm_uart/cpm_uart_core.c
@@ -966,24 +966,23 @@
if (!mem)
return -ENOMEM;
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>
#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>
#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
+--- a/drivers/serial/of_serial.c
++++ b/drivers/serial/of_serial.c
@@ -56,7 +56,9 @@
port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP
| UPF_FIXED_PORT;
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
+--- a/drivers/serial/ucc_uart.c
++++ b/drivers/serial/ucc_uart.c
@@ -1270,10 +1270,18 @@
/* Get the UCC number (device ID) */
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
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
+--- a/include/asm-powerpc/bitops.h
++++ b/include/asm-powerpc/bitops.h
@@ -312,24 +312,26 @@
asm ("cntlzw %0,%1" : "=r" (lz) : "r" (x));
return 32 - lz;
/* 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
+--- a/include/asm-powerpc/cputhreads.h
++++ b/include/asm-powerpc/cputhreads.h
@@ -35,7 +35,7 @@
res = CPU_MASK_NONE;
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
+--- a/include/asm-powerpc/dcr-native.h
++++ b/include/asm-powerpc/dcr-native.h
@@ -82,6 +82,19 @@
spin_unlock_irqrestore(&dcr_ind_lock, flags);
}
#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
+--- a/include/asm-powerpc/exception.h
++++ b/include/asm-powerpc/exception.h
@@ -228,18 +228,18 @@
BEGIN_FW_FTR_SECTION; \
stb r11,PACAHARDIRQEN(r13); \
#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
+--- a/include/asm-powerpc/hw_irq.h
++++ b/include/asm-powerpc/hw_irq.h
@@ -27,7 +27,7 @@
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__
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
+--- a/include/asm-powerpc/machdep.h
++++ b/include/asm-powerpc/machdep.h
@@ -68,6 +68,8 @@
unsigned long vflags,
int psize, int ssize);
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
+--- a/include/asm-powerpc/mmu-hash32.h
++++ b/include/asm-powerpc/mmu-hash32.h
@@ -84,8 +84,6 @@
unsigned long vdso_base;
} mm_context_t;
#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
+--- a/include/asm-powerpc/mmu-hash64.h
++++ b/include/asm-powerpc/mmu-hash64.h
@@ -469,9 +469,6 @@
VSID_MODULUS_256M)
#define KERNEL_VSID(ea) VSID_SCRAMBLE(GET_ESID(ea))
#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
+--- a/include/asm-powerpc/paca.h
++++ b/include/asm-powerpc/paca.h
@@ -42,10 +42,7 @@
* Defines the layout of the paca.
*
/*
* 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
/* 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
+--- a/include/asm-powerpc/pci-bridge.h
++++ b/include/asm-powerpc/pci-bridge.h
@@ -117,7 +117,7 @@
#ifndef CONFIG_PPC64
{
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
+--- a/include/asm-powerpc/pgtable-ppc32.h
++++ b/include/asm-powerpc/pgtable-ppc32.h
@@ -98,9 +98,6 @@
#define USER_PTRS_PER_PGD (TASK_SIZE / PGDIR_SIZE)
#define FIRST_USER_ADDRESS 0
#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
+--- a/include/asm-powerpc/ps3.h
++++ b/include/asm-powerpc/ps3.h
@@ -434,8 +434,11 @@
};
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
+--- a/include/asm-powerpc/ptrace.h
++++ b/include/asm-powerpc/ptrace.h
@@ -58,6 +58,11 @@
#define __ARCH_WANT_COMPAT_SYS_PTRACE
/* 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
+--- a/include/asm-powerpc/qe.h
++++ b/include/asm-powerpc/qe.h
@@ -85,6 +85,7 @@
/* QE internal API */
int qe_issue_cmd(u32 cmd, u32 device, u8 mcn_protocol, u32 cmd_input);
/* 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
+--- a/include/asm-powerpc/rwsem.h
++++ b/include/asm-powerpc/rwsem.h
@@ -32,11 +32,20 @@
#define RWSEM_ACTIVE_WRITE_BIAS (RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS)
spinlock_t wait_lock;
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
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
+--- a/include/asm-powerpc/types.h
++++ b/include/asm-powerpc/types.h
@@ -84,6 +84,13 @@
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
+--- a/include/linux/of.h
++++ b/include/linux/of.h
@@ -62,6 +62,7 @@
int *lenp);
extern int of_device_is_compatible(const struct device_node *device,
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
+--- a/lib/Kconfig
++++ b/lib/Kconfig
@@ -141,4 +141,7 @@
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
+--- a/lib/Makefile
++++ b/lib/Makefile
@@ -70,6 +70,8 @@
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