Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 432e7c0d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] mca recovery return value when no bus check
  [IA64] SGI SN drivers: don't report !sn2 hardware as an error
  [IA64] don't report !sn2 or !summit hardware as an error
  [IA64] gensparse_defconfig: turn on PNPACPI
  [IA64] Increase severity of MCA recovery messages
parents f78bb8ad e1c48554

arch/ia64/configs/gensparse_defconfig

+10 −2
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.16-rc5

# Mon Feb 27 16:15:43 2006

# Thu Mar  2 16:39:10 2006

#



#
@@ -312,7 +312,13 @@ CONFIG_FW_LOADER=m 
#

# Plug and Play support

#

# CONFIG_PNP is not set

CONFIG_PNP=y

# CONFIG_PNP_DEBUG is not set



#

# Protocols

#

CONFIG_PNPACPI=y



#

# Block devices
@@ -357,6 +363,7 @@ CONFIG_BLK_DEV_IDESCSI=m 
# IDE chipset support/bugfixes

#

CONFIG_IDE_GENERIC=y

# CONFIG_BLK_DEV_IDEPNP is not set

CONFIG_BLK_DEV_IDEPCI=y

# CONFIG_IDEPCI_SHARE_IRQ is not set

# CONFIG_BLK_DEV_OFFBOARD is not set
@@ -525,6 +532,7 @@ CONFIG_DUMMY=m 
# CONFIG_BONDING is not set

# CONFIG_EQUALIZER is not set

# CONFIG_TUN is not set

# CONFIG_NET_SB1000 is not set



#

# ARCnet devices

arch/ia64/kernel/cyclone.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ int __init init_cyclone_clock(void) 
	u32* volatile cyclone_timer;	/* Cyclone MPMC0 register */



	if (!use_cyclone)

		return -ENODEV;

		return 0;



	printk(KERN_INFO "Summit chipset: Starting Cyclone Counter.\n");

arch/ia64/kernel/mca_drv.c

+11 −5
Original line number Diff line number Diff line
@@ -123,8 +123,9 @@ mca_page_isolate(unsigned long paddr) 
void

mca_handler_bh(unsigned long paddr)

{

	printk(KERN_DEBUG "OS_MCA: process [pid: %d](%s) encounters MCA.\n",

		current->pid, current->comm);

	printk(KERN_ERR

		"OS_MCA: process [pid: %d](%s) encounters MCA (paddr=%lx)\n",

		current->pid, current->comm, paddr);



	spin_lock(&mca_bh_lock);

	switch (mca_page_isolate(paddr)) {
@@ -132,7 +133,7 @@ mca_handler_bh(unsigned long paddr) 
		printk(KERN_DEBUG "Page isolation: ( %lx ) success.\n", paddr);

		break;

	case ISOLATE_NG:

		printk(KERN_DEBUG "Page isolation: ( %lx ) failure.\n", paddr);

		printk(KERN_CRIT "Page isolation: ( %lx ) failure.\n", paddr);

		break;

	default:

		break;
@@ -567,10 +568,15 @@ recover_from_processor_error(int platform, slidx_table_t *slidx, 
		return 0;



	/*

	 * If there is no bus error, record is weird but we need not to recover.

	 * The cache check and bus check bits have four possible states

	 *   cc bc

	 *    0  0	Weird record, not recovered

	 *    1  0	Cache error, not recovered

	 *    0  1	I/O error, attempt recovery

	 *    1  1	Memory error, attempt recovery

	 */

	if (psp->bc == 0 || pbci == NULL)

		return 1;

		return 0;



	/*

	 * Sorry, we cannot handle so many.

arch/ia64/sn/kernel/sn2/sn2_smp.c

+1 −1
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ static struct proc_dir_entry *proc_sn2_ptc; 
static int __init sn2_ptc_init(void)

{

	if (!ia64_platform_is("sn2"))

		return -ENOSYS;

		return 0;



	if (!(proc_sn2_ptc = create_proc_entry(PTC_BASENAME, 0444, NULL))) {

		printk(KERN_ERR "unable to create %s proc entry", PTC_BASENAME);

arch/ia64/sn/kernel/tiocx.c

+1 −1
Original line number Diff line number Diff line
@@ -484,7 +484,7 @@ static int __init tiocx_init(void) 
	int found_tiocx_device = 0;



	if (!ia64_platform_is("sn2"))

		return -ENODEV;

		return 0;



	bus_register(&tiocx_bus_type);