diff options
Diffstat (limited to 'arch/ppc')
-rw-r--r-- | arch/ppc/8xx_io/commproc.c | 2 | ||||
-rw-r--r-- | arch/ppc/8xx_io/fec.c | 4 | ||||
-rw-r--r-- | arch/ppc/kernel/head.S | 17 | ||||
-rw-r--r-- | arch/ppc/mm/init.c | 1 | ||||
-rw-r--r-- | arch/ppc/platforms/radstone_ppc7d.c | 8 | ||||
-rw-r--r-- | arch/ppc/syslib/mpc52xx_setup.c | 2 | ||||
-rw-r--r-- | arch/ppc/syslib/ocp.c | 1 |
7 files changed, 8 insertions, 27 deletions
diff --git a/arch/ppc/8xx_io/commproc.c b/arch/ppc/8xx_io/commproc.c index 9d656de0f0f1..752443df5ecf 100644 --- a/arch/ppc/8xx_io/commproc.c +++ b/arch/ppc/8xx_io/commproc.c | |||
@@ -43,7 +43,7 @@ | |||
43 | ({ \ | 43 | ({ \ |
44 | u32 offset = offsetof(immap_t, member); \ | 44 | u32 offset = offsetof(immap_t, member); \ |
45 | void *addr = ioremap (IMAP_ADDR + offset, \ | 45 | void *addr = ioremap (IMAP_ADDR + offset, \ |
46 | sizeof( ((immap_t*)0)->member)); \ | 46 | FIELD_SIZEOF(immap_t, member)); \ |
47 | addr; \ | 47 | addr; \ |
48 | }) | 48 | }) |
49 | 49 | ||
diff --git a/arch/ppc/8xx_io/fec.c b/arch/ppc/8xx_io/fec.c index d7b7ba93e1de..2c604d4f6e8b 100644 --- a/arch/ppc/8xx_io/fec.c +++ b/arch/ppc/8xx_io/fec.c | |||
@@ -519,7 +519,7 @@ fec_enet_interrupt(int irq, void *dev_id) | |||
519 | #ifdef CONFIG_USE_MDIO | 519 | #ifdef CONFIG_USE_MDIO |
520 | fec_enet_mii(dev); | 520 | fec_enet_mii(dev); |
521 | #else | 521 | #else |
522 | printk("%s[%d] %s: unexpected FEC_ENET_MII event\n", __FILE__,__LINE__,__FUNCTION__); | 522 | printk("%s[%d] %s: unexpected FEC_ENET_MII event\n", __FILE__, __LINE__, __func__); |
523 | #endif /* CONFIG_USE_MDIO */ | 523 | #endif /* CONFIG_USE_MDIO */ |
524 | } | 524 | } |
525 | 525 | ||
@@ -1440,7 +1440,7 @@ irqreturn_t mii_link_interrupt(int irq, void * dev_id) | |||
1440 | fecp->fec_ecntrl = ecntrl; /* restore old settings */ | 1440 | fecp->fec_ecntrl = ecntrl; /* restore old settings */ |
1441 | } | 1441 | } |
1442 | #else | 1442 | #else |
1443 | printk("%s[%d] %s: unexpected Link interrupt\n", __FILE__,__LINE__,__FUNCTION__); | 1443 | printk("%s[%d] %s: unexpected Link interrupt\n", __FILE__, __LINE__, __func__); |
1444 | #endif /* CONFIG_USE_MDIO */ | 1444 | #endif /* CONFIG_USE_MDIO */ |
1445 | 1445 | ||
1446 | #ifndef CONFIG_RPXCLASSIC | 1446 | #ifndef CONFIG_RPXCLASSIC |
diff --git a/arch/ppc/kernel/head.S b/arch/ppc/kernel/head.S index 1b0ec7202dd5..e7e642b95138 100644 --- a/arch/ppc/kernel/head.S +++ b/arch/ppc/kernel/head.S | |||
@@ -701,23 +701,6 @@ load_up_altivec: | |||
701 | b fast_exception_return | 701 | b fast_exception_return |
702 | 702 | ||
703 | /* | 703 | /* |
704 | * AltiVec unavailable trap from kernel - print a message, but let | ||
705 | * the task use AltiVec in the kernel until it returns to user mode. | ||
706 | */ | ||
707 | KernelAltiVec: | ||
708 | lwz r3,_MSR(r1) | ||
709 | oris r3,r3,MSR_VEC@h | ||
710 | stw r3,_MSR(r1) /* enable use of AltiVec after return */ | ||
711 | lis r3,87f@h | ||
712 | ori r3,r3,87f@l | ||
713 | mr r4,r2 /* current */ | ||
714 | lwz r5,_NIP(r1) | ||
715 | bl printk | ||
716 | b ret_from_except | ||
717 | 87: .string "AltiVec used in kernel (task=%p, pc=%x) \n" | ||
718 | .align 4,0 | ||
719 | |||
720 | /* | ||
721 | * giveup_altivec(tsk) | 704 | * giveup_altivec(tsk) |
722 | * Disable AltiVec for the task given as the argument, | 705 | * Disable AltiVec for the task given as the argument, |
723 | * and save the AltiVec registers in its thread_struct. | 706 | * and save the AltiVec registers in its thread_struct. |
diff --git a/arch/ppc/mm/init.c b/arch/ppc/mm/init.c index 7444df3889c5..1a63711081b5 100644 --- a/arch/ppc/mm/init.c +++ b/arch/ppc/mm/init.c | |||
@@ -109,7 +109,6 @@ void show_mem(void) | |||
109 | 109 | ||
110 | printk("Mem-info:\n"); | 110 | printk("Mem-info:\n"); |
111 | show_free_areas(); | 111 | show_free_areas(); |
112 | printk("Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10)); | ||
113 | i = max_mapnr; | 112 | i = max_mapnr; |
114 | while (i-- > 0) { | 113 | while (i-- > 0) { |
115 | total++; | 114 | total++; |
diff --git a/arch/ppc/platforms/radstone_ppc7d.c b/arch/ppc/platforms/radstone_ppc7d.c index 179b4a99b5b5..f1dee1e87809 100644 --- a/arch/ppc/platforms/radstone_ppc7d.c +++ b/arch/ppc/platforms/radstone_ppc7d.c | |||
@@ -511,7 +511,7 @@ static void __init ppc7d_init_irq(void) | |||
511 | { | 511 | { |
512 | int irq; | 512 | int irq; |
513 | 513 | ||
514 | pr_debug("%s\n", __FUNCTION__); | 514 | pr_debug("%s\n", __func__); |
515 | i8259_init(0, 0); | 515 | i8259_init(0, 0); |
516 | mv64360_init_irq(); | 516 | mv64360_init_irq(); |
517 | 517 | ||
@@ -568,7 +568,7 @@ static int __init ppc7d_map_irq(struct pci_dev *dev, unsigned char idsel, | |||
568 | }; | 568 | }; |
569 | const long min_idsel = 10, max_idsel = 14, irqs_per_slot = 4; | 569 | const long min_idsel = 10, max_idsel = 14, irqs_per_slot = 4; |
570 | 570 | ||
571 | pr_debug("%s: %04x/%04x/%x: idsel=%hx pin=%hu\n", __FUNCTION__, | 571 | pr_debug("%s: %04x/%04x/%x: idsel=%hx pin=%hu\n", __func__, |
572 | dev->vendor, dev->device, PCI_FUNC(dev->devfn), idsel, pin); | 572 | dev->vendor, dev->device, PCI_FUNC(dev->devfn), idsel, pin); |
573 | 573 | ||
574 | return PCI_IRQ_TABLE_LOOKUP; | 574 | return PCI_IRQ_TABLE_LOOKUP; |
@@ -1299,7 +1299,7 @@ static void ppc7d_init2(void) | |||
1299 | u32 data; | 1299 | u32 data; |
1300 | u8 data8; | 1300 | u8 data8; |
1301 | 1301 | ||
1302 | pr_debug("%s: enter\n", __FUNCTION__); | 1302 | pr_debug("%s: enter\n", __func__); |
1303 | 1303 | ||
1304 | /* Wait for debugger? */ | 1304 | /* Wait for debugger? */ |
1305 | if (ppc7d_wait_debugger) { | 1305 | if (ppc7d_wait_debugger) { |
@@ -1332,7 +1332,7 @@ static void ppc7d_init2(void) | |||
1332 | ppc_md.set_rtc_time = ppc7d_set_rtc_time; | 1332 | ppc_md.set_rtc_time = ppc7d_set_rtc_time; |
1333 | ppc_md.get_rtc_time = ppc7d_get_rtc_time; | 1333 | ppc_md.get_rtc_time = ppc7d_get_rtc_time; |
1334 | 1334 | ||
1335 | pr_debug("%s: exit\n", __FUNCTION__); | 1335 | pr_debug("%s: exit\n", __func__); |
1336 | } | 1336 | } |
1337 | 1337 | ||
1338 | /* Called from machine_init(), early, before any of the __init functions | 1338 | /* Called from machine_init(), early, before any of the __init functions |
diff --git a/arch/ppc/syslib/mpc52xx_setup.c b/arch/ppc/syslib/mpc52xx_setup.c index 9f504fc7693e..ab0cf4ced9e5 100644 --- a/arch/ppc/syslib/mpc52xx_setup.c +++ b/arch/ppc/syslib/mpc52xx_setup.c | |||
@@ -279,7 +279,7 @@ int mpc52xx_match_psc_function(int psc_idx, const char *func) | |||
279 | 279 | ||
280 | int mpc52xx_set_psc_clkdiv(int psc_id, int clkdiv) | 280 | int mpc52xx_set_psc_clkdiv(int psc_id, int clkdiv) |
281 | { | 281 | { |
282 | static spinlock_t lock = SPIN_LOCK_UNLOCKED; | 282 | static DEFINE_SPINLOCK(lock); |
283 | struct mpc52xx_cdm __iomem *cdm; | 283 | struct mpc52xx_cdm __iomem *cdm; |
284 | unsigned long flags; | 284 | unsigned long flags; |
285 | u16 mclken_div; | 285 | u16 mclken_div; |
diff --git a/arch/ppc/syslib/ocp.c b/arch/ppc/syslib/ocp.c index ac80370ed2f7..a6fb7dcfa738 100644 --- a/arch/ppc/syslib/ocp.c +++ b/arch/ppc/syslib/ocp.c | |||
@@ -49,7 +49,6 @@ | |||
49 | #include <asm/io.h> | 49 | #include <asm/io.h> |
50 | #include <asm/ocp.h> | 50 | #include <asm/ocp.h> |
51 | #include <asm/errno.h> | 51 | #include <asm/errno.h> |
52 | #include <asm/semaphore.h> | ||
53 | 52 | ||
54 | //#define DBG(x) printk x | 53 | //#define DBG(x) printk x |
55 | #define DBG(x) | 54 | #define DBG(x) |