8 files changed, 12 insertions, 17 deletions

diff --git a/arch/ppc/8260_io/enet.c b/arch/ppc/8260_io/enet.c
index 4c0a7d732f69..615b6583d9b0 100644
--- a/arch/ppc/8260_io/enet.c
+++ b/arch/ppc/8260_io/enet.c
@@ -477,9 +477,9 @@ for (;;) {
                 }
                 else {
                         skb_put(skb,pkt_len-4); /* Make room */
-                        eth_copy_and_sum(skb,
+                        skb_copy_to_linear_data(skb,
                                 (unsigned char *)__va(bdp->cbd_bufaddr),
-                                pkt_len-4, 0);
+                                pkt_len-4);
                         skb->protocol=eth_type_trans(skb,dev);
                         netif_rx(skb);
                 }
diff --git a/arch/ppc/8260_io/fcc_enet.c b/arch/ppc/8260_io/fcc_enet.c
index cab395da25da..6f3ed6a72e0b 100644
--- a/arch/ppc/8260_io/fcc_enet.c
+++ b/arch/ppc/8260_io/fcc_enet.c
@@ -734,9 +734,9 @@ for (;;) {
                 }
                 else {
                         skb_put(skb,pkt_len);   /* Make room */
-                        eth_copy_and_sum(skb,
+                        skb_copy_to_linear_data(skb,
                                 (unsigned char *)__va(bdp->cbd_bufaddr),
-                                pkt_len, 0);
+                                pkt_len);
                         skb->protocol=eth_type_trans(skb,dev);
                         netif_rx(skb);
                 }
diff --git a/arch/ppc/8xx_io/enet.c b/arch/ppc/8xx_io/enet.c
index e58288e14369..703d47eee436 100644
--- a/arch/ppc/8xx_io/enet.c
+++ b/arch/ppc/8xx_io/enet.c
@@ -506,9 +506,9 @@ for (;;) {
                 }
                 else {
                         skb_put(skb,pkt_len-4); /* Make room */
-                        eth_copy_and_sum(skb,
+                        skb_copy_to_linear_data(skb,
                                 cep->rx_vaddr[bdp - cep->rx_bd_base],
-                                pkt_len-4, 0);
+                                pkt_len-4);
                         skb->protocol=eth_type_trans(skb,dev);
                         netif_rx(skb);
                 }
diff --git a/arch/ppc/8xx_io/fec.c b/arch/ppc/8xx_io/fec.c
index d38335d2d710..0288279be9aa 100644
--- a/arch/ppc/8xx_io/fec.c
+++ b/arch/ppc/8xx_io/fec.c
@@ -725,7 +725,7 @@ while (!(bdp->cbd_sc & BD_ENET_RX_EMPTY)) {
                 fep->stats.rx_dropped++;
         } else {
                 skb_put(skb,pkt_len-4); /* Make room */
-                eth_copy_and_sum(skb, data, pkt_len-4, 0);
+                skb_copy_to_linear_data(skb, data, pkt_len-4);
                 skb->protocol=eth_type_trans(skb,dev);
                 netif_rx(skb);
         }
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index ccce2a4a1522..6bdeeb70b157 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -1237,8 +1237,10 @@ config PCI
           infrastructure code to support PCI bus devices.
 
 config PCI_DOMAINS
-        bool
-        default PCI
+        def_bool PCI
+
+config PCI_SYSCALL
+        def_bool PCI
 
 config MPC83xx_PCI2
         bool "Support for 2nd PCI host controller"
diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c
index 5e723c4c2571..c2ec13bea006 100644
--- a/arch/ppc/kernel/pci.c
+++ b/arch/ppc/kernel/pci.c
@@ -633,12 +633,6 @@ void pcibios_make_OF_bus_map(void)
 {
 }
 
-/* Add sysfs properties */
-void pcibios_add_platform_entries(struct pci_dev *pdev)
-{
-}
-
-
 static int __init
 pcibios_init(void)
 {
diff --git a/arch/ppc/kernel/traps.c b/arch/ppc/kernel/traps.c
index aea100be52c8..0eaef7c8378b 100644
--- a/arch/ppc/kernel/traps.c
+++ b/arch/ppc/kernel/traps.c
@@ -619,7 +619,7 @@ void program_check_exception(struct pt_regs *regs)
                         return;
 
                 if (!(regs->msr & MSR_PR) &&  /* not user-mode */
-                    report_bug(regs->nip) == BUG_TRAP_TYPE_WARN) {
+                    report_bug(regs->nip, regs) == BUG_TRAP_TYPE_WARN) {
                         regs->nip += 4;
                         return;
                 }
diff --git a/arch/ppc/syslib/mv64x60.c b/arch/ppc/syslib/mv64x60.c
index 8485a68cd475..032f4b7f4225 100644
--- a/arch/ppc/syslib/mv64x60.c
+++ b/arch/ppc/syslib/mv64x60.c
@@ -2415,7 +2415,6 @@ static struct bin_attribute mv64xxx_hs_reg_attr = { /* Hotswap register */
         .attr = {
                 .name = "hs_reg",
                 .mode = S_IRUGO | S_IWUSR,
-                .owner = THIS_MODULE,
         },
         .size  = VAL_LEN_MAX,
         .read  = mv64xxx_hs_reg_read,