leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

Browse Source 
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Make PS3_SYS_MANAGER default y, not m
  [POWERPC] Fix rounding bug in emulation for double float operating
  [POWERPC] iSeries: don't printk with HV spinlock held
  [POWERPC] 82xx: mpc8272ads, pq2fads: Update defconfig with CONFIG_FS_ENET_MDIO_FCC
  [POWRPC] CPM2: Eliminate section mismatch warning in cpm2_reset().
  [POWERPC] Kill non-existent symbols from ksyms and commproc.h
  [POWERPC] Fix typo #ifdef -> #ifndef
This commit is contained in:
Linus Torvalds 2007-12-17 08:41:56 -08:00
commit cbd84ec0d5
10 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/powerpc/configs/mpc8272_ads_defconfig
View File

@ -1,7 +1,7 @@
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Linux kernel version: 2.6.24-rc4 # Linux kernel version: 2.6.24-rc5
# Thu Dec 6 16:48:30 2007 # Thu Dec 13 22:40:57 2007
# #
# CONFIG_PPC64 is not set # CONFIG_PPC64 is not set
@ -491,7 +491,7 @@ CONFIG_MII=y
CONFIG_FS_ENET=y CONFIG_FS_ENET=y
# CONFIG_FS_ENET_HAS_SCC is not set # CONFIG_FS_ENET_HAS_SCC is not set
CONFIG_FS_ENET_HAS_FCC=y CONFIG_FS_ENET_HAS_FCC=y
# CONFIG_FS_ENET_MDIO_FCC is not set CONFIG_FS_ENET_MDIO_FCC=y
CONFIG_NETDEV_1000=y CONFIG_NETDEV_1000=y
# CONFIG_ACENIC is not set # CONFIG_ACENIC is not set
# CONFIG_DL2K is not set # CONFIG_DL2K is not set

6
arch/powerpc/configs/pq2fads_defconfig
View File

@ -1,7 +1,7 @@
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Linux kernel version: 2.6.24-rc4 # Linux kernel version: 2.6.24-rc5
# Thu Dec 6 16:49:09 2007 # Thu Dec 13 22:39:18 2007
# #
# CONFIG_PPC64 is not set # CONFIG_PPC64 is not set
@ -548,7 +548,7 @@ CONFIG_MII=y
CONFIG_FS_ENET=y CONFIG_FS_ENET=y
# CONFIG_FS_ENET_HAS_SCC is not set # CONFIG_FS_ENET_HAS_SCC is not set
CONFIG_FS_ENET_HAS_FCC=y CONFIG_FS_ENET_HAS_FCC=y
# CONFIG_FS_ENET_MDIO_FCC is not set CONFIG_FS_ENET_MDIO_FCC=y
CONFIG_NETDEV_1000=y CONFIG_NETDEV_1000=y
# CONFIG_ACENIC is not set # CONFIG_ACENIC is not set
# CONFIG_DL2K is not set # CONFIG_DL2K is not set

2
arch/powerpc/configs/ps3_defconfig
View File

@ -157,7 +157,7 @@ CONFIG_PS3_HTAB_SIZE=20
CONFIG_PS3_USE_LPAR_ADDR=y CONFIG_PS3_USE_LPAR_ADDR=y
CONFIG_PS3_VUART=y CONFIG_PS3_VUART=y
CONFIG_PS3_PS3AV=y CONFIG_PS3_PS3AV=y
CONFIG_PS3_SYS_MANAGER=m CONFIG_PS3_SYS_MANAGER=y
CONFIG_PS3_STORAGE=y CONFIG_PS3_STORAGE=y
CONFIG_PS3_DISK=y CONFIG_PS3_DISK=y
CONFIG_PS3_ROM=y CONFIG_PS3_ROM=y

12
arch/powerpc/kernel/ppc_ksyms.c
View File

@ -45,10 +45,6 @@
#include <asm/signal.h> #include <asm/signal.h>
#include <asm/dcr.h> #include <asm/dcr.h>
#ifdef CONFIG_8xx
#include <asm/commproc.h>
#endif
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
EXPORT_SYMBOL(local_irq_restore); EXPORT_SYMBOL(local_irq_restore);
#endif #endif
@ -172,14 +168,6 @@ EXPORT_SYMBOL(console_drivers);
EXPORT_SYMBOL(cacheable_memcpy); EXPORT_SYMBOL(cacheable_memcpy);
#endif #endif
#ifdef CONFIG_8xx
EXPORT_SYMBOL(cpm_install_handler);
EXPORT_SYMBOL(cpm_free_handler);
#endif /* CONFIG_8xx */
#if defined(CONFIG_8xx)
EXPORT_SYMBOL(__res);
#endif
#ifdef CONFIG_PPC32 #ifdef CONFIG_PPC32
EXPORT_SYMBOL(next_mmu_context); EXPORT_SYMBOL(next_mmu_context);
EXPORT_SYMBOL(set_context); EXPORT_SYMBOL(set_context);

