Commit cbd84ec0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* '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
parents 7b286af3 280bb6b1

arch/powerpc/configs/mpc8272_ads_defconfig

+3 −3
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.24-rc4

# Thu Dec  6 16:48:30 2007

# Linux kernel version: 2.6.24-rc5

# Thu Dec 13 22:40:57 2007

#

# CONFIG_PPC64 is not set
@@ -491,7 +491,7 @@ CONFIG_MII=y 
CONFIG_FS_ENET=y

# CONFIG_FS_ENET_HAS_SCC is not set

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_ACENIC is not set

# CONFIG_DL2K is not set

arch/powerpc/configs/pq2fads_defconfig

+3 −3
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.24-rc4

# Thu Dec  6 16:49:09 2007

# Linux kernel version: 2.6.24-rc5

# Thu Dec 13 22:39:18 2007

#

# CONFIG_PPC64 is not set
@@ -548,7 +548,7 @@ CONFIG_MII=y 
CONFIG_FS_ENET=y

# CONFIG_FS_ENET_HAS_SCC is not set

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_ACENIC is not set

# CONFIG_DL2K is not set

arch/powerpc/configs/ps3_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ CONFIG_PS3_HTAB_SIZE=20 
CONFIG_PS3_USE_LPAR_ADDR=y

CONFIG_PS3_VUART=y

CONFIG_PS3_PS3AV=y

CONFIG_PS3_SYS_MANAGER=m

CONFIG_PS3_SYS_MANAGER=y

CONFIG_PS3_STORAGE=y

CONFIG_PS3_DISK=y

CONFIG_PS3_ROM=y

arch/powerpc/kernel/ppc_ksyms.c

+0 −12
Original line number Diff line number Diff line
@@ -45,10 +45,6 @@ 
#include <asm/signal.h>

#include <asm/dcr.h>



#ifdef  CONFIG_8xx

#include <asm/commproc.h>

#endif



#ifdef CONFIG_PPC64

EXPORT_SYMBOL(local_irq_restore);

#endif
@@ -172,14 +168,6 @@ EXPORT_SYMBOL(console_drivers); 
EXPORT_SYMBOL(cacheable_memcpy);

#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

EXPORT_SYMBOL(next_mmu_context);

EXPORT_SYMBOL(set_context);

arch/powerpc/math-emu/op-2.h

+2 −1
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@ 
    else								\

      {									\

	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;							\

      }									\

  } while (0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE