[kernel] r11039 - in dists/trunk/linux-2.6/debian/patches: bugfix/all series
Maximilian Attems
maks at alioth.debian.org
Fri Apr 4 11:43:32 UTC 2008
Author: maks
Date: Fri Apr 4 11:42:24 2008
New Revision: 11039
Log:
update to 2.6.25-rc8-git3
no new conflicts, mostly ppc merge.
Added:
dists/trunk/linux-2.6/debian/patches/bugfix/all/patch-2.6.25-rc8-git3
- copied, changed from r11034, /dists/trunk/linux-2.6/debian/patches/bugfix/all/patch-2.6.25-rc8-git2
Removed:
dists/trunk/linux-2.6/debian/patches/bugfix/all/patch-2.6.25-rc8-git2
Modified:
dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
Copied: dists/trunk/linux-2.6/debian/patches/bugfix/all/patch-2.6.25-rc8-git3 (from r11034, /dists/trunk/linux-2.6/debian/patches/bugfix/all/patch-2.6.25-rc8-git2)
==============================================================================
--- /dists/trunk/linux-2.6/debian/patches/bugfix/all/patch-2.6.25-rc8-git2 (original)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/patch-2.6.25-rc8-git3 Fri Apr 4 11:42:24 2008
@@ -650,6 +650,920 @@
/* Free and unmap a consistent DMA buffer. CPU_ADDR and DMA_ADDR must
be values that were returned from pci_alloc_consistent. SIZE must
+diff --git a/arch/powerpc/boot/dts/cm5200.dts b/arch/powerpc/boot/dts/cm5200.dts
+index 30737ea..c6ca631 100644
+--- a/arch/powerpc/boot/dts/cm5200.dts
++++ b/arch/powerpc/boot/dts/cm5200.dts
+@@ -212,13 +212,30 @@
+ ethernet at 3000 {
+ device_type = "network";
+ compatible = "fsl,mpc5200b-fec","fsl,mpc5200-fec";
+- reg = <3000 800>;
++ reg = <3000 400>;
+ local-mac-address = [ 00 00 00 00 00 00 ];
+ interrupts = <2 5 0>;
+ interrupt-parent = <&mpc5200_pic>;
++ phy-handle = <&phy0>;
++ };
++
++ mdio at 3000 {
++ #address-cells = <1>;
++ #size-cells = <0>;
++ compatible = "fsl,mpc5200b-mdio","fsl,mpc5200-mdio";
++ reg = <3000 400>; // fec range, since we need to setup fec interrupts
++ interrupts = <2 5 0>; // these are for "mii command finished", not link changes & co.
++ interrupt-parent = <&mpc5200_pic>;
++
++ phy0: ethernet-phy at 0 {
++ device_type = "ethernet-phy";
++ reg = <0>;
++ };
+ };
+
+ i2c at 3d40 {
++ #address-cells = <1>;
++ #size-cells = <0>;
+ compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c";
+ reg = <3d40 40>;
+ interrupts = <2 10 0>;
+@@ -231,4 +248,22 @@
+ reg = <8000 4000>;
+ };
+ };
++
++ lpb {
++ model = "fsl,lpb";
++ compatible = "fsl,lpb";
++ #address-cells = <2>;
++ #size-cells = <1>;
++ ranges = <0 0 fc000000 2000000>;
++
++ // 16-bit flash device at LocalPlus Bus CS0
++ flash at 0,0 {
++ compatible = "cfi-flash";
++ reg = <0 0 2000000>;
++ bank-width = <2>;
++ device-width = <2>;
++ #size-cells = <1>;
++ #address-cells = <1>;
++ };
++ };
+ };
+diff --git a/arch/powerpc/boot/dts/lite5200.dts b/arch/powerpc/boot/dts/lite5200.dts
+index 0d701c1..09b4e16 100644
+--- a/arch/powerpc/boot/dts/lite5200.dts
++++ b/arch/powerpc/boot/dts/lite5200.dts
+@@ -258,6 +258,21 @@
+ local-mac-address = [ 00 00 00 00 00 00 ];
+ interrupts = <2 5 0>;
+ interrupt-parent = <&mpc5200_pic>;
++ phy-handle = <&phy0>;
++ };
++
++ mdio at 3000 {
++ #address-cells = <1>;
++ #size-cells = <0>;
++ compatible = "fsl,mpc5200-mdio";
++ reg = <3000 400>; // fec range, since we need to setup fec interrupts
++ interrupts = <2 5 0>; // these are for "mii command finished", not link changes & co.
++ interrupt-parent = <&mpc5200_pic>;
++
++ phy0:ethernet-phy at 1 {
++ device_type = "ethernet-phy";
++ reg = <1>;
++ };
+ };
+
+ ata at 3a00 {
+diff --git a/arch/powerpc/boot/dts/motionpro.dts b/arch/powerpc/boot/dts/motionpro.dts
+index 76951ab..2b0dde0 100644
+--- a/arch/powerpc/boot/dts/motionpro.dts
++++ b/arch/powerpc/boot/dts/motionpro.dts
+@@ -148,7 +148,6 @@
+ interrupt-parent = <&mpc5200_pic>;
+ };
+
+-
+ spi at f00 {
+ compatible = "fsl,mpc5200b-spi","fsl,mpc5200-spi";
+ reg = <f00 20>;
+@@ -209,10 +208,25 @@
+ ethernet at 3000 {
+ device_type = "network";
+ compatible = "fsl,mpc5200b-fec","fsl,mpc5200-fec";
+- reg = <3000 800>;
++ reg = <3000 400>;
+ local-mac-address = [ 00 00 00 00 00 00 ];
+ interrupts = <2 5 0>;
+ interrupt-parent = <&mpc5200_pic>;
++ phy-handle = <&phy0>;
++ };
++
++ mdio at 3000 {
++ #address-cells = <1>;
++ #size-cells = <0>;
++ compatible = "fsl,mpc5200b-mdio","fsl,mpc5200-mdio";
++ reg = <3000 400>; // fec range, since we need to setup fec interrupts
++ interrupts = <2 5 0>; // these are for "mii command finished", not link changes & co.
++ interrupt-parent = <&mpc5200_pic>;
++
++ phy0: ethernet-phy at 2 {
++ device_type = "ethernet-phy";
++ reg = <2>;
++ };
+ };
+
+ ata at 3a00 {
+@@ -223,11 +237,19 @@
+ };
+
+ i2c at 3d40 {
++ #address-cells = <1>;
++ #size-cells = <0>;
+ compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c";
+ reg = <3d40 40>;
+ interrupts = <2 10 0>;
+ interrupt-parent = <&mpc5200_pic>;
+ fsl5200-clocking;
++
++ rtc at 68 {
++ device_type = "rtc";
++ compatible = "dallas,ds1339";
++ reg = <68>;
++ };
+ };
+
+ sram at 8000 {
+@@ -240,7 +262,8 @@
+ compatible = "fsl,lpb";
+ #address-cells = <2>;
+ #size-cells = <1>;
+- ranges = <1 0 50000000 00010000
++ ranges = <0 0 ff000000 01000000
++ 1 0 50000000 00010000
+ 2 0 50010000 00010000
+ 3 0 50020000 00010000>;
+
+@@ -271,31 +294,15 @@
+ compatible = "promess,pro_module_dio";
+ reg = <3 800 2>;
+ };
+- };
+
+- pci at f0000d00 {
+- #interrupt-cells = <1>;
+- #size-cells = <2>;
+- #address-cells = <3>;
+- device_type = "pci";
+- compatible = "fsl,mpc5200b-pci","fsl,mpc5200-pci";
+- reg = <f0000d00 100>;
+- interrupt-map-mask = <f800 0 0 7>;
+- interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3 // 1st slot
+- c000 0 0 2 &mpc5200_pic 1 1 3
+- c000 0 0 3 &mpc5200_pic 1 2 3
+- c000 0 0 4 &mpc5200_pic 1 3 3
+-
+- c800 0 0 1 &mpc5200_pic 1 1 3 // 2nd slot
+- c800 0 0 2 &mpc5200_pic 1 2 3
+- c800 0 0 3 &mpc5200_pic 1 3 3
+- c800 0 0 4 &mpc5200_pic 0 0 3>;
+- clock-frequency = <0>; // From boot loader
+- interrupts = <2 8 0 2 9 0 2 a 0>;
+- interrupt-parent = <&mpc5200_pic>;
+- bus-range = <0 0>;
+- ranges = <42000000 0 80000000 80000000 0 20000000
+- 02000000 0 a0000000 a0000000 0 10000000
+- 01000000 0 00000000 b0000000 0 01000000>;
++ // 16-bit flash device at LocalPlus Bus CS0
++ flash at 0,0 {
++ compatible = "cfi-flash";
++ reg = <0 0 01000000>;
++ bank-width = <2>;
++ device-width = <2>;
++ #size-cells = <1>;
++ #address-cells = <1>;
++ };
+ };
+ };
+diff --git a/arch/powerpc/boot/dts/mpc8377_mds.dts b/arch/powerpc/boot/dts/mpc8377_mds.dts
+index 49c05e9..eac8e1b 100644
+--- a/arch/powerpc/boot/dts/mpc8377_mds.dts
++++ b/arch/powerpc/boot/dts/mpc8377_mds.dts
+@@ -255,14 +255,14 @@
+ };
+
+ sata at 18000 {
+- compatible = "fsl,mpc8379-sata";
++ compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
+ reg = <0x18000 0x1000>;
+ interrupts = <44 0x8>;
+ interrupt-parent = <&ipic>;
+ };
+
+ sata at 19000 {
+- compatible = "fsl,mpc8379-sata";
++ compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
+ reg = <0x19000 0x1000>;
+ interrupts = <45 0x8>;
+ interrupt-parent = <&ipic>;
+diff --git a/arch/powerpc/boot/dts/mpc8377_rdb.dts b/arch/powerpc/boot/dts/mpc8377_rdb.dts
+index 440aa4d..5bc09ad 100644
+--- a/arch/powerpc/boot/dts/mpc8377_rdb.dts
++++ b/arch/powerpc/boot/dts/mpc8377_rdb.dts
+@@ -143,7 +143,6 @@
+ mode = "cpu";
+ };
+
+- /* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */
+ usb at 23000 {
+ compatible = "fsl-usb2-dr";
+ reg = <0x23000 0x1000>;
+@@ -151,7 +150,7 @@
+ #size-cells = <0>;
+ interrupt-parent = <&ipic>;
+ interrupts = <38 0x8>;
+- phy_type = "utmi";
++ phy_type = "ulpi";
+ };
+
+ mdio at 24520 {
+diff --git a/arch/powerpc/boot/dts/mpc8378_rdb.dts b/arch/powerpc/boot/dts/mpc8378_rdb.dts
+index 9271153..711f9a3 100644
+--- a/arch/powerpc/boot/dts/mpc8378_rdb.dts
++++ b/arch/powerpc/boot/dts/mpc8378_rdb.dts
+@@ -143,7 +143,6 @@
+ mode = "cpu";
+ };
+
+- /* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */
+ usb at 23000 {
+ compatible = "fsl-usb2-dr";
+ reg = <0x23000 0x1000>;
+@@ -151,7 +150,7 @@
+ #size-cells = <0>;
+ interrupt-parent = <&ipic>;
+ interrupts = <38 0x8>;
+- phy_type = "utmi";
++ phy_type = "ulpi";
+ };
+
+ mdio at 24520 {
+diff --git a/arch/powerpc/boot/dts/mpc8379_mds.dts b/arch/powerpc/boot/dts/mpc8379_mds.dts
+index fdb4a92..6f78a9f 100644
+--- a/arch/powerpc/boot/dts/mpc8379_mds.dts
++++ b/arch/powerpc/boot/dts/mpc8379_mds.dts
+@@ -255,28 +255,28 @@
+ };
+
+ sata at 18000 {
+- compatible = "fsl,mpc8379-sata";
++ compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
+ reg = <0x18000 0x1000>;
+ interrupts = <44 0x8>;
+ interrupt-parent = <&ipic>;
+ };
+
+ sata at 19000 {
+- compatible = "fsl,mpc8379-sata";
++ compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
+ reg = <0x19000 0x1000>;
+ interrupts = <45 0x8>;
+ interrupt-parent = <&ipic>;
+ };
+
+ sata at 1a000 {
+- compatible = "fsl,mpc8379-sata";
++ compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
+ reg = <0x1a000 0x1000>;
+ interrupts = <46 0x8>;
+ interrupt-parent = <&ipic>;
+ };
+
+ sata at 1b000 {
+- compatible = "fsl,mpc8379-sata";
++ compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
+ reg = <0x1b000 0x1000>;
+ interrupts = <47 0x8>;
+ interrupt-parent = <&ipic>;
+diff --git a/arch/powerpc/boot/dts/mpc8379_rdb.dts b/arch/powerpc/boot/dts/mpc8379_rdb.dts
+index 0dda2fc..c11ceb7 100644
+--- a/arch/powerpc/boot/dts/mpc8379_rdb.dts
++++ b/arch/powerpc/boot/dts/mpc8379_rdb.dts
+@@ -143,7 +143,6 @@
+ mode = "cpu";
+ };
+
+- /* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */
+ usb at 23000 {
+ compatible = "fsl-usb2-dr";
+ reg = <0x23000 0x1000>;
+@@ -151,7 +150,7 @@
+ #size-cells = <0>;
+ interrupt-parent = <&ipic>;
+ interrupts = <38 0x8>;
+- phy_type = "utmi";
++ phy_type = "ulpi";
+ };
+
+ mdio at 24520 {
+diff --git a/arch/powerpc/boot/dts/tqm5200.dts b/arch/powerpc/boot/dts/tqm5200.dts
+index c86464f..65bcea6 100644
+--- a/arch/powerpc/boot/dts/tqm5200.dts
++++ b/arch/powerpc/boot/dts/tqm5200.dts
+@@ -127,10 +127,25 @@
+ ethernet at 3000 {
+ device_type = "network";
+ compatible = "fsl,mpc5200-fec";
+- reg = <3000 800>;
++ reg = <3000 400>;
+ local-mac-address = [ 00 00 00 00 00 00 ];
+ interrupts = <2 5 0>;
+ interrupt-parent = <&mpc5200_pic>;
++ phy-handle = <&phy0>;
++ };
++
++ mdio at 3000 {
++ #address-cells = <1>;
++ #size-cells = <0>;
++ compatible = "fsl,mpc5200b-mdio","fsl,mpc5200-mdio";
++ reg = <3000 400>; // fec range, since we need to setup fec interrupts
++ interrupts = <2 5 0>; // these are for "mii command finished", not link changes & co.
++ interrupt-parent = <&mpc5200_pic>;
++
++ phy0: ethernet-phy at 0 {
++ device_type = "ethernet-phy";
++ reg = <0>;
++ };
+ };
+
+ ata at 3a00 {
+@@ -141,11 +156,19 @@
+ };
+
+ i2c at 3d40 {
++ #address-cells = <1>;
++ #size-cells = <0>;
+ compatible = "fsl,mpc5200-i2c","fsl-i2c";
+ reg = <3d40 40>;
+ interrupts = <2 10 0>;
+ interrupt-parent = <&mpc5200_pic>;
+ fsl5200-clocking;
++
++ rtc at 68 {
++ device_type = "rtc";
++ compatible = "dallas,ds1307";
++ reg = <68>;
++ };
+ };
+
+ sram at 8000 {
+@@ -154,6 +177,23 @@
+ };
+ };
+
++ lpb {
++ model = "fsl,lpb";
++ compatible = "fsl,lpb";
++ #address-cells = <2>;
++ #size-cells = <1>;
++ ranges = <0 0 fc000000 02000000>;
++
++ flash at 0,0 {
++ compatible = "cfi-flash";
++ reg = <0 0 02000000>;
++ bank-width = <4>;
++ device-width = <2>;
++ #size-cells = <1>;
++ #address-cells = <1>;
++ };
++ };
++
+ pci at f0000d00 {
+ #interrupt-cells = <1>;
+ #size-cells = <2>;
+diff --git a/arch/powerpc/configs/mpc832x_mds_defconfig b/arch/powerpc/configs/mpc832x_mds_defconfig
+index 79d228f..50cceda 100644
+--- a/arch/powerpc/configs/mpc832x_mds_defconfig
++++ b/arch/powerpc/configs/mpc832x_mds_defconfig
+@@ -1,7 +1,7 @@
+ #
+ # Automatically generated make config: don't edit
+-# Linux kernel version: 2.6.25-rc6
+-# Mon Mar 24 08:48:16 2008
++# Linux kernel version: 2.6.25-rc7
++# Mon Mar 31 11:36:51 2008
+ #
+ # CONFIG_PPC64 is not set
+
+@@ -628,8 +628,7 @@ CONFIG_LEGACY_PTY_COUNT=256
+ # CONFIG_IPMI_HANDLER is not set
+ CONFIG_HW_RANDOM=y
+ # CONFIG_NVRAM is not set
+-CONFIG_GEN_RTC=y
+-# CONFIG_GEN_RTC_X is not set
++# CONFIG_GEN_RTC is not set
+ # CONFIG_R3964 is not set
+ # CONFIG_APPLICOM is not set
+ # CONFIG_RAW_DRIVER is not set
+@@ -824,10 +823,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
+ # CONFIG_EDAC is not set
+ CONFIG_RTC_LIB=y
+ CONFIG_RTC_CLASS=y
+-
+-#
+-# Conflicting RTC option has been selected, check GEN_RTC and RTC
+-#
+ CONFIG_RTC_HCTOSYS=y
+ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+ # CONFIG_RTC_DEBUG is not set
+diff --git a/arch/powerpc/configs/mpc834x_mds_defconfig b/arch/powerpc/configs/mpc834x_mds_defconfig
+index 9360144..b4e82c0 100644
+--- a/arch/powerpc/configs/mpc834x_mds_defconfig
++++ b/arch/powerpc/configs/mpc834x_mds_defconfig
+@@ -1,7 +1,7 @@
+ #
+ # Automatically generated make config: don't edit
+-# Linux kernel version: 2.6.25-rc6
+-# Mon Mar 24 08:48:20 2008
++# Linux kernel version: 2.6.25-rc7
++# Mon Mar 31 11:36:56 2008
+ #
+ # CONFIG_PPC64 is not set
+
+@@ -571,8 +571,7 @@ CONFIG_LEGACY_PTY_COUNT=256
+ # CONFIG_IPMI_HANDLER is not set
+ # CONFIG_HW_RANDOM is not set
+ # CONFIG_NVRAM is not set
+-CONFIG_GEN_RTC=y
+-# CONFIG_GEN_RTC_X is not set
++# CONFIG_GEN_RTC is not set
+ # CONFIG_R3964 is not set
+ # CONFIG_APPLICOM is not set
+ # CONFIG_RAW_DRIVER is not set
+@@ -767,10 +766,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
+ # CONFIG_EDAC is not set
+ CONFIG_RTC_LIB=y
+ CONFIG_RTC_CLASS=y
+-
+-#
+-# Conflicting RTC option has been selected, check GEN_RTC and RTC
+-#
+ CONFIG_RTC_HCTOSYS=y
+ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+ # CONFIG_RTC_DEBUG is not set
+diff --git a/arch/powerpc/configs/mpc836x_mds_defconfig b/arch/powerpc/configs/mpc836x_mds_defconfig
+index 7c8b060..d50a96e 100644
+--- a/arch/powerpc/configs/mpc836x_mds_defconfig
++++ b/arch/powerpc/configs/mpc836x_mds_defconfig
+@@ -1,7 +1,7 @@
+ #
+ # Automatically generated make config: don't edit
+-# Linux kernel version: 2.6.25-rc6
+-# Mon Mar 24 08:48:21 2008
++# Linux kernel version: 2.6.25-rc7
++# Mon Mar 31 11:36:57 2008
+ #
+ # CONFIG_PPC64 is not set
+
+@@ -626,8 +626,7 @@ CONFIG_LEGACY_PTY_COUNT=256
+ # CONFIG_IPMI_HANDLER is not set
+ CONFIG_HW_RANDOM=y
+ # CONFIG_NVRAM is not set
+-CONFIG_GEN_RTC=y
+-# CONFIG_GEN_RTC_X is not set
++# CONFIG_GEN_RTC is not set
+ # CONFIG_R3964 is not set
+ # CONFIG_APPLICOM is not set
+ # CONFIG_RAW_DRIVER is not set
+@@ -822,10 +821,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
+ # CONFIG_EDAC is not set
+ CONFIG_RTC_LIB=y
+ CONFIG_RTC_CLASS=y
+-
+-#
+-# Conflicting RTC option has been selected, check GEN_RTC and RTC
+-#
+ CONFIG_RTC_HCTOSYS=y
+ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+ # CONFIG_RTC_DEBUG is not set
+diff --git a/arch/powerpc/configs/mpc837x_rdb_defconfig b/arch/powerpc/configs/mpc837x_rdb_defconfig
+index 44093a0..a633176 100644
+--- a/arch/powerpc/configs/mpc837x_rdb_defconfig
++++ b/arch/powerpc/configs/mpc837x_rdb_defconfig
+@@ -684,7 +684,29 @@ CONFIG_USB_SUPPORT=y
+ CONFIG_USB_ARCH_HAS_HCD=y
+ # CONFIG_USB_ARCH_HAS_OHCI is not set
+ CONFIG_USB_ARCH_HAS_EHCI=y
+-# CONFIG_USB is not set
++CONFIG_USB=y
++# CONFIG_USB_DEBUG is not set
++# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
++
++#
++# Miscellaneous USB options
++#
++# CONFIG_USB_DEVICEFS is not set
++CONFIG_USB_DEVICE_CLASS=y
++# CONFIG_USB_DYNAMIC_MINORS is not set
++# CONFIG_USB_OTG is not set
++
++#
++# USB Host Controller Drivers
++#
++CONFIG_USB_EHCI_HCD=y
++CONFIG_USB_EHCI_ROOT_HUB_TT=y
++# CONFIG_USB_EHCI_TT_NEWSCHED is not set
++CONFIG_USB_EHCI_FSL=y
++CONFIG_USB_EHCI_HCD_PPC_OF=y
++# CONFIG_USB_ISP116X_HCD is not set
++# CONFIG_USB_SL811_HCD is not set
++# CONFIG_USB_R8A66597_HCD is not set
+
+ #
+ # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig
+index 1f6cf68..029d2da 100644
+--- a/arch/powerpc/configs/mpc83xx_defconfig
++++ b/arch/powerpc/configs/mpc83xx_defconfig
+@@ -690,7 +690,29 @@ CONFIG_USB_SUPPORT=y
+ CONFIG_USB_ARCH_HAS_HCD=y
+ # CONFIG_USB_ARCH_HAS_OHCI is not set
+ CONFIG_USB_ARCH_HAS_EHCI=y
+-# CONFIG_USB is not set
++CONFIG_USB=y
++# CONFIG_USB_DEBUG is not set
++# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
++
++#
++# Miscellaneous USB options
++#
++# CONFIG_USB_DEVICEFS is not set
++CONFIG_USB_DEVICE_CLASS=y
++# CONFIG_USB_DYNAMIC_MINORS is not set
++# CONFIG_USB_OTG is not set
++
++#
++# USB Host Controller Drivers
++#
++CONFIG_USB_EHCI_HCD=y
++CONFIG_USB_EHCI_ROOT_HUB_TT=y
++# CONFIG_USB_EHCI_TT_NEWSCHED is not set
++CONFIG_USB_EHCI_FSL=y
++CONFIG_USB_EHCI_HCD_PPC_OF=y
++# CONFIG_USB_ISP116X_HCD is not set
++# CONFIG_USB_SL811_HCD is not set
++# CONFIG_USB_R8A66597_HCD is not set
+
+ #
+ # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+diff --git a/arch/powerpc/configs/mpc8544_ds_defconfig b/arch/powerpc/configs/mpc8544_ds_defconfig
+index c75b6ae..418bcdb 100644
+--- a/arch/powerpc/configs/mpc8544_ds_defconfig
++++ b/arch/powerpc/configs/mpc8544_ds_defconfig
+@@ -1,7 +1,7 @@
+ #
+ # Automatically generated make config: don't edit
+-# Linux kernel version: 2.6.25-rc6
+-# Mon Mar 24 08:48:26 2008
++# Linux kernel version: 2.6.25-rc7
++# Mon Mar 31 11:37:03 2008
+ #
+ # CONFIG_PPC64 is not set
+
+@@ -742,8 +742,7 @@ CONFIG_LEGACY_PTY_COUNT=256
+ # CONFIG_IPMI_HANDLER is not set
+ # CONFIG_HW_RANDOM is not set
+ CONFIG_NVRAM=y
+-CONFIG_GEN_RTC=y
+-CONFIG_GEN_RTC_X=y
++# CONFIG_GEN_RTC is not set
+ # CONFIG_R3964 is not set
+ # CONFIG_APPLICOM is not set
+ # CONFIG_RAW_DRIVER is not set
+@@ -1209,10 +1208,6 @@ CONFIG_USB_MON=y
+ # CONFIG_EDAC is not set
+ CONFIG_RTC_LIB=y
+ CONFIG_RTC_CLASS=y
+-
+-#
+-# Conflicting RTC option has been selected, check GEN_RTC and RTC
+-#
+ CONFIG_RTC_HCTOSYS=y
+ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+ # CONFIG_RTC_DEBUG is not set
+diff --git a/arch/powerpc/configs/mpc8568mds_defconfig b/arch/powerpc/configs/mpc8568mds_defconfig
+index e7da4b9..2b866b3 100644
+--- a/arch/powerpc/configs/mpc8568mds_defconfig
++++ b/arch/powerpc/configs/mpc8568mds_defconfig
+@@ -1,7 +1,7 @@
+ #
+ # Automatically generated make config: don't edit
+-# Linux kernel version: 2.6.25-rc6
+-# Mon Mar 24 08:48:28 2008
++# Linux kernel version: 2.6.25-rc7
++# Mon Mar 31 11:37:05 2008
+ #
+ # CONFIG_PPC64 is not set
+
+@@ -629,8 +629,7 @@ CONFIG_LEGACY_PTY_COUNT=256
+ # CONFIG_IPMI_HANDLER is not set
+ CONFIG_HW_RANDOM=y
+ # CONFIG_NVRAM is not set
+-CONFIG_GEN_RTC=y
+-# CONFIG_GEN_RTC_X is not set
++# CONFIG_GEN_RTC is not set
+ # CONFIG_R3964 is not set
+ # CONFIG_APPLICOM is not set
+ # CONFIG_RAW_DRIVER is not set
+@@ -825,10 +824,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
+ # CONFIG_EDAC is not set
+ CONFIG_RTC_LIB=y
+ CONFIG_RTC_CLASS=y
+-
+-#
+-# Conflicting RTC option has been selected, check GEN_RTC and RTC
+-#
+ CONFIG_RTC_HCTOSYS=y
+ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+ # CONFIG_RTC_DEBUG is not set
+diff --git a/arch/powerpc/configs/mpc8572_ds_defconfig b/arch/powerpc/configs/mpc8572_ds_defconfig
+index 460afe9..53aa6f3 100644
+--- a/arch/powerpc/configs/mpc8572_ds_defconfig
++++ b/arch/powerpc/configs/mpc8572_ds_defconfig
+@@ -1,7 +1,7 @@
+ #
+ # Automatically generated make config: don't edit
+-# Linux kernel version: 2.6.25-rc6
+-# Mon Mar 24 08:48:29 2008
++# Linux kernel version: 2.6.25-rc7
++# Mon Mar 31 11:37:06 2008
+ #
+ # CONFIG_PPC64 is not set
+
+@@ -742,8 +742,7 @@ CONFIG_LEGACY_PTY_COUNT=256
+ # CONFIG_IPMI_HANDLER is not set
+ # CONFIG_HW_RANDOM is not set
+ CONFIG_NVRAM=y
+-CONFIG_GEN_RTC=y
+-CONFIG_GEN_RTC_X=y
++# CONFIG_GEN_RTC is not set
+ # CONFIG_R3964 is not set
+ # CONFIG_APPLICOM is not set
+ # CONFIG_RAW_DRIVER is not set
+@@ -1209,10 +1208,6 @@ CONFIG_USB_MON=y
+ # CONFIG_EDAC is not set
+ CONFIG_RTC_LIB=y
+ CONFIG_RTC_CLASS=y
+-
+-#
+-# Conflicting RTC option has been selected, check GEN_RTC and RTC
+-#
+ CONFIG_RTC_HCTOSYS=y
+ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+ # CONFIG_RTC_DEBUG is not set
+diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig
+index 615e4c1..2075722 100644
+--- a/arch/powerpc/configs/mpc85xx_defconfig
++++ b/arch/powerpc/configs/mpc85xx_defconfig
+@@ -1,7 +1,7 @@
+ #
+ # Automatically generated make config: don't edit
+-# Linux kernel version: 2.6.25-rc6
+-# Mon Mar 24 08:48:31 2008
++# Linux kernel version: 2.6.25-rc7
++# Mon Mar 31 11:37:08 2008
+ #
+ # CONFIG_PPC64 is not set
+
+@@ -750,8 +750,7 @@ CONFIG_LEGACY_PTY_COUNT=256
+ # CONFIG_IPMI_HANDLER is not set
+ # CONFIG_HW_RANDOM is not set
+ CONFIG_NVRAM=y
+-CONFIG_GEN_RTC=y
+-CONFIG_GEN_RTC_X=y
++# CONFIG_GEN_RTC is not set
+ # CONFIG_R3964 is not set
+ # CONFIG_APPLICOM is not set
+ # CONFIG_RAW_DRIVER is not set
+@@ -1217,10 +1216,6 @@ CONFIG_USB_MON=y
+ # CONFIG_EDAC is not set
+ CONFIG_RTC_LIB=y
+ CONFIG_RTC_CLASS=y
+-
+-#
+-# Conflicting RTC option has been selected, check GEN_RTC and RTC
+-#
+ CONFIG_RTC_HCTOSYS=y
+ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+ # CONFIG_RTC_DEBUG is not set
+diff --git a/arch/powerpc/configs/mpc8641_hpcn_defconfig b/arch/powerpc/configs/mpc8641_hpcn_defconfig
+index 994e768..d01dcdb 100644
+--- a/arch/powerpc/configs/mpc8641_hpcn_defconfig
++++ b/arch/powerpc/configs/mpc8641_hpcn_defconfig
+@@ -1,7 +1,7 @@
+ #
+ # Automatically generated make config: don't edit
+-# Linux kernel version: 2.6.25-rc6
+-# Mon Mar 24 08:48:34 2008
++# Linux kernel version: 2.6.25-rc7
++# Mon Mar 31 11:37:11 2008
+ #
+ # CONFIG_PPC64 is not set
+
+@@ -736,8 +736,7 @@ CONFIG_LEGACY_PTY_COUNT=256
+ # CONFIG_IPMI_HANDLER is not set
+ # CONFIG_HW_RANDOM is not set
+ CONFIG_NVRAM=y
+-CONFIG_GEN_RTC=y
+-CONFIG_GEN_RTC_X=y
++# CONFIG_GEN_RTC is not set
+ # CONFIG_R3964 is not set
+ # CONFIG_APPLICOM is not set
+ # CONFIG_RAW_DRIVER is not set
+@@ -1203,10 +1202,6 @@ CONFIG_USB_MON=y
+ # CONFIG_EDAC is not set
+ CONFIG_RTC_LIB=y
+ CONFIG_RTC_CLASS=y
+-
+-#
+-# Conflicting RTC option has been selected, check GEN_RTC and RTC
+-#
+ CONFIG_RTC_HCTOSYS=y
+ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+ # CONFIG_RTC_DEBUG is not set
+diff --git a/arch/powerpc/configs/prpmc2800_defconfig b/arch/powerpc/configs/prpmc2800_defconfig
+index f53d55b..f912168 100644
+--- a/arch/powerpc/configs/prpmc2800_defconfig
++++ b/arch/powerpc/configs/prpmc2800_defconfig
+@@ -1,7 +1,7 @@
+ #
+ # Automatically generated make config: don't edit
+-# Linux kernel version: 2.6.25-rc6
+-# Mon Mar 24 08:48:37 2008
++# Linux kernel version: 2.6.25-rc7
++# Mon Mar 31 11:37:15 2008
+ #
+ # CONFIG_PPC64 is not set
+
+@@ -855,8 +855,7 @@ CONFIG_LEGACY_PTY_COUNT=256
+ # CONFIG_IPMI_HANDLER is not set
+ # CONFIG_HW_RANDOM is not set
+ # CONFIG_NVRAM is not set
+-CONFIG_GEN_RTC=y
+-# CONFIG_GEN_RTC_X is not set
++# CONFIG_GEN_RTC is not set
+ # CONFIG_R3964 is not set
+ # CONFIG_APPLICOM is not set
+ # CONFIG_RAW_DRIVER is not set
+@@ -1129,10 +1128,6 @@ CONFIG_USB_MON=y
+ # CONFIG_EDAC is not set
+ CONFIG_RTC_LIB=y
+ CONFIG_RTC_CLASS=y
+-
+-#
+-# Conflicting RTC option has been selected, check GEN_RTC and RTC
+-#
+ CONFIG_RTC_HCTOSYS=y
+ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+ # CONFIG_RTC_DEBUG is not set
+diff --git a/arch/powerpc/configs/storcenter_defconfig b/arch/powerpc/configs/storcenter_defconfig
+index 8fc8574..fdbfd39 100644
+--- a/arch/powerpc/configs/storcenter_defconfig
++++ b/arch/powerpc/configs/storcenter_defconfig
+@@ -1,7 +1,7 @@
+ #
+ # Automatically generated make config: don't edit
+-# Linux kernel version: 2.6.25-rc6
+-# Mon Mar 24 08:48:41 2008
++# Linux kernel version: 2.6.25-rc7
++# Mon Mar 31 11:37:19 2008
+ #
+ # CONFIG_PPC64 is not set
+
+@@ -717,8 +717,7 @@ CONFIG_LEGACY_PTY_COUNT=256
+ # CONFIG_IPMI_HANDLER is not set
+ CONFIG_HW_RANDOM=m
+ CONFIG_NVRAM=y
+-CONFIG_GEN_RTC=y
+-# CONFIG_GEN_RTC_X is not set
++# CONFIG_GEN_RTC is not set
+ # CONFIG_R3964 is not set
+ # CONFIG_APPLICOM is not set
+ # CONFIG_RAW_DRIVER is not set
+@@ -931,10 +930,6 @@ CONFIG_USB_STORAGE=y
+ # CONFIG_EDAC is not set
+ CONFIG_RTC_LIB=y
+ CONFIG_RTC_CLASS=y
+-
+-#
+-# Conflicting RTC option has been selected, check GEN_RTC and RTC
+-#
+ CONFIG_RTC_HCTOSYS=y
+ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+ # CONFIG_RTC_DEBUG is not set
+diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
+index 11b4f6d..d3aee08 100644
+--- a/arch/powerpc/kernel/head_64.S
++++ b/arch/powerpc/kernel/head_64.S
+@@ -1387,12 +1387,14 @@ __secondary_start:
+ #ifdef CONFIG_PPC_ISERIES
+ BEGIN_FW_FTR_SECTION
+ ori r4,r4,MSR_EE
++ li r8,1
++ stb r8,PACAHARDIRQEN(r13)
+ END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
+ #endif
+ BEGIN_FW_FTR_SECTION
+- stb r7,PACASOFTIRQEN(r13)
+ stb r7,PACAHARDIRQEN(r13)
+ END_FW_FTR_SECTION_IFCLR(FW_FEATURE_ISERIES)
++ stb r7,PACASOFTIRQEN(r13)
+
+ mtspr SPRN_SRR0,r3
+ mtspr SPRN_SRR1,r4
+@@ -1520,15 +1522,14 @@ _INIT_GLOBAL(start_here_common)
+ #ifdef CONFIG_PPC_ISERIES
+ BEGIN_FW_FTR_SECTION
+ mfmsr r5
+- ori r5,r5,MSR_EE /* Hard Enabled */
++ ori r5,r5,MSR_EE /* Hard Enabled on iSeries*/
+ mtmsrd r5
++ li r5,1
+ END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
+ #endif
+-BEGIN_FW_FTR_SECTION
+- stb r5,PACAHARDIRQEN(r13)
+-END_FW_FTR_SECTION_IFCLR(FW_FEATURE_ISERIES)
++ stb r5,PACAHARDIRQEN(r13) /* Hard Disabled on others */
+
+- bl .start_kernel
++ bl .start_kernel
+
+ /* Not reached */
+ BUG_OPCODE
+diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
+index b0e5deb..292163f 100644
+--- a/arch/powerpc/kernel/irq.c
++++ b/arch/powerpc/kernel/irq.c
+@@ -143,7 +143,6 @@ void local_irq_restore(unsigned long en)
+ */
+ if (local_paca->lppaca_ptr->int_dword.any_int)
+ iseries_handle_interrupts();
+- return;
+ }
+
+ /*
+diff --git a/arch/powerpc/kernel/rtas_flash.c b/arch/powerpc/kernel/rtas_flash.c
+index f227659..538baf4 100644
+--- a/arch/powerpc/kernel/rtas_flash.c
++++ b/arch/powerpc/kernel/rtas_flash.c
+@@ -356,7 +356,7 @@ static int rtas_excl_open(struct inode *inode, struct file *file)
+
+ /* Enforce exclusive open with use count of PDE */
+ spin_lock(&flash_file_open_lock);
+- if (atomic_read(&dp->count) > 1) {
++ if (atomic_read(&dp->count) > 2) {
+ spin_unlock(&flash_file_open_lock);
+ return -EBUSY;
+ }
+diff --git a/arch/powerpc/mm/hash_low_32.S b/arch/powerpc/mm/hash_low_32.S
+index 7f830a4..e10d76a 100644
+--- a/arch/powerpc/mm/hash_low_32.S
++++ b/arch/powerpc/mm/hash_low_32.S
+@@ -44,6 +44,9 @@ mmu_hash_lock:
+ #ifdef CONFIG_SMP
+ .text
+ _GLOBAL(hash_page_sync)
++ mfmsr r10
++ rlwinm r0,r10,0,17,15 /* clear bit 16 (MSR_EE) */
++ mtmsr r0
+ lis r8,mmu_hash_lock at h
+ ori r8,r8,mmu_hash_lock at l
+ lis r0,0x0fff
+@@ -60,8 +63,9 @@ _GLOBAL(hash_page_sync)
+ eieio
+ li r0,0
+ stw r0,0(r8)
+- blr
+-#endif
++ mtmsr r10
++ blr
++#endif /* CONFIG_SMP */
+
+ /*
+ * Load a PTE into the hash table, if possible.
+diff --git a/arch/powerpc/sysdev/cpm2.c b/arch/powerpc/sysdev/cpm2.c
+index 7be7112..dd066bb 100644
+--- a/arch/powerpc/sysdev/cpm2.c
++++ b/arch/powerpc/sysdev/cpm2.c
+@@ -240,6 +240,7 @@ int cpm2_clk_setup(enum cpm_clk_target target, int clock, int mode)
+ case CPM_CLK_SCC1:
+ reg = &im_cpmux->cmx_scr;
+ shift = 24;
++ break;
+ case CPM_CLK_SCC2:
+ reg = &im_cpmux->cmx_scr;
+ shift = 16;
diff --git a/arch/sparc64/kernel/iommu.c b/arch/sparc64/kernel/iommu.c
index b781d3d..756fa24 100644
--- a/arch/sparc64/kernel/iommu.c
@@ -821,6 +1735,36 @@
VMCOREINFO_SYMBOL(init_level4_pgt);
#ifdef CONFIG_NUMA
+diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
+index 9d406cd..071ff47 100644
+--- a/arch/x86/kernel/step.c
++++ b/arch/x86/kernel/step.c
+@@ -140,6 +140,9 @@ static int enable_single_step(struct task_struct *child)
+ */
+ static void write_debugctlmsr(struct task_struct *child, unsigned long val)
+ {
++ if (child->thread.debugctlmsr == val)
++ return;
++
+ child->thread.debugctlmsr = val;
+
+ if (child != current)
+@@ -165,11 +168,11 @@ static void enable_step(struct task_struct *child, bool block)
+ write_debugctlmsr(child,
+ child->thread.debugctlmsr | DEBUGCTLMSR_BTF);
+ } else {
+- write_debugctlmsr(child,
+- child->thread.debugctlmsr & ~DEBUGCTLMSR_BTF);
++ write_debugctlmsr(child,
++ child->thread.debugctlmsr & ~DEBUGCTLMSR_BTF);
+
+- if (!child->thread.debugctlmsr)
+- clear_tsk_thread_flag(child, TIF_DEBUGCTLMSR);
++ if (!child->thread.debugctlmsr)
++ clear_tsk_thread_flag(child, TIF_DEBUGCTLMSR);
+ }
+ }
+
diff --git a/block/blk-settings.c b/block/blk-settings.c
index 1344a0e..5713f7e 100644
--- a/block/blk-settings.c
@@ -983,6 +1927,22 @@
return 0;
}
+diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
+index 07791a7..4c19855 100644
+--- a/drivers/ata/sata_fsl.c
++++ b/drivers/ata/sata_fsl.c
+@@ -1348,10 +1348,7 @@ static int sata_fsl_remove(struct of_device *ofdev)
+
+ static struct of_device_id fsl_sata_match[] = {
+ {
+- .compatible = "fsl,mpc8315-sata",
+- },
+- {
+- .compatible = "fsl,mpc8379-sata",
++ .compatible = "fsl,pq-sata",
+ },
+ {},
+ };
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index 47c57a4..98099f5 100644
--- a/drivers/atm/firestream.c
@@ -1122,6 +2082,35 @@
goto close_end;
}
if (RIODelay(PortP, HUNDRED_MS) == RIO_FAIL) {
+diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
+index 7269230..df16368 100644
+--- a/drivers/dma/fsldma.c
++++ b/drivers/dma/fsldma.c
+@@ -1021,11 +1021,11 @@ const u32 mpc8349_dma_ip_feature = FSL_DMA_IP_83XX | FSL_DMA_LITTLE_ENDIAN;
+
+ static struct of_device_id of_fsl_dma_chan_ids[] = {
+ {
+- .compatible = "fsl,mpc8540-dma-channel",
++ .compatible = "fsl,eloplus-dma-channel",
+ .data = (void *)&mpc8540_dma_ip_feature,
+ },
+ {
+- .compatible = "fsl,mpc8349-dma-channel",
++ .compatible = "fsl,elo-dma-channel",
+ .data = (void *)&mpc8349_dma_ip_feature,
+ },
+ {}
+@@ -1107,8 +1107,8 @@ err:
+ }
+
+ static struct of_device_id of_fsl_dma_ids[] = {
+- { .compatible = "fsl,mpc8540-dma", },
+- { .compatible = "fsl,mpc8349-dma", },
++ { .compatible = "fsl,eloplus-dma", },
++ { .compatible = "fsl,elo-dma", },
+ {}
+ };
+
diff --git a/drivers/ide/arm/ide_arm.c b/drivers/ide/arm/ide_arm.c
index 43a70e9..be9ff73 100644
--- a/drivers/ide/arm/ide_arm.c
@@ -1263,6 +2252,44 @@
module_init(pmac_ide_probe);
+
+MODULE_LICENSE("GPL");
+diff --git a/drivers/input/mouse/appletouch.c b/drivers/input/mouse/appletouch.c
+index b4423a4..8dd3942 100644
+--- a/drivers/input/mouse/appletouch.c
++++ b/drivers/input/mouse/appletouch.c
+@@ -62,6 +62,10 @@
+ #define GEYSER4_ISO_PRODUCT_ID 0x021B
+ #define GEYSER4_JIS_PRODUCT_ID 0x021C
+
++#define GEYSER4_HF_ANSI_PRODUCT_ID 0x0229
++#define GEYSER4_HF_ISO_PRODUCT_ID 0x022A
++#define GEYSER4_HF_JIS_PRODUCT_ID 0x022B
++
+ #define ATP_DEVICE(prod) \
+ .match_flags = USB_DEVICE_ID_MATCH_DEVICE | \
+ USB_DEVICE_ID_MATCH_INT_CLASS | \
+@@ -93,6 +97,10 @@ static struct usb_device_id atp_table [] = {
+ { ATP_DEVICE(GEYSER4_ISO_PRODUCT_ID) },
+ { ATP_DEVICE(GEYSER4_JIS_PRODUCT_ID) },
+
++ { ATP_DEVICE(GEYSER4_HF_ANSI_PRODUCT_ID) },
++ { ATP_DEVICE(GEYSER4_HF_ISO_PRODUCT_ID) },
++ { ATP_DEVICE(GEYSER4_HF_JIS_PRODUCT_ID) },
++
+ /* Terminating entry */
+ { }
+ };
+@@ -217,7 +225,10 @@ static inline int atp_is_geyser_3(struct atp *dev)
+ (productId == GEYSER3_JIS_PRODUCT_ID) ||
+ (productId == GEYSER4_ANSI_PRODUCT_ID) ||
+ (productId == GEYSER4_ISO_PRODUCT_ID) ||
+- (productId == GEYSER4_JIS_PRODUCT_ID);
++ (productId == GEYSER4_JIS_PRODUCT_ID) ||
++ (productId == GEYSER4_HF_ANSI_PRODUCT_ID) ||
++ (productId == GEYSER4_HF_ISO_PRODUCT_ID) ||
++ (productId == GEYSER4_HF_JIS_PRODUCT_ID);
+ }
+
+ /*
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
index 34e317c..57b9e3a 100644
--- a/drivers/media/radio/radio-cadet.c
@@ -1637,6 +2664,30 @@
bond_for_each_slave(bond, slave, i)
if (strnicmp(slave->dev->name, ifname, IFNAMSIZ) == 0) {
dev = slave->dev;
+diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c
+index 58b71e6..fe59c27 100644
+--- a/drivers/net/fec_mpc52xx.c
++++ b/drivers/net/fec_mpc52xx.c
+@@ -1057,6 +1057,7 @@ static int mpc52xx_fec_of_resume(struct of_device *op)
+ #endif
+
+ static struct of_device_id mpc52xx_fec_match[] = {
++ { .type = "network", .compatible = "fsl,mpc5200b-fec", },
+ { .type = "network", .compatible = "fsl,mpc5200-fec", },
+ { .type = "network", .compatible = "mpc5200-fec", },
+ { }
+diff --git a/drivers/net/fec_mpc52xx_phy.c b/drivers/net/fec_mpc52xx_phy.c
+index 6a3ac4e..1d0cd1d 100644
+--- a/drivers/net/fec_mpc52xx_phy.c
++++ b/drivers/net/fec_mpc52xx_phy.c
+@@ -179,6 +179,7 @@ static int mpc52xx_fec_mdio_remove(struct of_device *of)
+
+ static struct of_device_id mpc52xx_fec_mdio_match[] = {
+ { .compatible = "fsl,mpc5200b-mdio", },
++ { .compatible = "fsl,mpc5200-mdio", },
+ { .compatible = "mpc5200b-fec-phy", },
+ {}
+ };
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 6f7e3fd..980c2c2 100644
--- a/drivers/net/forcedeth.c
@@ -3631,6 +4682,19 @@
return cell;
}
+diff --git a/fs/afs/internal.h b/fs/afs/internal.h
+index 9ba16ed..eec41c7 100644
+--- a/fs/afs/internal.h
++++ b/fs/afs/internal.h
+@@ -749,7 +749,7 @@ extern int afs_fsync(struct file *, struct dentry *, int);
+ extern unsigned afs_debug;
+
+ #define dbgprintk(FMT,...) \
+- printk("[%x%-6.6s] "FMT"\n", smp_processor_id(), current->comm ,##__VA_ARGS__)
++ printk("[%-6.6s] "FMT"\n", current->comm ,##__VA_ARGS__)
+
+ /* make sure we maintain the format strings, even when debugging is disabled */
+ static inline __attribute__((format(printf,1,2)))
diff --git a/fs/efs/inode.c b/fs/efs/inode.c
index 79e19e5..a8e7797 100644
--- a/fs/efs/inode.c
@@ -3644,6 +4708,19 @@
inode->i_ino, in->numextents, inode->i_mode);
#endif
+diff --git a/fs/splice.c b/fs/splice.c
+index 0670c91..a861bb3 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -320,7 +320,7 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
+ break;
+
+ error = add_to_page_cache_lru(page, mapping, index,
+- GFP_KERNEL);
++ mapping_gfp_mask(mapping));
+ if (unlikely(error)) {
+ page_cache_release(page);
+ if (error == -EEXIST)
diff --git a/include/asm-alpha/current.h b/include/asm-alpha/current.h
index 8d88a13..094d285 100644
--- a/include/asm-alpha/current.h
@@ -5300,6 +6377,19 @@
return 0;
}
+diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
+index 126ca77..53fe94c 100644
+--- a/net/rxrpc/ar-internal.h
++++ b/net/rxrpc/ar-internal.h
+@@ -611,7 +611,7 @@ extern struct rxrpc_transport *rxrpc_find_transport(struct rxrpc_local *,
+ extern unsigned rxrpc_debug;
+
+ #define dbgprintk(FMT,...) \
+- printk("[%x%-6.6s] "FMT"\n", smp_processor_id(), current->comm ,##__VA_ARGS__)
++ printk("[%-6.6s] "FMT"\n", current->comm ,##__VA_ARGS__)
+
+ /* make sure we maintain the format strings, even when debugging is disabled */
+ static inline __attribute__((format(printf,1,2)))
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 10b5c08..b741618 100644
--- a/net/sched/sch_generic.c
@@ -5331,9 +6421,18 @@
clear_bit(__LINK_STATE_QDISC_RUNNING, &dev->state);
}
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
-index 41a049f..c2fef7b 100644
+index 41a049f..820d07a 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
+@@ -180,7 +180,7 @@ static int inode_alloc_security(struct inode *inode)
+ struct task_security_struct *tsec = current->security;
+ struct inode_security_struct *isec;
+
+- isec = kmem_cache_zalloc(sel_inode_cache, GFP_KERNEL);
++ isec = kmem_cache_zalloc(sel_inode_cache, GFP_NOFS);
+ if (!isec)
+ return -ENOMEM;
+
@@ -1630,6 +1630,12 @@ static inline u32 file_to_av(struct file *file)
else
av |= FILE__WRITE;
@@ -5347,3 +6446,12 @@
return av;
}
+@@ -2423,7 +2429,7 @@ static int selinux_inode_init_security(struct inode *inode, struct inode *dir,
+ return -EOPNOTSUPP;
+
+ if (name) {
+- namep = kstrdup(XATTR_SELINUX_SUFFIX, GFP_KERNEL);
++ namep = kstrdup(XATTR_SELINUX_SUFFIX, GFP_NOFS);
+ if (!namep)
+ return -ENOMEM;
+ *name = namep;
Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 (original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 Fri Apr 4 11:42:24 2008
@@ -1,4 +1,4 @@
-+ bugfix/all/patch-2.6.25-rc8-git2
++ bugfix/all/patch-2.6.25-rc8-git3
+ debian/version.patch
+ debian/kernelvariables.patch
+ debian/doc-build-parallel.patch
More information about the Kernel-svn-changes
mailing list