diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 18:50:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 18:50:49 -0400 |
commit | 9a64388d83f6ef08dfff405a9d122e3dbcb6bf38 (patch) | |
tree | a77532ce4d6d56be6c6c7f405cd901a0184250fb /arch/ppc | |
parent | e80ab411e589e00550e2e6e5a6a02d59cc730357 (diff) | |
parent | 14b3ca4022f050f8622ed282b734ddf445464583 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (202 commits)
[POWERPC] Fix compile breakage for 64-bit UP configs
[POWERPC] Define copy_siginfo_from_user32
[POWERPC] Add compat handler for PTRACE_GETSIGINFO
[POWERPC] i2c: Fix build breakage introduced by OF helpers
[POWERPC] Optimize fls64() on 64-bit processors
[POWERPC] irqtrace support for 64-bit powerpc
[POWERPC] Stacktrace support for lockdep
[POWERPC] Move stackframe definitions to common header
[POWERPC] Fix device-tree locking vs. interrupts
[POWERPC] Make pci_bus_to_host()'s struct pci_bus * argument const
[POWERPC] Remove unused __max_memory variable
[POWERPC] Simplify xics direct/lpar irq_host setup
[POWERPC] Use pseries_setup_i8259_cascade() in pseries_mpic_init_IRQ()
[POWERPC] Turn xics_setup_8259_cascade() into a generic pseries_setup_i8259_cascade()
[POWERPC] Move xics_setup_8259_cascade() into platforms/pseries/setup.c
[POWERPC] Use asm-generic/bitops/find.h in bitops.h
[POWERPC] 83xx: mpc8315 - fix USB UTMI Host setup
[POWERPC] 85xx: Fix the size of qe muram for MPC8568E
[POWERPC] 86xx: mpc86xx_hpcn - Temporarily accept old dts node identifier.
[POWERPC] 86xx: mark functions static, other minor cleanups
...
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 |
6 files changed, 8 insertions, 26 deletions
diff --git a/arch/ppc/8xx_io/commproc.c b/arch/ppc/8xx_io/commproc.c index 9d656de0f0f..752443df5ec 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 11b0aa6ca97..1d4b49ad0d7 100644 --- a/arch/ppc/8xx_io/fec.c +++ b/arch/ppc/8xx_io/fec.c | |||
@@ -520,7 +520,7 @@ fec_enet_interrupt(int irq, void * dev_id) | |||
520 | #ifdef CONFIG_USE_MDIO | 520 | #ifdef CONFIG_USE_MDIO |
521 | fec_enet_mii(dev); | 521 | fec_enet_mii(dev); |
522 | #else | 522 | #else |
523 | printk("%s[%d] %s: unexpected FEC_ENET_MII event\n", __FILE__,__LINE__,__FUNCTION__); | 523 | printk("%s[%d] %s: unexpected FEC_ENET_MII event\n", __FILE__, __LINE__, __func__); |
524 | #endif /* CONFIG_USE_MDIO */ | 524 | #endif /* CONFIG_USE_MDIO */ |
525 | } | 525 | } |
526 | 526 | ||
@@ -1441,7 +1441,7 @@ irqreturn_t mii_link_interrupt(int irq, void * dev_id) | |||
1441 | fecp->fec_ecntrl = ecntrl; /* restore old settings */ | 1441 | fecp->fec_ecntrl = ecntrl; /* restore old settings */ |
1442 | } | 1442 | } |
1443 | #else | 1443 | #else |
1444 | printk("%s[%d] %s: unexpected Link interrupt\n", __FILE__,__LINE__,__FUNCTION__); | 1444 | printk("%s[%d] %s: unexpected Link interrupt\n", __FILE__, __LINE__, __func__); |
1445 | #endif /* CONFIG_USE_MDIO */ | 1445 | #endif /* CONFIG_USE_MDIO */ |
1446 | 1446 | ||
1447 | #ifndef CONFIG_RPXCLASSIC | 1447 | #ifndef CONFIG_RPXCLASSIC |
diff --git a/arch/ppc/kernel/head.S b/arch/ppc/kernel/head.S index 1b0ec7202dd..e7e642b9513 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 7444df3889c..1a63711081b 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 179b4a99b5b..f1dee1e8780 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 9f504fc7693..ab0cf4ced9e 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; |