3 files changed, 7 insertions, 8 deletions

diff --git a/arch/ppc/kernel/dma-mapping.c b/arch/ppc/kernel/dma-mapping.c
index 685fd0defe23..61465ec88bc7 100644
--- a/arch/ppc/kernel/dma-mapping.c
+++ b/arch/ppc/kernel/dma-mapping.c
@@ -223,6 +223,8 @@ __dma_alloc_coherent(size_t size, dma_addr_t *handle, gfp_t gfp)
                 pte_t *pte = consistent_pte + CONSISTENT_OFFSET(vaddr);
                 struct page *end = page + (1 << order);
 
+                split_page(page, order);
+
                 /*
                  * Set the "dma handle"
                  */
@@ -231,7 +233,6 @@ __dma_alloc_coherent(size_t size, dma_addr_t *handle, gfp_t gfp)
                 do {
                         BUG_ON(!pte_none(*pte));
 
-                        set_page_count(page, 1);
                         SetPageReserved(page);
                         set_pte_at(&init_mm, vaddr,
                                    pte, mk_pte(page, pgprot_noncached(PAGE_KERNEL)));
@@ -244,7 +245,6 @@ __dma_alloc_coherent(size_t size, dma_addr_t *handle, gfp_t gfp)
                  * Free the otherwise unused pages.
                  */
                 while (page < end) {
-                        set_page_count(page, 1);
                         __free_page(page);
                         page++;
                 }
diff --git a/arch/ppc/mm/init.c b/arch/ppc/mm/init.c
index 134db5c04203..cb1c294fb932 100644
--- a/arch/ppc/mm/init.c
+++ b/arch/ppc/mm/init.c
@@ -140,7 +140,7 @@ static void free_sec(unsigned long start, unsigned long end, const char *name)
 
         while (start < end) {
                 ClearPageReserved(virt_to_page(start));
-                set_page_count(virt_to_page(start), 1);
+                init_page_count(virt_to_page(start));
                 free_page(start);
                 cnt++;
                 start += PAGE_SIZE;
@@ -172,7 +172,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 
         for (; start < end; start += PAGE_SIZE) {
                 ClearPageReserved(virt_to_page(start));
-                set_page_count(virt_to_page(start), 1);
+                init_page_count(virt_to_page(start));
                 free_page(start);
                 totalram_pages++;
         }
@@ -441,7 +441,7 @@ void __init mem_init(void)
                         struct page *page = mem_map + pfn;
 
                         ClearPageReserved(page);
-                        set_page_count(page, 1);
+                        init_page_count(page);
                         __free_page(page);
                         totalhigh_pages++;
                 }
diff --git a/arch/ppc/platforms/hdpu.c b/arch/ppc/platforms/hdpu.c
index fc869bb5b2b4..75dc2ee87d2f 100644
--- a/arch/ppc/platforms/hdpu.c
+++ b/arch/ppc/platforms/hdpu.c
@@ -316,11 +316,10 @@ static void __init hdpu_fixup_eth_pdata(struct platform_device *pd)
         struct mv643xx_eth_platform_data *eth_pd;
         eth_pd = pd->dev.platform_data;
 
-        eth_pd->port_serial_control =
-            mv64x60_read(&bh, MV643XX_ETH_PORT_SERIAL_CONTROL_REG(pd->id) & ~1);
-
         eth_pd->force_phy_addr = 1;
         eth_pd->phy_addr = pd->id;
+        eth_pd->speed = SPEED_100;
+        eth_pd->duplex = DUPLEX_FULL;
         eth_pd->tx_queue_size = 400;
         eth_pd->rx_queue_size = 800;
 }