3
arch/powerpc/math-emu/op-2.h
View File

@ -59,7 +59,8 @@
else \ else \
{ \ { \
X##_f0 = (X##_f1 >> ((N) - _FP_W_TYPE_SIZE) | \ X##_f0 = (X##_f1 >> ((N) - _FP_W_TYPE_SIZE) | \
(((X##_f1 << (sz - (N))) | X##_f0) != 0)); \ (((X##_f1 << (2 * _FP_W_TYPE_SIZE - (N))) | \
X##_f0) != 0)); \
X##_f1 = 0; \ X##_f1 = 0; \
} \ } \
} while (0) } while (0)

17
arch/powerpc/platforms/iseries/lpevents.c
View File

@ -121,6 +121,7 @@ void process_hvlpevents(void)
{ {
struct HvLpEvent * event; struct HvLpEvent * event;
restart:
/* If we have recursed, just return */ /* If we have recursed, just return */
if (!spin_trylock(&hvlpevent_queue.hq_lock)) if (!spin_trylock(&hvlpevent_queue.hq_lock))
return; return;
@ -146,8 +147,20 @@ void process_hvlpevents(void)
if (event->xType < HvLpEvent_Type_NumTypes && if (event->xType < HvLpEvent_Type_NumTypes &&
lpEventHandler[event->xType]) lpEventHandler[event->xType])
lpEventHandler[event->xType](event); lpEventHandler[event->xType](event);
else else {
printk(KERN_INFO "Unexpected Lp Event type=%d\n", event->xType ); u8 type = event->xType;
/*
* Don't printk in the spinlock as printk
* may require ack events form the HV to send
* any characters there.
*/
hvlpevent_clear_valid(event);
spin_unlock(&hvlpevent_queue.hq_lock);
printk(KERN_INFO
"Unexpected Lp Event type=%d\n", type);
goto restart;
}
hvlpevent_clear_valid(event); hvlpevent_clear_valid(event);
} else if (hvlpevent_queue.hq_overflow_pending) } else if (hvlpevent_queue.hq_overflow_pending)

2
arch/powerpc/platforms/ps3/Kconfig
View File

@ -91,7 +91,7 @@ config PS3_SYS_MANAGER
depends on PPC_PS3 depends on PPC_PS3
tristate "PS3 System Manager driver" if PS3_ADVANCED tristate "PS3 System Manager driver" if PS3_ADVANCED
select PS3_VUART select PS3_VUART
default m default y
help help
Include support for the PS3 System Manager. Include support for the PS3 System Manager.

3
arch/powerpc/sysdev/cpm2_common.c
View File

@ -61,8 +61,7 @@ cpm2_map_t __iomem *cpm2_immr;
of space for CPM as it is larger of space for CPM as it is larger
than on PQ2 */ than on PQ2 */
void void __init cpm2_reset(void)
cpm2_reset(void)
{ {
#ifdef CONFIG_PPC_85xx #ifdef CONFIG_PPC_85xx
cpm2_immr = ioremap(CPM_MAP_ADDR, CPM_MAP_SIZE); cpm2_immr = ioremap(CPM_MAP_ADDR, CPM_MAP_SIZE);

2
drivers/net/fs_enet/mac-scc.c
View File

@ -158,7 +158,7 @@ static int setup_data(struct net_device *dev)
{ {
struct fs_enet_private *fep = netdev_priv(dev); struct fs_enet_private *fep = netdev_priv(dev);
#ifdef CONFIG_PPC_CPM_NEW_BINDING #ifndef CONFIG_PPC_CPM_NEW_BINDING
struct fs_platform_info *fpi = fep->fpi; struct fs_platform_info *fpi = fep->fpi;
fep->scc.idx = fs_get_scc_index(fpi->fs_no); fep->scc.idx = fs_get_scc_index(fpi->fs_no);

3
include/asm-powerpc/commproc.h
View File

@ -698,9 +698,6 @@ typedef struct risc_timer_pram {
#define CICR_IEN ((uint)0x00000080) /* Int. enable */ #define CICR_IEN ((uint)0x00000080) /* Int. enable */
#define CICR_SPS ((uint)0x00000001) /* SCC Spread */ #define CICR_SPS ((uint)0x00000001) /* SCC Spread */
extern void cpm_install_handler(int vec, void (*handler)(void *), void *dev_id);
extern void cpm_free_handler(int vec);
#define IMAP_ADDR (get_immrbase()) #define IMAP_ADDR (get_immrbase())
#define CPM_PIN_INPUT 0 #define CPM_PIN_INPUT 0