Skip to content

L
linux
Commit 5bac8cde authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge bk://kernel.bkbits.net/davem/tg3-2.6 

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 485b5251 30654057
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3130 additions and 2258 deletions
arch/arm/kernel/irq.c
View file @ 5bac8cde
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
#define MAX_IRQ_CNT 100000 #define MAX_IRQ_CNT 100000
static volatile unsigned long irq_err_count; static volatile unsigned long irq_err_count;
static spinlock_t irq_controller_lock; static spinlock_t irq_controller_lock = SPIN_LOCK_UNLOCKED;
static LIST_HEAD(irq_pending); static LIST_HEAD(irq_pending);
struct irqdesc irq_desc[NR_IRQS]; struct irqdesc irq_desc[NR_IRQS];
......
arch/ppc/4xx_io/serial_sicc.c
View file @ 5bac8cde
...@@ -1431,7 +1431,6 @@ static void siccuart_close(struct tty_struct *tty, struct file *filp) ...@@ -1431,7 +1431,6 @@ static void siccuart_close(struct tty_struct *tty, struct file *filp)
save_flags(flags); cli(); save_flags(flags); cli();
if (tty_hung_up_p(filp)) { if (tty_hung_up_p(filp)) {
MOD_DEC_USE_COUNT;
restore_flags(flags); restore_flags(flags);
return; return;
} }
...@@ -1452,7 +1451,6 @@ static void siccuart_close(struct tty_struct *tty, struct file *filp) ...@@ -1452,7 +1451,6 @@ static void siccuart_close(struct tty_struct *tty, struct file *filp)
state->count = 0; state->count = 0;
} }
if (state->count) { if (state->count) {
MOD_DEC_USE_COUNT;
restore_flags(flags); restore_flags(flags);
return; return;
} }
...@@ -1495,7 +1493,6 @@ static void siccuart_close(struct tty_struct *tty, struct file *filp) ...@@ -1495,7 +1493,6 @@ static void siccuart_close(struct tty_struct *tty, struct file *filp)
} }
info->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING); info->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
wake_up_interruptible(&info->close_wait); wake_up_interruptible(&info->close_wait);
MOD_DEC_USE_COUNT;
} }
static void siccuart_wait_until_sent(struct tty_struct *tty, int timeout) static void siccuart_wait_until_sent(struct tty_struct *tty, int timeout)
...@@ -1685,9 +1682,7 @@ static int siccuart_open(struct tty_struct *tty, struct file *filp) ...@@ -1685,9 +1682,7 @@ static int siccuart_open(struct tty_struct *tty, struct file *filp)
// is this a line that we've got? // is this a line that we've got?
MOD_INC_USE_COUNT;
if (line >= SERIAL_SICC_NR) { if (line >= SERIAL_SICC_NR) {
MOD_DEC_USE_COUNT;
return -ENODEV; return -ENODEV;
} }
...@@ -1707,7 +1702,6 @@ static int siccuart_open(struct tty_struct *tty, struct file *filp) ...@@ -1707,7 +1702,6 @@ static int siccuart_open(struct tty_struct *tty, struct file *filp)
if (tmp_buf) if (tmp_buf)
free_page(page); free_page(page);
else if (!page) { else if (!page) {
MOD_DEC_USE_COUNT;
return -ENOMEM; return -ENOMEM;
} }
tmp_buf = (u_char *)page; tmp_buf = (u_char *)page;
...@@ -1720,7 +1714,6 @@ static int siccuart_open(struct tty_struct *tty, struct file *filp) ...@@ -1720,7 +1714,6 @@ static int siccuart_open(struct tty_struct *tty, struct file *filp)
(info->flags & ASYNC_CLOSING)) { (info->flags & ASYNC_CLOSING)) {
if (info->flags & ASYNC_CLOSING) if (info->flags & ASYNC_CLOSING)
interruptible_sleep_on(&info->close_wait); interruptible_sleep_on(&info->close_wait);
MOD_DEC_USE_COUNT;
return -EAGAIN; return -EAGAIN;
} }
...@@ -1729,13 +1722,11 @@ static int siccuart_open(struct tty_struct *tty, struct file *filp) ...@@ -1729,13 +1722,11 @@ static int siccuart_open(struct tty_struct *tty, struct file *filp)
*/ */
retval = siccuart_startup(info); retval = siccuart_startup(info);
if (retval) { if (retval) {
MOD_DEC_USE_COUNT;
return retval; return retval;
} }
retval = block_til_ready(tty, filp, info); retval = block_til_ready(tty, filp, info);
if (retval) { if (retval) {
MOD_DEC_USE_COUNT;
return retval; return retval;
} }
...@@ -1778,6 +1769,7 @@ int __init siccuart_init(void) ...@@ -1778,6 +1769,7 @@ int __init siccuart_init(void)
return -ENOMEM; return -ENOMEM;
printk("IBM Vesta SICC serial port driver V 0.1 by Yudong Yang and Yi Ge / IBM CRL .\n"); printk("IBM Vesta SICC serial port driver V 0.1 by Yudong Yang and Yi Ge / IBM CRL .\n");
siccnormal_driver->driver_name = "serial_sicc"; siccnormal_driver->driver_name = "serial_sicc";
siccnormal_driver->owner = THIS_MODULE;
siccnormal_driver->name = SERIAL_SICC_NAME; siccnormal_driver->name = SERIAL_SICC_NAME;
siccnormal_driver->major = SERIAL_SICC_MAJOR; siccnormal_driver->major = SERIAL_SICC_MAJOR;
siccnormal_driver->minor_start = SERIAL_SICC_MINOR; siccnormal_driver->minor_start = SERIAL_SICC_MINOR;
......
arch/ppc/8260_io/uart.c
View file @ 5bac8cde
...@@ -592,9 +592,7 @@ static _INLINE_ void check_modem_status(struct async_struct *info) ...@@ -592,9 +592,7 @@ static _INLINE_ void check_modem_status(struct async_struct *info)
#ifdef SERIAL_DEBUG_OPEN #ifdef SERIAL_DEBUG_OPEN
printk("scheduling hangup..."); printk("scheduling hangup...");
#endif #endif
MOD_INC_USE_COUNT; schedule_work(&info->tqueue_hangup);
if (schedule_work(&info->tqueue_hangup) == 0)
MOD_DEC_USE_COUNT;
} }
} }
if (info->flags & ASYNC_CTS_FLOW) { if (info->flags & ASYNC_CTS_FLOW) {
...@@ -723,7 +721,6 @@ static void do_serial_hangup(void *private_) ...@@ -723,7 +721,6 @@ static void do_serial_hangup(void *private_)
tty = info->tty; tty = info->tty;
if (tty) if (tty)
tty_hangup(tty); tty_hangup(tty);
MOD_DEC_USE_COUNT;
} }
/*static void rs_8xx_timer(void) /*static void rs_8xx_timer(void)
...@@ -1689,7 +1686,6 @@ static void rs_8xx_close(struct tty_struct *tty, struct file * filp) ...@@ -1689,7 +1686,6 @@ static void rs_8xx_close(struct tty_struct *tty, struct file * filp)
if (tty_hung_up_p(filp)) { if (tty_hung_up_p(filp)) {
DBG_CNT("before DEC-hung"); DBG_CNT("before DEC-hung");
MOD_DEC_USE_COUNT;
restore_flags(flags); restore_flags(flags);
return; return;
} }
...@@ -1716,7 +1712,6 @@ static void rs_8xx_close(struct tty_struct *tty, struct file * filp) ...@@ -1716,7 +1712,6 @@ static void rs_8xx_close(struct tty_struct *tty, struct file * filp)
} }
if (state->count) { if (state->count) {
DBG_CNT("before DEC-2"); DBG_CNT("before DEC-2");
MOD_DEC_USE_COUNT;
restore_flags(flags); restore_flags(flags);
return; return;
} }
...@@ -1770,7 +1765,6 @@ static void rs_8xx_close(struct tty_struct *tty, struct file * filp) ...@@ -1770,7 +1765,6 @@ static void rs_8xx_close(struct tty_struct *tty, struct file * filp)
} }
info->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING); info->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
wake_up_interruptible(&info->close_wait); wake_up_interruptible(&info->close_wait);
MOD_DEC_USE_COUNT;
restore_flags(flags); restore_flags(flags);
} }
...@@ -2021,7 +2015,6 @@ static int rs_8xx_open(struct tty_struct *tty, struct file * filp) ...@@ -2021,7 +2015,6 @@ static int rs_8xx_open(struct tty_struct *tty, struct file * filp)
if (retval) if (retval)
return retval; return retval;
MOD_INC_USE_COUNT;
retval = block_til_ready(tty, filp, info); retval = block_til_ready(tty, filp, info);
if (retval) { if (retval) {
#ifdef SERIAL_DEBUG_OPEN #ifdef SERIAL_DEBUG_OPEN
...@@ -2530,6 +2523,7 @@ static int __init rs_8xx_init(void) ...@@ -2530,6 +2523,7 @@ static int __init rs_8xx_init(void)
/* Initialize the tty_driver structure */ /* Initialize the tty_driver structure */
serial_driver->owner = THIS_MODULE;
serial_driver->driver_name = "serial"; serial_driver->driver_name = "serial";
serial_driver->devfs_name = "tts/"; serial_driver->devfs_name = "tts/";
serial_driver->name = "ttyS"; serial_driver->name = "ttyS";
......
arch/ppc/8xx_io/cs4218_tdm.c
View file @ 5bac8cde
...@@ -1456,21 +1456,10 @@ static void cs_mksound(unsigned int hz, unsigned int ticks) ...@@ -1456,21 +1456,10 @@ static void cs_mksound(unsigned int hz, unsigned int ticks)
restore_flags(flags); restore_flags(flags);
} }
static void CS_open(void)
{
MOD_INC_USE_COUNT;
}
static void CS_release(void)
{
MOD_DEC_USE_COUNT;
}
static MACHINE mach_cs4218 = { static MACHINE mach_cs4218 = {
.owner = THIS_MODULE,
.name = "HIOX CS4218", .name = "HIOX CS4218",
.name2 = "Built-in Sound", .name2 = "Built-in Sound",
.open = CS_open,
.release = CS_release,
.dma_alloc = CS_Alloc, .dma_alloc = CS_Alloc,
.dma_free = CS_Free, .dma_free = CS_Free,
.irqinit = CS_IrqInit, .irqinit = CS_IrqInit,
......
arch/ppc/8xx_io/uart.c
View file @ 5bac8cde
...@@ -583,9 +583,7 @@ static _INLINE_ void check_modem_status(struct async_struct *info) ...@@ -583,9 +583,7 @@ static _INLINE_ void check_modem_status(struct async_struct *info)
#ifdef SERIAL_DEBUG_OPEN #ifdef SERIAL_DEBUG_OPEN
printk("scheduling hangup..."); printk("scheduling hangup...");
#endif #endif
MOD_INC_USE_COUNT; schedule_task(&info->tqueue_hangup);
if (schedule_task(&info->tqueue_hangup) == 0)
MOD_DEC_USE_COUNT;
} }
} }
if (info->flags & ASYNC_CTS_FLOW) { if (info->flags & ASYNC_CTS_FLOW) {
...@@ -719,7 +717,6 @@ static void do_serial_hangup(void *private_) ...@@ -719,7 +717,6 @@ static void do_serial_hangup(void *private_)
tty = info->tty; tty = info->tty;
if (tty) if (tty)
tty_hangup(tty); tty_hangup(tty);
MOD_DEC_USE_COUNT;
} }
/*static void rs_8xx_timer(void) /*static void rs_8xx_timer(void)
...@@ -1664,7 +1661,6 @@ static void rs_8xx_close(struct tty_struct *tty, struct file * filp) ...@@ -1664,7 +1661,6 @@ static void rs_8xx_close(struct tty_struct *tty, struct file * filp)
if (tty_hung_up_p(filp)) { if (tty_hung_up_p(filp)) {
DBG_CNT("before DEC-hung"); DBG_CNT("before DEC-hung");
MOD_DEC_USE_COUNT;
restore_flags(flags); restore_flags(flags);
return; return;
} }
...@@ -1691,7 +1687,6 @@ static void rs_8xx_close(struct tty_struct *tty, struct file * filp) ...@@ -1691,7 +1687,6 @@ static void rs_8xx_close(struct tty_struct *tty, struct file * filp)
} }
if (state->count) { if (state->count) {
DBG_CNT("before DEC-2"); DBG_CNT("before DEC-2");
MOD_DEC_USE_COUNT;
restore_flags(flags); restore_flags(flags);
return; return;
} }
...@@ -1746,7 +1741,6 @@ static void rs_8xx_close(struct tty_struct *tty, struct file * filp) ...@@ -1746,7 +1741,6 @@ static void rs_8xx_close(struct tty_struct *tty, struct file * filp)
} }
info->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING); info->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
wake_up_interruptible(&info->close_wait); wake_up_interruptible(&info->close_wait);
MOD_DEC_USE_COUNT;
restore_flags(flags); restore_flags(flags);
} }
...@@ -2008,14 +2002,12 @@ static int rs_8xx_open(struct tty_struct *tty, struct file * filp) ...@@ -2008,14 +2002,12 @@ static int rs_8xx_open(struct tty_struct *tty, struct file * filp)
if (retval) if (retval)
return retval; return retval;
MOD_INC_USE_COUNT;
retval = block_til_ready(tty, filp, info); retval = block_til_ready(tty, filp, info);
if (retval) { if (retval) {
#ifdef SERIAL_DEBUG_OPEN #ifdef SERIAL_DEBUG_OPEN
printk("rs_open returning after block_til_ready with %d\n", printk("rs_open returning after block_til_ready with %d\n",
retval); retval);
#endif #endif
MOD_DEC_USE_COUNT;
return retval; return retval;
} }
...@@ -2520,6 +2512,7 @@ static int __init rs_8xx_init(void) ...@@ -2520,6 +2512,7 @@ static int __init rs_8xx_init(void)
/* Initialize the tty_driver structure */ /* Initialize the tty_driver structure */
serial_driver->owner = THIS_MODULE;
serial_driver->driver_name = "serial"; serial_driver->driver_name = "serial";
serial_driver->devfs_name = "tts/"; serial_driver->devfs_name = "tts/";
serial_driver->name = "ttyS"; serial_driver->name = "ttyS";
......
arch/ppc/boot/simple/Makefile
View file @ 5bac8cde
...@@ -41,7 +41,7 @@ end-y := elf ...@@ -41,7 +41,7 @@ end-y := elf
# if present on 'classic' PPC. # if present on 'classic' PPC.
cacheflag-y := -DCLEAR_CACHES="" cacheflag-y := -DCLEAR_CACHES=""
# This file will flush / disable the L2, and L3 if present. # This file will flush / disable the L2, and L3 if present.
clear_L2_L3 := $(boot)/simple/clear.S clear_L2_L3 := $(srctree)/$(boot)/simple/clear.S
# #
# See arch/ppc/kconfig and arch/ppc/platforms/Kconfig # See arch/ppc/kconfig and arch/ppc/platforms/Kconfig
...@@ -125,7 +125,7 @@ EXTRA_AFLAGS := $(extra-aflags-y) ...@@ -125,7 +125,7 @@ EXTRA_AFLAGS := $(extra-aflags-y)
AFLAGS_head.o += $(cacheflag-y) AFLAGS_head.o += $(cacheflag-y)
# Linker args. This specifies where the image will be run at. # Linker args. This specifies where the image will be run at.
LD_ARGS := -T $(boot)/ld.script \ LD_ARGS := -T $(srctree)/$(boot)/ld.script \
-Ttext $(CONFIG_BOOT_LOAD) -Bstatic -Ttext $(CONFIG_BOOT_LOAD) -Bstatic
OBJCOPY_ARGS := -O elf32-powerpc OBJCOPY_ARGS := -O elf32-powerpc
...@@ -159,8 +159,8 @@ MKTREE := $(utils)/mktree ...@@ -159,8 +159,8 @@ MKTREE := $(utils)/mktree
targets := dummy.o targets := dummy.o
$(obj)/zvmlinux: $(OBJS) $(LIBS) $(boot)/ld.script $(images)/vmlinux.gz \ $(obj)/zvmlinux: $(OBJS) $(LIBS) $(srctree)/$(boot)/ld.script \
$(obj)/dummy.o $(images)/vmlinux.gz $(obj)/dummy.o
$(OBJCOPY) $(OBJCOPY_ARGS) \ $(OBJCOPY) $(OBJCOPY_ARGS) \
--add-section=.image=$(images)/vmlinux.gz \ --add-section=.image=$(images)/vmlinux.gz \
--set-section-flags=.image=contents,alloc,load,readonly,data \ --set-section-flags=.image=contents,alloc,load,readonly,data \
...@@ -169,7 +169,7 @@ $(obj)/zvmlinux: $(OBJS) $(LIBS) $(boot)/ld.script $(images)/vmlinux.gz \ ...@@ -169,7 +169,7 @@ $(obj)/zvmlinux: $(OBJS) $(LIBS) $(boot)/ld.script $(images)/vmlinux.gz \
$(OBJCOPY) $(OBJCOPY_ARGS) $@ $@ -R .comment -R .stab \ $(OBJCOPY) $(OBJCOPY_ARGS) $@ $@ -R .comment -R .stab \
-R .stabstr -R .ramdisk -R .sysmap -R .stabstr -R .ramdisk -R .sysmap
$(obj)/zvmlinux.initrd: $(OBJS) $(LIBS) $(boot)/ld.script \ $(obj)/zvmlinux.initrd: $(OBJS) $(LIBS) $(srctree)/$(boot)/ld.script \
$(images)/vmlinux.gz $(obj)/dummy.o $(images)/vmlinux.gz $(obj)/dummy.o
$(OBJCOPY) $(OBJCOPY_ARGS) \ $(OBJCOPY) $(OBJCOPY_ARGS) \
--add-section=.ramdisk=$(images)/ramdisk.image.gz \ --add-section=.ramdisk=$(images)/ramdisk.image.gz \
...@@ -210,10 +210,10 @@ $(images)/zImage.initrd-TREE: $(obj)/zvmlinux.initrd $(MKTREE) ...@@ -210,10 +210,10 @@ $(images)/zImage.initrd-TREE: $(obj)/zvmlinux.initrd $(MKTREE)
$(MKTREE) $(obj)/zvmlinux.initrd $(images)/zImage.initrd.$(end-y) \ $(MKTREE) $(obj)/zvmlinux.initrd $(images)/zImage.initrd.$(end-y) \
$(ENTRYPOINT) $(ENTRYPOINT)
$(images)/zImage-PPLUS: $(obj)/zvmlinux $(utils)/mkprep $(MKBUGBOOT) $(images)/zImage-PPLUS: $(obj)/zvmlinux $(MKPREP) $(MKBUGBOOT)
$(MKPREP) -pbp $(obj)/zvmlinux $(images)/zImage.$(end-y) $(MKPREP) -pbp $(obj)/zvmlinux $(images)/zImage.$(end-y)
$(MKBUGBOOT) $(obj)/zvmlinux $(images)/zImage.bugboot $(MKBUGBOOT) $(obj)/zvmlinux $(images)/zImage.bugboot
$(images)/zImage.initrd-PPLUS: $(obj)/zvmlinux.initrd $(utils)/mkprep $(MKBUGBOOT) $(images)/zImage.initrd-PPLUS: $(obj)/zvmlinux.initrd $(MKPREP) $(MKBUGBOOT)
$(MKPREP) -pbp $(obj)/zvmlinux.initrd $(images)/zImage.initrd.$(end-y) $(MKPREP) -pbp $(obj)/zvmlinux.initrd $(images)/zImage.initrd.$(end-y)
$(MKBUGBOOT) $(obj)/zvmlinux.initrd $(images)/zImage.initrd.bugboot $(MKBUGBOOT) $(obj)/zvmlinux.initrd $(images)/zImage.initrd.bugboot
arch/ppc/configs/common_defconfig
View file @ 5bac8cde
This diff is collapsed.
arch/ppc/configs/ebony_defconfig
View file @ 5bac8cde
...@@ -21,8 +21,10 @@ CONFIG_BROKEN_ON_SMP=y ...@@ -21,8 +21,10 @@ CONFIG_BROKEN_ON_SMP=y
# #
CONFIG_SWAP=y CONFIG_SWAP=y
CONFIG_SYSVIPC=y CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
# CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_BSD_PROCESS_ACCT is not set
CONFIG_SYSCTL=y CONFIG_SYSCTL=y
# CONFIG_AUDIT is not set
CONFIG_LOG_BUF_SHIFT=14 CONFIG_LOG_BUF_SHIFT=14
# CONFIG_HOTPLUG is not set # CONFIG_HOTPLUG is not set
# CONFIG_IKCONFIG is not set # CONFIG_IKCONFIG is not set
...@@ -33,6 +35,7 @@ CONFIG_EPOLL=y ...@@ -33,6 +35,7 @@ CONFIG_EPOLL=y
CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_NOOP=y
CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_AS=y
CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_DEADLINE=y
CONFIG_IOSCHED_CFQ=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
# #
...@@ -67,7 +70,6 @@ CONFIG_440GP=y ...@@ -67,7 +70,6 @@ CONFIG_440GP=y
CONFIG_440=y CONFIG_440=y
CONFIG_BOOKE=y CONFIG_BOOKE=y
CONFIG_IBM_OCP=y CONFIG_IBM_OCP=y
CONFIG_PPC_OCP=y
# CONFIG_PM is not set # CONFIG_PM is not set
CONFIG_NOT_COHERENT_CACHE=y CONFIG_NOT_COHERENT_CACHE=y
...@@ -161,7 +163,6 @@ CONFIG_LBD=y ...@@ -161,7 +163,6 @@ CONFIG_LBD=y
# #
# Fusion MPT device support # Fusion MPT device support
# #
# CONFIG_FUSION is not set
# #
# IEEE 1394 (FireWire) support # IEEE 1394 (FireWire) support
...@@ -210,8 +211,6 @@ CONFIG_IP_PNP_BOOTP=y ...@@ -210,8 +211,6 @@ CONFIG_IP_PNP_BOOTP=y
# #
# CONFIG_IP_VS is not set # CONFIG_IP_VS is not set
# CONFIG_IPV6 is not set # CONFIG_IPV6 is not set
# CONFIG_DECNET is not set
# CONFIG_BRIDGE is not set
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set # CONFIG_NETFILTER_DEBUG is not set
...@@ -230,7 +229,9 @@ CONFIG_NETFILTER=y ...@@ -230,7 +229,9 @@ CONFIG_NETFILTER=y
# #
# CONFIG_IP_SCTP is not set # CONFIG_IP_SCTP is not set
# CONFIG_ATM is not set # CONFIG_ATM is not set
# CONFIG_BRIDGE is not set
# CONFIG_VLAN_8021Q is not set # CONFIG_VLAN_8021Q is not set
# CONFIG_DECNET is not set
# CONFIG_LLC2 is not set # CONFIG_LLC2 is not set
# CONFIG_IPX is not set # CONFIG_IPX is not set
# CONFIG_ATALK is not set # CONFIG_ATALK is not set
...@@ -251,16 +252,21 @@ CONFIG_NETFILTER=y ...@@ -251,16 +252,21 @@ CONFIG_NETFILTER=y
# Network testing # Network testing
# #
# CONFIG_NET_PKTGEN is not set # CONFIG_NET_PKTGEN is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
# CONFIG_HAMRADIO is not set
# CONFIG_IRDA is not set
# CONFIG_BT is not set
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
# CONFIG_DUMMY is not set
# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set
# CONFIG_TUN is not set
# #
# ARCnet devices # ARCnet devices
# #
# CONFIG_ARCNET is not set # CONFIG_ARCNET is not set
# CONFIG_DUMMY is not set
# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set
# CONFIG_TUN is not set
# #
# Ethernet (10 or 100Mbit) # Ethernet (10 or 100Mbit)
...@@ -277,7 +283,6 @@ CONFIG_NETDEVICES=y ...@@ -277,7 +283,6 @@ CONFIG_NETDEVICES=y
# CONFIG_HAMACHI is not set # CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set # CONFIG_YELLOWFIN is not set
# CONFIG_R8169 is not set # CONFIG_R8169 is not set
# CONFIG_SIS190 is not set
# CONFIG_SK98LIN is not set # CONFIG_SK98LIN is not set
# CONFIG_TIGON3 is not set # CONFIG_TIGON3 is not set
...@@ -285,51 +290,29 @@ CONFIG_NETDEVICES=y ...@@ -285,51 +290,29 @@ CONFIG_NETDEVICES=y
# Ethernet (10000 Mbit) # Ethernet (10000 Mbit)
# #
# CONFIG_IXGB is not set # CONFIG_IXGB is not set
CONFIG_IBM_EMAC=y # CONFIG_S2IO is not set
# CONFIG_IBM_EMAC_ERRMSG is not set
CONFIG_IBM_EMAC_RXB=64
CONFIG_IBM_EMAC_TXB=8
CONFIG_IBM_EMAC_FGAP=8
CONFIG_IBM_EMAC_SKBRES=0
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
# CONFIG_PPP is not set
# CONFIG_SLIP is not set
#
# Wireless LAN (non-hamradio)
#
# CONFIG_NET_RADIO is not set
# #
# Token Ring devices # Token Ring devices
# #
# CONFIG_TR is not set # CONFIG_TR is not set
# CONFIG_RCPCI is not set
# CONFIG_SHAPER is not set
# CONFIG_NETCONSOLE is not set
#
# Wan interfaces
#
# CONFIG_WAN is not set
# #
# Amateur Radio support # Wireless LAN (non-hamradio)
#
# CONFIG_HAMRADIO is not set
#
# IrDA (infrared) support
# #
# CONFIG_IRDA is not set # CONFIG_NET_RADIO is not set
# #
# Bluetooth support # Wan interfaces
# #
# CONFIG_BT is not set # CONFIG_WAN is not set
# CONFIG_NETPOLL is not set # CONFIG_FDDI is not set
# CONFIG_NET_POLL_CONTROLLER is not set # CONFIG_HIPPI is not set
# CONFIG_PPP is not set
# CONFIG_SLIP is not set
# CONFIG_RCPCI is not set
# CONFIG_SHAPER is not set
# CONFIG_NETCONSOLE is not set
# #
# ISDN subsystem # ISDN subsystem
...@@ -501,6 +484,7 @@ CONFIG_LEGACY_PTY_COUNT=256 ...@@ -501,6 +484,7 @@ CONFIG_LEGACY_PTY_COUNT=256
# #
CONFIG_PROC_FS=y CONFIG_PROC_FS=y
CONFIG_PROC_KCORE=y CONFIG_PROC_KCORE=y
CONFIG_SYSFS=y
# CONFIG_DEVFS_FS is not set # CONFIG_DEVFS_FS is not set
# CONFIG_DEVPTS_FS_XATTR is not set # CONFIG_DEVPTS_FS_XATTR is not set
# CONFIG_TMPFS is not set # CONFIG_TMPFS is not set
...@@ -541,7 +525,6 @@ CONFIG_SUNRPC=y ...@@ -541,7 +525,6 @@ CONFIG_SUNRPC=y
# CONFIG_CIFS is not set # CONFIG_CIFS is not set
# CONFIG_NCP_FS is not set # CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set # CONFIG_CODA_FS is not set
# CONFIG_INTERMEZZO_FS is not set
# CONFIG_AFS_FS is not set # CONFIG_AFS_FS is not set
# #
...@@ -559,6 +542,7 @@ CONFIG_MSDOS_PARTITION=y ...@@ -559,6 +542,7 @@ CONFIG_MSDOS_PARTITION=y
# Library routines # Library routines
# #
CONFIG_CRC32=y CONFIG_CRC32=y
# CONFIG_LIBCRC32C is not set
# #
# Kernel hacking # Kernel hacking
...@@ -573,7 +557,7 @@ CONFIG_DEBUG_KERNEL=y ...@@ -573,7 +557,7 @@ CONFIG_DEBUG_KERNEL=y
CONFIG_BDI_SWITCH=y CONFIG_BDI_SWITCH=y
# CONFIG_DEBUG_INFO is not set # CONFIG_DEBUG_INFO is not set
# CONFIG_SERIAL_TEXT_DEBUG is not set # CONFIG_SERIAL_TEXT_DEBUG is not set
CONFIG_OCP=y CONFIG_PPC_OCP=y
# #
# Security options # Security options
......
arch/ppc/configs/ep405_defconfig
View file @ 5bac8cde
...@@ -21,8 +21,10 @@ CONFIG_BROKEN_ON_SMP=y ...@@ -21,8 +21,10 @@ CONFIG_BROKEN_ON_SMP=y
# #
CONFIG_SWAP=y CONFIG_SWAP=y
CONFIG_SYSVIPC=y CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
# CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_BSD_PROCESS_ACCT is not set
CONFIG_SYSCTL=y CONFIG_SYSCTL=y
# CONFIG_AUDIT is not set
CONFIG_LOG_BUF_SHIFT=14 CONFIG_LOG_BUF_SHIFT=14
# CONFIG_HOTPLUG is not set # CONFIG_HOTPLUG is not set
# CONFIG_IKCONFIG is not set # CONFIG_IKCONFIG is not set
...@@ -33,6 +35,7 @@ CONFIG_EPOLL=y ...@@ -33,6 +35,7 @@ CONFIG_EPOLL=y
CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_NOOP=y
CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_AS=y
CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_DEADLINE=y
CONFIG_IOSCHED_CFQ=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
# #
...@@ -62,9 +65,9 @@ CONFIG_4xx=y ...@@ -62,9 +65,9 @@ CONFIG_4xx=y
# IBM 4xx options # IBM 4xx options
# #
# CONFIG_ASH is not set # CONFIG_ASH is not set
# CONFIG_BUBINGA is not set
# CONFIG_CPCI405 is not set # CONFIG_CPCI405 is not set
CONFIG_EP405=y CONFIG_EP405=y
# CONFIG_EVB405EP is not set
# CONFIG_OAK is not set # CONFIG_OAK is not set
# CONFIG_REDWOOD_5 is not set # CONFIG_REDWOOD_5 is not set
# CONFIG_REDWOOD_6 is not set # CONFIG_REDWOOD_6 is not set
...@@ -74,7 +77,6 @@ CONFIG_EP405=y ...@@ -74,7 +77,6 @@ CONFIG_EP405=y
CONFIG_IBM405_ERR77=y CONFIG_IBM405_ERR77=y
CONFIG_IBM405_ERR51=y CONFIG_IBM405_ERR51=y
CONFIG_IBM_OCP=y CONFIG_IBM_OCP=y
CONFIG_PPC_OCP=y
CONFIG_BIOS_FIXUP=y CONFIG_BIOS_FIXUP=y
CONFIG_405GP=y CONFIG_405GP=y
CONFIG_EMBEDDEDBOOT=y CONFIG_EMBEDDEDBOOT=y
...@@ -175,7 +177,6 @@ CONFIG_BLK_DEV_INITRD=y ...@@ -175,7 +177,6 @@ CONFIG_BLK_DEV_INITRD=y
# #
# Fusion MPT device support # Fusion MPT device support
# #
# CONFIG_FUSION is not set
# #
# IEEE 1394 (FireWire) support # IEEE 1394 (FireWire) support
...@@ -219,8 +220,6 @@ CONFIG_SYN_COOKIES=y ...@@ -219,8 +220,6 @@ CONFIG_SYN_COOKIES=y
# CONFIG_INET_ESP is not set # CONFIG_INET_ESP is not set
# CONFIG_INET_IPCOMP is not set # CONFIG_INET_IPCOMP is not set
# CONFIG_IPV6 is not set # CONFIG_IPV6 is not set
# CONFIG_DECNET is not set
# CONFIG_BRIDGE is not set
# CONFIG_NETFILTER is not set # CONFIG_NETFILTER is not set
# #
...@@ -228,7 +227,9 @@ CONFIG_SYN_COOKIES=y ...@@ -228,7 +227,9 @@ CONFIG_SYN_COOKIES=y
# #
# CONFIG_IP_SCTP is not set # CONFIG_IP_SCTP is not set
# CONFIG_ATM is not set # CONFIG_ATM is not set
# CONFIG_BRIDGE is not set
# CONFIG_VLAN_8021Q is not set # CONFIG_VLAN_8021Q is not set
# CONFIG_DECNET is not set
# CONFIG_LLC2 is not set # CONFIG_LLC2 is not set
# CONFIG_IPX is not set # CONFIG_IPX is not set
# CONFIG_ATALK is not set # CONFIG_ATALK is not set
...@@ -249,16 +250,21 @@ CONFIG_SYN_COOKIES=y ...@@ -249,16 +250,21 @@ CONFIG_SYN_COOKIES=y
# Network testing # Network testing
# #
# CONFIG_NET_PKTGEN is not set # CONFIG_NET_PKTGEN is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
# CONFIG_HAMRADIO is not set
# CONFIG_IRDA is not set
# CONFIG_BT is not set
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
# CONFIG_DUMMY is not set
# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set
# CONFIG_TUN is not set
# #
# ARCnet devices # ARCnet devices
# #
# CONFIG_ARCNET is not set # CONFIG_ARCNET is not set
# CONFIG_DUMMY is not set
# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set
# CONFIG_TUN is not set
# #
# Ethernet (10 or 100Mbit) # Ethernet (10 or 100Mbit)
...@@ -287,7 +293,6 @@ CONFIG_NET_ETHERNET=y ...@@ -287,7 +293,6 @@ CONFIG_NET_ETHERNET=y
# CONFIG_HAMACHI is not set # CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set # CONFIG_YELLOWFIN is not set
# CONFIG_R8169 is not set # CONFIG_R8169 is not set
# CONFIG_SIS190 is not set
# CONFIG_SK98LIN is not set # CONFIG_SK98LIN is not set
# CONFIG_TIGON3 is not set # CONFIG_TIGON3 is not set
...@@ -295,51 +300,29 @@ CONFIG_NET_ETHERNET=y ...@@ -295,51 +300,29 @@ CONFIG_NET_ETHERNET=y
# Ethernet (10000 Mbit) # Ethernet (10000 Mbit)
# #
# CONFIG_IXGB is not set # CONFIG_IXGB is not set
CONFIG_IBM_EMAC=y # CONFIG_S2IO is not set
# CONFIG_IBM_EMAC_ERRMSG is not set
CONFIG_IBM_EMAC_RXB=64
CONFIG_IBM_EMAC_TXB=8
CONFIG_IBM_EMAC_FGAP=8
CONFIG_IBM_EMAC_SKBRES=0
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
# CONFIG_PPP is not set
# CONFIG_SLIP is not set
#
# Wireless LAN (non-hamradio)
#
# CONFIG_NET_RADIO is not set
# #
# Token Ring devices # Token Ring devices
# #
# CONFIG_TR is not set # CONFIG_TR is not set
# CONFIG_RCPCI is not set
# CONFIG_SHAPER is not set
# CONFIG_NETCONSOLE is not set
#
# Wan interfaces
#
# CONFIG_WAN is not set
# #
# Amateur Radio support # Wireless LAN (non-hamradio)
#
# CONFIG_HAMRADIO is not set
#
# IrDA (infrared) support
# #
# CONFIG_IRDA is not set # CONFIG_NET_RADIO is not set
# #
# Bluetooth support # Wan interfaces
# #
# CONFIG_BT is not set # CONFIG_WAN is not set
# CONFIG_NETPOLL is not set # CONFIG_FDDI is not set
# CONFIG_NET_POLL_CONTROLLER is not set # CONFIG_HIPPI is not set
# CONFIG_PPP is not set
# CONFIG_SLIP is not set
# CONFIG_RCPCI is not set
# CONFIG_SHAPER is not set
# CONFIG_NETCONSOLE is not set
# #
# ISDN subsystem # ISDN subsystem
...@@ -508,6 +491,7 @@ CONFIG_EXT2_FS=y ...@@ -508,6 +491,7 @@ CONFIG_EXT2_FS=y
# #
CONFIG_PROC_FS=y CONFIG_PROC_FS=y
CONFIG_PROC_KCORE=y CONFIG_PROC_KCORE=y
CONFIG_SYSFS=y
# CONFIG_DEVFS_FS is not set # CONFIG_DEVFS_FS is not set
# CONFIG_DEVPTS_FS_XATTR is not set # CONFIG_DEVPTS_FS_XATTR is not set
CONFIG_TMPFS=y CONFIG_TMPFS=y
...@@ -548,7 +532,6 @@ CONFIG_SUNRPC=y ...@@ -548,7 +532,6 @@ CONFIG_SUNRPC=y
# CONFIG_CIFS is not set # CONFIG_CIFS is not set
# CONFIG_NCP_FS is not set # CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set # CONFIG_CODA_FS is not set
# CONFIG_INTERMEZZO_FS is not set
# CONFIG_AFS_FS is not set # CONFIG_AFS_FS is not set
# #
...@@ -570,13 +553,14 @@ CONFIG_MSDOS_PARTITION=y ...@@ -570,13 +553,14 @@ CONFIG_MSDOS_PARTITION=y
# Library routines # Library routines
# #
CONFIG_CRC32=y CONFIG_CRC32=y
# CONFIG_LIBCRC32C is not set
# #
# Kernel hacking # Kernel hacking
# #
# CONFIG_DEBUG_KERNEL is not set # CONFIG_DEBUG_KERNEL is not set
# CONFIG_SERIAL_TEXT_DEBUG is not set # CONFIG_SERIAL_TEXT_DEBUG is not set
CONFIG_OCP=y CONFIG_PPC_OCP=y
# #
# Security options # Security options
......
arch/ppc/configs/ibmchrp_defconfig
View file @ 5bac8cde
This diff is collapsed.
arch/ppc/configs/lopec_defconfig
View file @ 5bac8cde
This diff is collapsed.
arch/ppc/configs/pmac_defconfig
View file @ 5bac8cde
This diff is collapsed.
arch/ppc/configs/power3_defconfig
View file @ 5bac8cde
This diff is collapsed.
arch/ppc/configs/sandpoint_defconfig
View file @ 5bac8cde
This diff is collapsed.
arch/ppc/configs/spruce_defconfig
View file @ 5bac8cde
...@@ -21,9 +21,12 @@ CONFIG_BROKEN_ON_SMP=y ...@@ -21,9 +21,12 @@ CONFIG_BROKEN_ON_SMP=y
# #
CONFIG_SWAP=y CONFIG_SWAP=y
CONFIG_SYSVIPC=y CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
# CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_BSD_PROCESS_ACCT is not set
CONFIG_SYSCTL=y CONFIG_SYSCTL=y
# CONFIG_AUDIT is not set
CONFIG_LOG_BUF_SHIFT=14 CONFIG_LOG_BUF_SHIFT=14
# CONFIG_HOTPLUG is not set
# CONFIG_IKCONFIG is not set # CONFIG_IKCONFIG is not set
CONFIG_EMBEDDED=y CONFIG_EMBEDDED=y
CONFIG_KALLSYMS=y CONFIG_KALLSYMS=y
...@@ -32,6 +35,7 @@ CONFIG_EPOLL=y ...@@ -32,6 +35,7 @@ CONFIG_EPOLL=y
CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_NOOP=y
CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_AS=y
CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_DEADLINE=y
CONFIG_IOSCHED_CFQ=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
# #
...@@ -102,7 +106,6 @@ CONFIG_PCI=y ...@@ -102,7 +106,6 @@ CONFIG_PCI=y
CONFIG_PCI_DOMAINS=y CONFIG_PCI_DOMAINS=y
CONFIG_PCI_LEGACY_PROC=y CONFIG_PCI_LEGACY_PROC=y
# CONFIG_PCI_NAMES is not set # CONFIG_PCI_NAMES is not set
# CONFIG_HOTPLUG is not set
# #
# Advanced setup # Advanced setup
...@@ -150,8 +153,8 @@ CONFIG_BOOT_LOAD=0x00800000 ...@@ -150,8 +153,8 @@ CONFIG_BOOT_LOAD=0x00800000
# CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_UMEM is not set
# CONFIG_BLK_DEV_LOOP is not set # CONFIG_BLK_DEV_LOOP is not set
# CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_NBD is not set
# CONFIG_BLK_DEV_CARMEL is not set
# CONFIG_BLK_DEV_RAM is not set # CONFIG_BLK_DEV_RAM is not set
# CONFIG_BLK_DEV_INITRD is not set
# CONFIG_LBD is not set # CONFIG_LBD is not set
# #
...@@ -174,7 +177,7 @@ CONFIG_BOOT_LOAD=0x00800000 ...@@ -174,7 +177,7 @@ CONFIG_BOOT_LOAD=0x00800000
# #
# #
# IEEE 1394 (FireWire) support (EXPERIMENTAL) # IEEE 1394 (FireWire) support
# #
# CONFIG_IEEE1394 is not set # CONFIG_IEEE1394 is not set
...@@ -210,23 +213,21 @@ CONFIG_IP_PNP_DHCP=y ...@@ -210,23 +213,21 @@ CONFIG_IP_PNP_DHCP=y
# CONFIG_NET_IPIP is not set # CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set # CONFIG_NET_IPGRE is not set
# CONFIG_ARPD is not set # CONFIG_ARPD is not set
# CONFIG_INET_ECN is not set
# CONFIG_SYN_COOKIES is not set # CONFIG_SYN_COOKIES is not set
# CONFIG_INET_AH is not set # CONFIG_INET_AH is not set
# CONFIG_INET_ESP is not set # CONFIG_INET_ESP is not set
# CONFIG_INET_IPCOMP is not set # CONFIG_INET_IPCOMP is not set
# CONFIG_IPV6 is not set # CONFIG_IPV6 is not set
# CONFIG_DECNET is not set
# CONFIG_BRIDGE is not set
# CONFIG_NETFILTER is not set # CONFIG_NETFILTER is not set
# #
# SCTP Configuration (EXPERIMENTAL) # SCTP Configuration (EXPERIMENTAL)
# #
CONFIG_IPV6_SCTP__=y
# CONFIG_IP_SCTP is not set # CONFIG_IP_SCTP is not set
# CONFIG_ATM is not set # CONFIG_ATM is not set
# CONFIG_BRIDGE is not set
# CONFIG_VLAN_8021Q is not set # CONFIG_VLAN_8021Q is not set
# CONFIG_DECNET is not set
# CONFIG_LLC2 is not set # CONFIG_LLC2 is not set
# CONFIG_IPX is not set # CONFIG_IPX is not set
# CONFIG_ATALK is not set # CONFIG_ATALK is not set
...@@ -247,23 +248,27 @@ CONFIG_IPV6_SCTP__=y ...@@ -247,23 +248,27 @@ CONFIG_IPV6_SCTP__=y
# Network testing # Network testing
# #
# CONFIG_NET_PKTGEN is not set # CONFIG_NET_PKTGEN is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
# CONFIG_HAMRADIO is not set
# CONFIG_IRDA is not set
# CONFIG_BT is not set
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
# CONFIG_DUMMY is not set
# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set
# CONFIG_TUN is not set
# #
# ARCnet devices # ARCnet devices
# #
# CONFIG_ARCNET is not set # CONFIG_ARCNET is not set
# CONFIG_DUMMY is not set
# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set
# CONFIG_TUN is not set
# #
# Ethernet (10 or 100Mbit) # Ethernet (10 or 100Mbit)
# #
CONFIG_NET_ETHERNET=y CONFIG_NET_ETHERNET=y
CONFIG_MII=y CONFIG_MII=y
CONFIG_CRC32=y
# CONFIG_OAKNET is not set # CONFIG_OAKNET is not set
# CONFIG_HAPPYMEAL is not set # CONFIG_HAPPYMEAL is not set
# CONFIG_SUNGEM is not set # CONFIG_SUNGEM is not set
...@@ -304,7 +309,6 @@ CONFIG_PCNET32=y ...@@ -304,7 +309,6 @@ CONFIG_PCNET32=y
# CONFIG_HAMACHI is not set # CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set # CONFIG_YELLOWFIN is not set
# CONFIG_R8169 is not set # CONFIG_R8169 is not set
# CONFIG_SIS190 is not set
# CONFIG_SK98LIN is not set # CONFIG_SK98LIN is not set
# CONFIG_TIGON3 is not set # CONFIG_TIGON3 is not set
...@@ -312,47 +316,34 @@ CONFIG_PCNET32=y ...@@ -312,47 +316,34 @@ CONFIG_PCNET32=y
# Ethernet (10000 Mbit) # Ethernet (10000 Mbit)
# #
# CONFIG_IXGB is not set # CONFIG_IXGB is not set
# CONFIG_FDDI is not set # CONFIG_S2IO is not set
# CONFIG_HIPPI is not set
# CONFIG_PPP is not set
# CONFIG_SLIP is not set
#
# Wireless LAN (non-hamradio)
#
# CONFIG_NET_RADIO is not set
# #
# Token Ring devices # Token Ring devices
# #
# CONFIG_TR is not set # CONFIG_TR is not set
# CONFIG_RCPCI is not set
# CONFIG_SHAPER is not set
# #
# Wan interfaces # Wireless LAN (non-hamradio)
#
# CONFIG_WAN is not set
#
# Amateur Radio support
#
# CONFIG_HAMRADIO is not set
#
# IrDA (infrared) support
# #
# CONFIG_IRDA is not set # CONFIG_NET_RADIO is not set
# #
# Bluetooth support # Wan interfaces
# #
# CONFIG_BT is not set # CONFIG_WAN is not set
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
# CONFIG_PPP is not set
# CONFIG_SLIP is not set
# CONFIG_RCPCI is not set
# CONFIG_SHAPER is not set
# CONFIG_NETCONSOLE is not set
# #
# ISDN subsystem # ISDN subsystem
# #
# CONFIG_ISDN_BOOL is not set # CONFIG_ISDN is not set
# #
# Telephony Support # Telephony Support
...@@ -403,12 +394,8 @@ CONFIG_SERIAL_8250_NR_UARTS=2 ...@@ -403,12 +394,8 @@ CONFIG_SERIAL_8250_NR_UARTS=2
CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256 CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
#
# Mice
#
# CONFIG_BUSMOUSE is not set
# CONFIG_QIC02_TAPE is not set # CONFIG_QIC02_TAPE is not set
# #
...@@ -440,6 +427,10 @@ CONFIG_GEN_RTC=y ...@@ -440,6 +427,10 @@ CONFIG_GEN_RTC=y
# #
# CONFIG_I2C is not set # CONFIG_I2C is not set
#
# Misc devices
#
# #
# Multimedia devices # Multimedia devices
# #
...@@ -510,8 +501,8 @@ CONFIG_ISO9660_FS=y ...@@ -510,8 +501,8 @@ CONFIG_ISO9660_FS=y
# #
CONFIG_PROC_FS=y CONFIG_PROC_FS=y
CONFIG_PROC_KCORE=y CONFIG_PROC_KCORE=y
CONFIG_SYSFS=y
# CONFIG_DEVFS_FS is not set # CONFIG_DEVFS_FS is not set
CONFIG_DEVPTS_FS=y
# CONFIG_DEVPTS_FS_XATTR is not set # CONFIG_DEVPTS_FS_XATTR is not set
CONFIG_TMPFS=y CONFIG_TMPFS=y
# CONFIG_HUGETLB_PAGE is not set # CONFIG_HUGETLB_PAGE is not set
...@@ -523,6 +514,7 @@ CONFIG_RAMFS=y ...@@ -523,6 +514,7 @@ CONFIG_RAMFS=y
# CONFIG_ADFS_FS is not set # CONFIG_ADFS_FS is not set
# CONFIG_AFFS_FS is not set # CONFIG_AFFS_FS is not set
# CONFIG_HFS_FS is not set # CONFIG_HFS_FS is not set
# CONFIG_HFSPLUS_FS is not set
# CONFIG_BEFS_FS is not set # CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set # CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set # CONFIG_EFS_FS is not set
...@@ -545,12 +537,11 @@ CONFIG_ROOT_NFS=y ...@@ -545,12 +537,11 @@ CONFIG_ROOT_NFS=y
CONFIG_LOCKD=y CONFIG_LOCKD=y
# CONFIG_EXPORTFS is not set # CONFIG_EXPORTFS is not set
CONFIG_SUNRPC=y CONFIG_SUNRPC=y
# CONFIG_SUNRPC_GSS is not set # CONFIG_RPCSEC_GSS_KRB5 is not set
# CONFIG_SMB_FS is not set # CONFIG_SMB_FS is not set
# CONFIG_CIFS is not set # CONFIG_CIFS is not set
# CONFIG_NCP_FS is not set # CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set # CONFIG_CODA_FS is not set
# CONFIG_INTERMEZZO_FS is not set
# CONFIG_AFS_FS is not set # CONFIG_AFS_FS is not set
# #
...@@ -567,6 +558,8 @@ CONFIG_MSDOS_PARTITION=y ...@@ -567,6 +558,8 @@ CONFIG_MSDOS_PARTITION=y
# #
# Library routines # Library routines
# #
CONFIG_CRC32=y
# CONFIG_LIBCRC32C is not set
# #
# Kernel hacking # Kernel hacking
......
arch/ppc/configs/walnut_defconfig
View file @ 5bac8cde
...@@ -21,8 +21,10 @@ CONFIG_BROKEN_ON_SMP=y ...@@ -21,8 +21,10 @@ CONFIG_BROKEN_ON_SMP=y
# #
CONFIG_SWAP=y CONFIG_SWAP=y
CONFIG_SYSVIPC=y CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
# CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_BSD_PROCESS_ACCT is not set
CONFIG_SYSCTL=y CONFIG_SYSCTL=y
# CONFIG_AUDIT is not set
CONFIG_LOG_BUF_SHIFT=14 CONFIG_LOG_BUF_SHIFT=14
# CONFIG_HOTPLUG is not set # CONFIG_HOTPLUG is not set
# CONFIG_IKCONFIG is not set # CONFIG_IKCONFIG is not set
...@@ -33,6 +35,7 @@ CONFIG_FUTEX=y ...@@ -33,6 +35,7 @@ CONFIG_FUTEX=y
CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_NOOP=y
CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_AS=y
CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_DEADLINE=y
CONFIG_IOSCHED_CFQ=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
# #
...@@ -62,9 +65,9 @@ CONFIG_4xx=y ...@@ -62,9 +65,9 @@ CONFIG_4xx=y
# IBM 4xx options # IBM 4xx options
# #
# CONFIG_ASH is not set # CONFIG_ASH is not set
# CONFIG_BUBINGA is not set
# CONFIG_CPCI405 is not set # CONFIG_CPCI405 is not set
# CONFIG_EP405 is not set # CONFIG_EP405 is not set
# CONFIG_EVB405EP is not set
# CONFIG_OAK is not set # CONFIG_OAK is not set
# CONFIG_REDWOOD_5 is not set # CONFIG_REDWOOD_5 is not set
# CONFIG_REDWOOD_6 is not set # CONFIG_REDWOOD_6 is not set
...@@ -73,7 +76,6 @@ CONFIG_WALNUT=y ...@@ -73,7 +76,6 @@ CONFIG_WALNUT=y
CONFIG_IBM405_ERR77=y CONFIG_IBM405_ERR77=y
CONFIG_IBM405_ERR51=y CONFIG_IBM405_ERR51=y
CONFIG_IBM_OCP=y CONFIG_IBM_OCP=y
CONFIG_PPC_OCP=y
CONFIG_BIOS_FIXUP=y CONFIG_BIOS_FIXUP=y
CONFIG_405GP=y CONFIG_405GP=y
CONFIG_IBM_OPENBIOS=y CONFIG_IBM_OPENBIOS=y
...@@ -174,7 +176,6 @@ CONFIG_BLK_DEV_INITRD=y ...@@ -174,7 +176,6 @@ CONFIG_BLK_DEV_INITRD=y
# #
# Fusion MPT device support # Fusion MPT device support
# #
# CONFIG_FUSION is not set
# #
# IEEE 1394 (FireWire) support # IEEE 1394 (FireWire) support
...@@ -218,8 +219,6 @@ CONFIG_SYN_COOKIES=y ...@@ -218,8 +219,6 @@ CONFIG_SYN_COOKIES=y
# CONFIG_INET_ESP is not set # CONFIG_INET_ESP is not set
# CONFIG_INET_IPCOMP is not set # CONFIG_INET_IPCOMP is not set
# CONFIG_IPV6 is not set # CONFIG_IPV6 is not set
# CONFIG_DECNET is not set
# CONFIG_BRIDGE is not set
# CONFIG_NETFILTER is not set # CONFIG_NETFILTER is not set
# #
...@@ -227,7 +226,9 @@ CONFIG_SYN_COOKIES=y ...@@ -227,7 +226,9 @@ CONFIG_SYN_COOKIES=y
# #
# CONFIG_IP_SCTP is not set # CONFIG_IP_SCTP is not set
# CONFIG_ATM is not set # CONFIG_ATM is not set
# CONFIG_BRIDGE is not set
# CONFIG_VLAN_8021Q is not set # CONFIG_VLAN_8021Q is not set
# CONFIG_DECNET is not set
# CONFIG_LLC2 is not set # CONFIG_LLC2 is not set
# CONFIG_IPX is not set # CONFIG_IPX is not set
# CONFIG_ATALK is not set # CONFIG_ATALK is not set
...@@ -248,16 +249,21 @@ CONFIG_SYN_COOKIES=y ...@@ -248,16 +249,21 @@ CONFIG_SYN_COOKIES=y
# Network testing # Network testing
# #
# CONFIG_NET_PKTGEN is not set # CONFIG_NET_PKTGEN is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
# CONFIG_HAMRADIO is not set
# CONFIG_IRDA is not set
# CONFIG_BT is not set
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
# CONFIG_DUMMY is not set
# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set
# CONFIG_TUN is not set
# #
# ARCnet devices # ARCnet devices
# #
# CONFIG_ARCNET is not set # CONFIG_ARCNET is not set
# CONFIG_DUMMY is not set
# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set
# CONFIG_TUN is not set
# #
# Ethernet (10 or 100Mbit) # Ethernet (10 or 100Mbit)
...@@ -286,7 +292,6 @@ CONFIG_MII=y ...@@ -286,7 +292,6 @@ CONFIG_MII=y
# CONFIG_HAMACHI is not set # CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set # CONFIG_YELLOWFIN is not set
# CONFIG_R8169 is not set # CONFIG_R8169 is not set
# CONFIG_SIS190 is not set
# CONFIG_SK98LIN is not set # CONFIG_SK98LIN is not set
# CONFIG_TIGON3 is not set # CONFIG_TIGON3 is not set
...@@ -294,51 +299,29 @@ CONFIG_MII=y ...@@ -294,51 +299,29 @@ CONFIG_MII=y
# Ethernet (10000 Mbit) # Ethernet (10000 Mbit)
# #
# CONFIG_IXGB is not set # CONFIG_IXGB is not set
CONFIG_IBM_EMAC=y # CONFIG_S2IO is not set
# CONFIG_IBM_EMAC_ERRMSG is not set
CONFIG_IBM_EMAC_RXB=64
CONFIG_IBM_EMAC_TXB=8
CONFIG_IBM_EMAC_FGAP=8
CONFIG_IBM_EMAC_SKBRES=0
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
# CONFIG_PPP is not set
# CONFIG_SLIP is not set
#
# Wireless LAN (non-hamradio)
#
# CONFIG_NET_RADIO is not set
# #
# Token Ring devices # Token Ring devices
# #
# CONFIG_TR is not set # CONFIG_TR is not set
# CONFIG_RCPCI is not set
# CONFIG_SHAPER is not set
# CONFIG_NETCONSOLE is not set
#
# Wan interfaces
#
# CONFIG_WAN is not set
# #
# Amateur Radio support # Wireless LAN (non-hamradio)
#
# CONFIG_HAMRADIO is not set
#
# IrDA (infrared) support
# #
# CONFIG_IRDA is not set # CONFIG_NET_RADIO is not set
# #
# Bluetooth support # Wan interfaces
# #
# CONFIG_BT is not set # CONFIG_WAN is not set
# CONFIG_NETPOLL is not set # CONFIG_FDDI is not set
# CONFIG_NET_POLL_CONTROLLER is not set # CONFIG_HIPPI is not set
# CONFIG_PPP is not set
# CONFIG_SLIP is not set
# CONFIG_RCPCI is not set
# CONFIG_SHAPER is not set
# CONFIG_NETCONSOLE is not set
# #
# ISDN subsystem # ISDN subsystem
...@@ -503,6 +486,7 @@ CONFIG_EXT2_FS=y ...@@ -503,6 +486,7 @@ CONFIG_EXT2_FS=y
# #
CONFIG_PROC_FS=y CONFIG_PROC_FS=y
CONFIG_PROC_KCORE=y CONFIG_PROC_KCORE=y
CONFIG_SYSFS=y
# CONFIG_DEVFS_FS is not set # CONFIG_DEVFS_FS is not set
# CONFIG_DEVPTS_FS_XATTR is not set # CONFIG_DEVPTS_FS_XATTR is not set
CONFIG_TMPFS=y CONFIG_TMPFS=y
...@@ -543,7 +527,6 @@ CONFIG_SUNRPC=y ...@@ -543,7 +527,6 @@ CONFIG_SUNRPC=y
# CONFIG_CIFS is not set # CONFIG_CIFS is not set
# CONFIG_NCP_FS is not set # CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set # CONFIG_CODA_FS is not set
# CONFIG_INTERMEZZO_FS is not set
# CONFIG_AFS_FS is not set # CONFIG_AFS_FS is not set
# #
...@@ -576,13 +559,14 @@ CONFIG_PARTITION_ADVANCED=y ...@@ -576,13 +559,14 @@ CONFIG_PARTITION_ADVANCED=y
# Library routines # Library routines
# #
CONFIG_CRC32=y CONFIG_CRC32=y
# CONFIG_LIBCRC32C is not set
# #
# Kernel hacking # Kernel hacking
# #
# CONFIG_DEBUG_KERNEL is not set # CONFIG_DEBUG_KERNEL is not set
# CONFIG_SERIAL_TEXT_DEBUG is not set # CONFIG_SERIAL_TEXT_DEBUG is not set
CONFIG_OCP=y CONFIG_PPC_OCP=y
# #
# Security options # Security options
......
arch/ppc/defconfig
View file @ 5bac8cde
This diff is collapsed.
arch/ppc/kernel/Makefile
View file @ 5bac8cde
...@@ -29,6 +29,7 @@ obj-$(CONFIG_PCI) += pci-dma.o ...@@ -29,6 +29,7 @@ obj-$(CONFIG_PCI) += pci-dma.o
obj-$(CONFIG_KGDB) += ppc-stub.o obj-$(CONFIG_KGDB) += ppc-stub.o
obj-$(CONFIG_SMP) += smp.o smp-tbsync.o obj-$(CONFIG_SMP) += smp.o smp-tbsync.o
obj-$(CONFIG_TAU) += temp.o obj-$(CONFIG_TAU) += temp.o
obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o
ifdef CONFIG_MATH_EMULATION ifdef CONFIG_MATH_EMULATION
obj-$(CONFIG_8xx) += softemu8xx.o obj-$(CONFIG_8xx) += softemu8xx.o
......
arch/ppc/kernel/cputable.c
View file @ 5bac8cde
...@@ -209,7 +209,15 @@ struct cpu_spec cpu_specs[] = { ...@@ -209,7 +209,15 @@ struct cpu_spec cpu_specs[] = {
32, 32, 32, 32,
__setup_cpu_750fx __setup_cpu_750fx
}, },
{ /* 750GX */
0xffff0000, 0x70020000, "750GX",
CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_CAN_DOZE | CPU_FTR_USE_TB |
CPU_FTR_L2CR | CPU_FTR_TAU | CPU_FTR_HPTE_TABLE | CPU_FTR_CAN_NAP |
CPU_FTR_DUAL_PLL_750FX | CPU_FTR_HAS_HIGH_BATS,
COMMON_PPC,
32, 32,
__setup_cpu_750fx
},
{ /* 740/750 (L2CR bit need fixup for 740) */ { /* 740/750 (L2CR bit need fixup for 740) */
0xffff0000, 0x00080000, "740/750", 0xffff0000, 0x00080000, "740/750",
CPU_FTR_COMMON | CPU_FTR_COMMON |
...@@ -537,8 +545,8 @@ struct cpu_spec cpu_specs[] = { ...@@ -537,8 +545,8 @@ struct cpu_spec cpu_specs[] = {
32, 32, 32, 32,
0, /*__setup_cpu_440 */ 0, /*__setup_cpu_440 */
}, },
{ /* 440GX Rev. B1 (2.1) */ { /* 440GX Rev. C */
0xf0000fff, 0x50000852, "440GX Rev. B1 (2.1)", 0xf0000fff, 0x50000892, "440GX Rev. C",
CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB, CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB,
PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU, PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU,
32, 32, 32, 32,
......
arch/ppc/kernel/head.S
View file @ 5bac8cde
...@@ -491,14 +491,16 @@ SystemCall: ...@@ -491,14 +491,16 @@ SystemCall:
/* /*
* The Altivec unavailable trap is at 0x0f20. Foo. * The Altivec unavailable trap is at 0x0f20. Foo.
* We effectively remap it to 0x3000. * We effectively remap it to 0x3000.
* We include an altivec unavailable exception vector even if
* not configured for Altivec, so that you can't panic a
* non-altivec kernel running on a machine with altivec just
* by executing an altivec instruction.
*/ */
. = 0xf00 . = 0xf00
b Trap_0f b Trap_0f
. = 0xf20 . = 0xf20
#ifdef CONFIG_ALTIVEC
b AltiVecUnavailable b AltiVecUnavailable
#endif
Trap_0f: Trap_0f:
EXCEPTION_PROLOG EXCEPTION_PROLOG
...@@ -705,6 +707,7 @@ DataStoreTLBMiss: ...@@ -705,6 +707,7 @@ DataStoreTLBMiss:
#ifndef CONFIG_ALTIVEC #ifndef CONFIG_ALTIVEC
#define AltivecAssistException UnknownException #define AltivecAssistException UnknownException
#endif #endif
EXCEPTION(0x1300, Trap_13, InstructionBreakpoint, EXC_XFER_EE) EXCEPTION(0x1300, Trap_13, InstructionBreakpoint, EXC_XFER_EE)
EXCEPTION(0x1400, SMI, SMIException, EXC_XFER_EE) EXCEPTION(0x1400, SMI, SMIException, EXC_XFER_EE)
EXCEPTION(0x1500, Trap_15, UnknownException, EXC_XFER_EE) EXCEPTION(0x1500, Trap_15, UnknownException, EXC_XFER_EE)
...@@ -746,12 +749,12 @@ DataStoreTLBMiss: ...@@ -746,12 +749,12 @@ DataStoreTLBMiss:
. = 0x3000 . = 0x3000
#ifdef CONFIG_ALTIVEC
AltiVecUnavailable: AltiVecUnavailable:
EXCEPTION_PROLOG EXCEPTION_PROLOG
#ifdef CONFIG_ALTIVEC
bne load_up_altivec /* if from user, just load it up */ bne load_up_altivec /* if from user, just load it up */
EXC_XFER_EE_LITE(0xf20, KernelAltiVec)
#endif /* CONFIG_ALTIVEC */ #endif /* CONFIG_ALTIVEC */
EXC_XFER_EE_LITE(0xf20, AltivecUnavailException)
#ifdef CONFIG_PPC64BRIDGE #ifdef CONFIG_PPC64BRIDGE
DataAccess: DataAccess:
...@@ -1633,7 +1636,7 @@ initial_mm_power4: ...@@ -1633,7 +1636,7 @@ initial_mm_power4:
blr blr
#endif /* CONFIG_POWER4 */ #endif /* CONFIG_POWER4 */
#ifdef CONFIG_8260 #ifdef CONFIG_8260
/* Jump into the system reset for the rom. /* Jump into the system reset for the rom.
* We first disable the MMU, and then jump to the ROM reset address. * We first disable the MMU, and then jump to the ROM reset address.
......
arch/ppc/kernel/traps.c
View file @ 5bac8cde
...@@ -631,17 +631,54 @@ TAUException(struct pt_regs *regs) ...@@ -631,17 +631,54 @@ TAUException(struct pt_regs *regs)
} }
#endif /* CONFIG_INT_TAU */ #endif /* CONFIG_INT_TAU */
void AltivecUnavailException(struct pt_regs *regs)
{
static int kernel_altivec_count;
#ifndef CONFIG_ALTIVEC
if (user_mode(regs)) {
/* A user program has executed an altivec instruction,
but this kernel doesn't support altivec. */
_exception(SIGILL, regs, ILL_ILLOPC, regs->nip);
return;
}
#endif
/* The kernel has executed an altivec instruction without
first enabling altivec. Whinge but let it do it. */
if (++kernel_altivec_count < 10)
printk(KERN_ERR "AltiVec used in kernel (task=%p, pc=%x)\n",
current, regs->nip);
regs->msr |= MSR_VEC;
}
#ifdef CONFIG_ALTIVEC #ifdef CONFIG_ALTIVEC
void void
AltivecAssistException(struct pt_regs *regs) AltivecAssistException(struct pt_regs *regs)
{ {
int err;
preempt_disable(); preempt_disable();
if (regs->msr & MSR_VEC) if (regs->msr & MSR_VEC)
giveup_altivec(current); giveup_altivec(current);
preempt_enable(); preempt_enable();
/* XXX quick hack for now: set the non-Java bit in the VSCR */ err = emulate_altivec(regs);
current->thread.vscr.u[3] |= 0x10000; if (err == 0) {
regs->nip += 4; /* skip emulated instruction */
emulate_single_step(regs);
return;
}
if (err == -EFAULT) {
/* got an error reading the instruction */
_exception(SIGSEGV, regs, SEGV_ACCERR, regs->nip);
} else {
/* didn't recognize the instruction */
/* XXX quick hack for now: set the non-Java bit in the VSCR */
printk(KERN_ERR "unrecognized altivec instruction "
"in %s at %lx\n", current->comm, regs->nip);
current->thread.vscr.u[3] |= 0x10000;
}
} }
#endif /* CONFIG_ALTIVEC */ #endif /* CONFIG_ALTIVEC */
......
arch/ppc/kernel/vecemu.c 0 → 100644
View file @ 5bac8cde
This diff is collapsed.
arch/ppc/kernel/vector.S 0 → 100644
View file @ 5bac8cde
This diff is collapsed.
arch/ppc/mm/mem_pieces.c
View file @ 5bac8cde
...@@ -120,23 +120,6 @@ mem_pieces_print(struct mem_pieces *mp) ...@@ -120,23 +120,6 @@ mem_pieces_print(struct mem_pieces *mp)
printk("\n"); printk("\n");
} }
#if defined(CONFIG_APUS) || defined(CONFIG_PPC_OF)
/*
* Add some memory to an array of pieces
*/
void __init
mem_pieces_append(struct mem_pieces *mp, unsigned int start, unsigned int size)
{
struct reg_property *rp;
if (mp->n_regions >= MEM_PIECES_MAX)
return;
rp = &mp->regions[mp->n_regions++];
rp->address = start;
rp->size = size;
}
#endif /* CONFIG_APUS || CONFIG_PPC_OF */
void __init void __init
mem_pieces_sort(struct mem_pieces *mp) mem_pieces_sort(struct mem_pieces *mp)
{ {
......
arch/ppc/mm/mem_pieces.h
View file @ 5bac8cde
...@@ -38,8 +38,6 @@ struct mem_pieces { ...@@ -38,8 +38,6 @@ struct mem_pieces {
extern void *mem_pieces_find(unsigned int size, unsigned int align); extern void *mem_pieces_find(unsigned int size, unsigned int align);
extern void mem_pieces_remove(struct mem_pieces *mp, unsigned int start, extern void mem_pieces_remove(struct mem_pieces *mp, unsigned int start,
unsigned int size, int must_exist); unsigned int size, int must_exist);
extern void mem_pieces_append(struct mem_pieces *mp, unsigned int start,
unsigned int size);
extern void mem_pieces_coalesce(struct mem_pieces *mp); extern void mem_pieces_coalesce(struct mem_pieces *mp);
extern void mem_pieces_sort(struct mem_pieces *mp); extern void mem_pieces_sort(struct mem_pieces *mp);
......
arch/ppc/platforms/4xx/ibm440gp.c
View file @ 5bac8cde
...@@ -125,7 +125,7 @@ struct ocp_def core_ocp[] = { ...@@ -125,7 +125,7 @@ struct ocp_def core_ocp[] = {
{ .vendor = OCP_VENDOR_IBM, { .vendor = OCP_VENDOR_IBM,
.function = OCP_FUNC_EMAC, .function = OCP_FUNC_EMAC,
.index = 0, .index = 0,
.paddr = 0x0000000140000800UL, .paddr = 0x0000000140000800ULL,
.irq = 60, .irq = 60,
.pm = OCP_CPM_NA, .pm = OCP_CPM_NA,
.additions = &ibm440gp_emac0_def, .additions = &ibm440gp_emac0_def,
......
arch/ppc/platforms/pmac_pic.c
View file @ 5bac8cde
...@@ -260,7 +260,7 @@ pmac_fix_gatwick_interrupts(struct device_node *gw, int irq_base) ...@@ -260,7 +260,7 @@ pmac_fix_gatwick_interrupts(struct device_node *gw, int irq_base)
node->child->intrs = &gatwick_int_pool[count]; node->child->intrs = &gatwick_int_pool[count];
count += 3; count += 3;
} }
node->child->n_intrs = 3; node->child->n_intrs = 3;
node->child->intrs[0].line = 15+irq_base; node->child->intrs[0].line = 15+irq_base;
node->child->intrs[1].line = 4+irq_base; node->child->intrs[1].line = 4+irq_base;
node->child->intrs[2].line = 5+irq_base; node->child->intrs[2].line = 5+irq_base;
...@@ -279,7 +279,7 @@ pmac_fix_gatwick_interrupts(struct device_node *gw, int irq_base) ...@@ -279,7 +279,7 @@ pmac_fix_gatwick_interrupts(struct device_node *gw, int irq_base)
node->intrs[0].line = 29+irq_base; node->intrs[0].line = 29+irq_base;
printk(KERN_INFO "irq: fixed media-bay on second controller (%d)\n", printk(KERN_INFO "irq: fixed media-bay on second controller (%d)\n",
node->intrs[0].line); node->intrs[0].line);
ya_node = node->child; ya_node = node->child;
while(ya_node) while(ya_node)
{ {
...@@ -501,7 +501,7 @@ void __init pmac_pic_init(void) ...@@ -501,7 +501,7 @@ void __init pmac_pic_init(void)
pmac_irq_hw[i] = (volatile struct pmac_irq_hw*) pmac_irq_hw[i] = (volatile struct pmac_irq_hw*)
(addr + (2 - i) * 0x10); (addr + (2 - i) * 0x10);
} }
/* get addresses of second controller */ /* get addresses of second controller */
irqctrler = irqctrler->next; irqctrler = irqctrler->next;
if (irqctrler && irqctrler->n_addrs > 0) { if (irqctrler && irqctrler->n_addrs > 0) {
......
arch/ppc/platforms/pmac_setup.c
View file @ 5bac8cde
...@@ -136,7 +136,7 @@ pmac_show_cpuinfo(struct seq_file *m) ...@@ -136,7 +136,7 @@ pmac_show_cpuinfo(struct seq_file *m)
if (pmac_call_feature(PMAC_FTR_GET_MB_INFO, NULL, PMAC_MB_INFO_NAME, (int)&mbname) != 0) if (pmac_call_feature(PMAC_FTR_GET_MB_INFO, NULL, PMAC_MB_INFO_NAME, (int)&mbname) != 0)
mbname = "Unknown"; mbname = "Unknown";
/* find motherboard type */ /* find motherboard type */
seq_printf(m, "machine\t\t: "); seq_printf(m, "machine\t\t: ");
np = find_devices("device-tree"); np = find_devices("device-tree");
...@@ -196,7 +196,7 @@ pmac_show_cpuinfo(struct seq_file *m) ...@@ -196,7 +196,7 @@ pmac_show_cpuinfo(struct seq_file *m)
int n; int n;
struct reg_property *reg = (struct reg_property *) struct reg_property *reg = (struct reg_property *)
get_property(np, "reg", &n); get_property(np, "reg", &n);
if (reg != 0) { if (reg != 0) {
unsigned long total = 0; unsigned long total = 0;
...@@ -207,9 +207,9 @@ pmac_show_cpuinfo(struct seq_file *m) ...@@ -207,9 +207,9 @@ pmac_show_cpuinfo(struct seq_file *m)
} }
/* Checks "l2cr-value" property in the registry */ /* Checks "l2cr-value" property in the registry */
np = find_devices("cpus"); np = find_devices("cpus");
if (np == 0) if (np == 0)
np = find_type_devices("cpu"); np = find_type_devices("cpu");
if (np != 0) { if (np != 0) {
unsigned int *l2cr = (unsigned int *) unsigned int *l2cr = (unsigned int *)
get_property(np, "l2cr-value", NULL); get_property(np, "l2cr-value", NULL);
...@@ -277,9 +277,9 @@ pmac_setup_arch(void) ...@@ -277,9 +277,9 @@ pmac_setup_arch(void)
/* Checks "l2cr-value" property in the registry */ /* Checks "l2cr-value" property in the registry */
if (cur_cpu_spec[0]->cpu_features & CPU_FTR_L2CR) { if (cur_cpu_spec[0]->cpu_features & CPU_FTR_L2CR) {
struct device_node *np = find_devices("cpus"); struct device_node *np = find_devices("cpus");
if (np == 0) if (np == 0)
np = find_type_devices("cpu"); np = find_type_devices("cpu");
if (np != 0) { if (np != 0) {
unsigned int *l2cr = (unsigned int *) unsigned int *l2cr = (unsigned int *)
get_property(np, "l2cr-value", NULL); get_property(np, "l2cr-value", NULL);
...@@ -478,11 +478,11 @@ pmac_restart(char *cmd) ...@@ -478,11 +478,11 @@ pmac_restart(char *cmd)
cuda_poll(); cuda_poll();
break; break;
#endif /* CONFIG_ADB_CUDA */ #endif /* CONFIG_ADB_CUDA */
#ifdef CONFIG_ADB_PMU #ifdef CONFIG_ADB_PMU
case SYS_CTRLER_PMU: case SYS_CTRLER_PMU:
pmu_restart(); pmu_restart();
break; break;
#endif /* CONFIG_ADB_PMU */ #endif /* CONFIG_ADB_PMU */
default: ; default: ;
} }
} }
......
arch/ppc/syslib/ocp.c
View file @ 5bac8cde
...@@ -203,10 +203,6 @@ struct bus_type ocp_bus_type = { ...@@ -203,10 +203,6 @@ struct bus_type ocp_bus_type = {
* NOTE: Detection of devices is a 2 pass step on this implementation, * NOTE: Detection of devices is a 2 pass step on this implementation,
* hotswap isn't supported. First, all OCP devices are put in the device * hotswap isn't supported. First, all OCP devices are put in the device
* list, _then_ all drivers are probed on each match. * list, _then_ all drivers are probed on each match.
*
* This function returns a count of how many devices actually matched
* (whether the probe routine returned 0 or -ENODEV, a different error
* code isn't considered as a match).
*/ */
int int
ocp_register_driver(struct ocp_driver *drv) ocp_register_driver(struct ocp_driver *drv)
...@@ -220,9 +216,7 @@ ocp_register_driver(struct ocp_driver *drv) ...@@ -220,9 +216,7 @@ ocp_register_driver(struct ocp_driver *drv)
drv->driver.remove = ocp_device_remove; drv->driver.remove = ocp_device_remove;
/* register with core */ /* register with core */
count = driver_register(&drv->driver); return driver_register(&drv->driver);
return count ? count : 1;
} }
/** /**
......
arch/ppc/syslib/ppc4xx_pic.c
View file @ 5bac8cde
...@@ -173,14 +173,14 @@ ppc4xx_uic_enable(unsigned int irq) ...@@ -173,14 +173,14 @@ ppc4xx_uic_enable(unsigned int irq)
desc->status |= IRQ_LEVEL; desc->status |= IRQ_LEVEL;
else else
desc->status = desc->status & ~IRQ_LEVEL; desc->status = desc->status & ~IRQ_LEVEL;
break; break;
case 2: case 2:
mtdcr(DCRN_UIC_ER(UIC2), ppc_cached_irq_mask[word]); mtdcr(DCRN_UIC_ER(UIC2), ppc_cached_irq_mask[word]);
if ((mfdcr(DCRN_UIC_TR(UIC2)) & (1 << (31 - bit))) == 0) if ((mfdcr(DCRN_UIC_TR(UIC2)) & (1 << (31 - bit))) == 0)
desc->status |= IRQ_LEVEL; desc->status |= IRQ_LEVEL;
else else
desc->status = desc->status & ~IRQ_LEVEL; desc->status = desc->status & ~IRQ_LEVEL;
break; break;
} }
} }
...@@ -269,6 +269,9 @@ ppc4xx_uic_end(unsigned int irq) ...@@ -269,6 +269,9 @@ ppc4xx_uic_end(unsigned int irq)
case 1: case 1:
tr_bits = mfdcr(DCRN_UIC_TR(UIC1)); tr_bits = mfdcr(DCRN_UIC_TR(UIC1));
break; break;
case 2:
tr_bits = mfdcr(DCRN_UIC_TR(UIC2));
break;
} }
if ((tr_bits & (1 << (31 - bit))) == 0) { if ((tr_bits & (1 << (31 - bit))) == 0) {
......
arch/ppc/syslib/prom_init.c
View file @ 5bac8cde
...@@ -800,8 +800,7 @@ prom_init(int r3, int r4, prom_entry pp) ...@@ -800,8 +800,7 @@ prom_init(int r3, int r4, prom_entry pp)
/* First get a handle for the stdout device */ /* First get a handle for the stdout device */
prom = pp; prom = pp;
prom_chosen = call_prom("finddevice", 1, 1, prom_chosen = call_prom("finddevice", 1, 1, "/chosen");
"/chosen");
if (prom_chosen == (void *)-1) if (prom_chosen == (void *)-1)
prom_exit(); prom_exit();
if ((int) call_prom("getprop", 4, 1, prom_chosen, if ((int) call_prom("getprop", 4, 1, prom_chosen,
......
arch/ppc64/kernel/HvLpEvent.c
View file @ 5bac8cde
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
*/ */
#include <linux/stddef.h> #include <linux/stddef.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/iSeries/HvLpEvent.h> #include <asm/iSeries/HvLpEvent.h>
#include <asm/iSeries/HvCallEvent.h> #include <asm/iSeries/HvCallEvent.h>
...@@ -41,6 +42,8 @@ int HvLpEvent_unregisterHandler( HvLpEvent_Type eventType ) ...@@ -41,6 +42,8 @@ int HvLpEvent_unregisterHandler( HvLpEvent_Type eventType )
} }
return rc; return rc;
} }
EXPORT_SYMBOL(HvLpEvent_registerHandler);
EXPORT_SYMBOL(HvLpEvent_unregisterHandler);
/* (lpIndex is the partition index of the target partition. /* (lpIndex is the partition index of the target partition.
* needed only for VirtualIo, VirtualLan and SessionMgr. Zero * needed only for VirtualIo, VirtualLan and SessionMgr. Zero
......
arch/ppc64/kernel/iommu.c
View file @ 5bac8cde
...@@ -491,7 +491,7 @@ void *iommu_alloc_consistent(struct iommu_table *tbl, size_t size, ...@@ -491,7 +491,7 @@ void *iommu_alloc_consistent(struct iommu_table *tbl, size_t size,
*/ */
if (order >= IOMAP_MAX_ORDER) { if (order >= IOMAP_MAX_ORDER) {
printk("iommu_alloc_consistent size too large: 0x%lx\n", size); printk("iommu_alloc_consistent size too large: 0x%lx\n", size);
return (void *)DMA_ERROR_CODE; return NULL;
} }
if (!tbl) if (!tbl)
......
arch/ppc64/kernel/irq.c
View file @ 5bac8cde
This diff is collapsed.
arch/ppc64/kernel/mf_proc.c
View file @ 5bac8cde
This diff is collapsed.
arch/ppc64/kernel/rtas.c
View file @ 5bac8cde
...@@ -345,7 +345,7 @@ rtas_flash_firmware(void) ...@@ -345,7 +345,7 @@ rtas_flash_firmware(void)
rtas_firmware_flash_list.num_blocks = 0; rtas_firmware_flash_list.num_blocks = 0;
flist = (struct flash_block_list *)&rtas_firmware_flash_list; flist = (struct flash_block_list *)&rtas_firmware_flash_list;
rtas_block_list = virt_to_abs(flist); rtas_block_list = virt_to_abs(flist);
if (rtas_block_list >= (4UL << 20)) { if (rtas_block_list >= 4UL*1024*1024*1024) {
printk(KERN_ALERT "FLASH: kernel bug...flash list header addr above 4GB\n"); printk(KERN_ALERT "FLASH: kernel bug...flash list header addr above 4GB\n");
return; return;
} }
......
arch/ppc64/kernel/rtas_flash.c
View file @ 5bac8cde
This diff is collapsed.
arch/ppc64/kernel/rtasd.c
View file @ 5bac8cde
This diff is collapsed.
arch/ppc64/kernel/sysfs.c
View file @ 5bac8cde
This diff is collapsed.
arch/ppc64/kernel/vio.c
View file @ 5bac8cde
This diff is collapsed.
arch/ppc64/oprofile/common.c
View file @ 5bac8cde
This diff is collapsed.
arch/ppc64/oprofile/op_model_power4.c
View file @ 5bac8cde
This diff is collapsed.
drivers/md/multipath.c
View file @ 5bac8cde
This diff is collapsed.
include/asm-ppc/reg.h
View file @ 5bac8cde
This diff is collapsed.
include/asm-ppc64/processor.h
View file @ 5bac8cde
This diff is collapsed.
include/asm-ppc64/ptrace.h
View file @ 5bac8cde
This diff is collapsed.
include/linux/i2o-dev.h
View file @ 5bac8cde
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7