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

Commit 37e53db8 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] update sn2 defconfig
  [IA64] Add mca recovery failure messages
  [IA64-SGI] fix SGI Altix tioce_reserve_m32() bug
  [IA64] enable dumps to capture second page of kernel stack
  [IA64-SGI] - Reduce overhead of reading sn_topology
  [IA64-SGI] - Fix discover of nearest cpu node to IO node
  [IA64] IOC4 config option ordering
  [IA64] Setup an IA64 specific reclaim distance
  [IA64] eliminate compile time warnings
  [IA64] eliminate compile time warnings
  [IA64-SGI] SN SAL call to inject memory errors
  [IA64] - Fix MAX_PXM_DOMAINS for systems with > 256 nodes
  [IA64] Remove unused variable in sn_sal.h
  [IA64] Remove redundant NULL checks before kfree
  [IA64] wire up compat_sys_adjtimex()
parents 94b1661d 7384c8bd

arch/ia64/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -413,6 +413,8 @@ config IA64_PALINFO 
config SGI_SN

	def_bool y if (IA64_SGI_SN2 || IA64_GENERIC)



source "drivers/sn/Kconfig"



source "drivers/firmware/Kconfig"



source "fs/Kconfig.binfmt"

arch/ia64/configs/sn2_defconfig

+45 −31
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:06:38 2006

# Linux kernel version: 2.6.17-rc3

# Thu Apr 27 11:48:23 2006

#



#
@@ -24,6 +24,7 @@ CONFIG_SYSCTL=y 
# CONFIG_AUDIT is not set

# CONFIG_IKCONFIG is not set

CONFIG_CPUSETS=y

CONFIG_RELAY=y

CONFIG_INITRAMFS_SOURCE=""

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

# CONFIG_EMBEDDED is not set
@@ -38,10 +39,6 @@ CONFIG_BASE_FULL=y 
CONFIG_FUTEX=y

CONFIG_EPOLL=y

CONFIG_SHMEM=y

CONFIG_CC_ALIGN_FUNCTIONS=0

CONFIG_CC_ALIGN_LABELS=0

CONFIG_CC_ALIGN_LOOPS=0

CONFIG_CC_ALIGN_JUMPS=0

CONFIG_SLAB=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0
@@ -53,7 +50,6 @@ CONFIG_BASE_SMALL=0 
CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_MODULE_FORCE_UNLOAD is not set

CONFIG_OBSOLETE_MODPARM=y

# CONFIG_MODVERSIONS is not set

# CONFIG_MODULE_SRCVERSION_ALL is not set

CONFIG_KMOD=y
@@ -62,6 +58,7 @@ CONFIG_STOP_MACHINE=y 
#

# Block layer

#

# CONFIG_BLK_DEV_IO_TRACE is not set



#

# IO Schedulers
@@ -84,8 +81,10 @@ CONFIG_64BIT=y 
CONFIG_MMU=y

CONFIG_SWIOTLB=y

CONFIG_RWSEM_XCHGADD_ALGORITHM=y

CONFIG_GENERIC_FIND_NEXT_BIT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_TIME_INTERPOLATION=y

CONFIG_DMI=y

CONFIG_EFI=y

CONFIG_GENERIC_IOMAP=y

CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
@@ -116,7 +115,6 @@ CONFIG_IA64_SGI_SN_XP=m 
CONFIG_FORCE_MAX_ZONEORDER=17

CONFIG_SMP=y

CONFIG_NR_CPUS=1024

CONFIG_IA64_NR_NODES=256

# CONFIG_HOTPLUG_CPU is not set

CONFIG_SCHED_SMT=y

CONFIG_PREEMPT=y
@@ -136,6 +134,7 @@ CONFIG_ARCH_FLATMEM_ENABLE=y 
CONFIG_ARCH_SPARSEMEM_ENABLE=y

CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y

CONFIG_NUMA=y

CONFIG_NODES_SHIFT=8

CONFIG_VIRTUAL_MEM_MAP=y

CONFIG_HOLES_IN_ZONE=y

CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
@@ -187,7 +186,6 @@ CONFIG_ACPI_SYSTEM=y 
CONFIG_PCI=y

CONFIG_PCI_DOMAINS=y

# CONFIG_PCI_MSI is not set

CONFIG_PCI_LEGACY_PROC=y

# CONFIG_PCI_DEBUG is not set



#
@@ -231,6 +229,7 @@ CONFIG_SYN_COOKIES=y 
# CONFIG_INET_AH is not set

# CONFIG_INET_ESP is not set

# CONFIG_INET_IPCOMP is not set

# CONFIG_INET_XFRM_TUNNEL is not set

# CONFIG_INET_TUNNEL is not set

CONFIG_INET_DIAG=m

CONFIG_INET_TCP_DIAG=m
@@ -238,9 +237,11 @@ CONFIG_INET_TCP_DIAG=m 
CONFIG_TCP_CONG_BIC=y

CONFIG_IPV6=m

# CONFIG_IPV6_PRIVACY is not set

# CONFIG_IPV6_ROUTER_PREF is not set

# CONFIG_INET6_AH is not set

# CONFIG_INET6_ESP is not set

# CONFIG_INET6_IPCOMP is not set

# CONFIG_INET6_XFRM_TUNNEL is not set

# CONFIG_INET6_TUNNEL is not set

# CONFIG_IPV6_TUNNEL is not set

# CONFIG_NETFILTER is not set
@@ -468,9 +469,14 @@ CONFIG_SCSI_SATA_VITESSE=y 
# CONFIG_SCSI_INIA100 is not set

# CONFIG_SCSI_SYM53C8XX_2 is not set

# CONFIG_SCSI_IPR is not set

# CONFIG_SCSI_QLOGIC_FC is not set

CONFIG_SCSI_QLOGIC_1280=y

# CONFIG_SCSI_QLA_FC is not set

CONFIG_SCSI_QLA_FC=y

CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE=y

# CONFIG_SCSI_QLA21XX is not set

CONFIG_SCSI_QLA22XX=y

CONFIG_SCSI_QLA2300=y

CONFIG_SCSI_QLA2322=y

# CONFIG_SCSI_QLA24XX is not set

# CONFIG_SCSI_LPFC is not set

# CONFIG_SCSI_DC395x is not set

# CONFIG_SCSI_DC390T is not set
@@ -486,6 +492,7 @@ CONFIG_MD_RAID0=y 
CONFIG_MD_RAID1=y

# CONFIG_MD_RAID10 is not set

CONFIG_MD_RAID5=y

# CONFIG_MD_RAID5_RESHAPE is not set

# CONFIG_MD_RAID6 is not set

CONFIG_MD_MULTIPATH=y

# CONFIG_MD_FAULTY is not set
@@ -694,6 +701,7 @@ CONFIG_EFI_RTC=y 
# Ftape, the floppy tape device driver

#

CONFIG_AGP=y

# CONFIG_AGP_VIA is not set

CONFIG_AGP_SGI_TIOCA=y

# CONFIG_DRM is not set

CONFIG_RAW_DRIVER=m
@@ -734,10 +742,6 @@ CONFIG_MMTIMER=y 
# Misc devices

#



#

# Multimedia Capabilities Port drivers

#



#

# Multimedia devices

#
@@ -747,6 +751,7 @@ CONFIG_MMTIMER=y 
# Digital Video Broadcasting Devices

#

# CONFIG_DVB is not set

# CONFIG_USB_DABUSB is not set



#

# Graphics support
@@ -757,6 +762,7 @@ CONFIG_MMTIMER=y 
# Console display driver support

#

CONFIG_VGA_CONSOLE=y

# CONFIG_VGACON_SOFT_SCROLLBACK is not set

CONFIG_DUMMY_CONSOLE=y



#
@@ -769,6 +775,7 @@ CONFIG_DUMMY_CONSOLE=y 
#

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_OHCI=y

CONFIG_USB_ARCH_HAS_EHCI=y

CONFIG_USB=m

# CONFIG_USB_DEBUG is not set
@@ -829,9 +836,7 @@ CONFIG_USB_HIDINPUT=y 
# CONFIG_USB_ACECAD is not set

# CONFIG_USB_KBTAB is not set

# CONFIG_USB_POWERMATE is not set

# CONFIG_USB_MTOUCH is not set

# CONFIG_USB_ITMTOUCH is not set

# CONFIG_USB_EGALAX is not set

# CONFIG_USB_TOUCHSCREEN is not set

# CONFIG_USB_YEALINK is not set

# CONFIG_USB_XPAD is not set

# CONFIG_USB_ATI_REMOTE is not set
@@ -845,15 +850,6 @@ CONFIG_USB_HIDINPUT=y 
# CONFIG_USB_MDC800 is not set

# CONFIG_USB_MICROTEK is not set



#

# USB Multimedia devices

#

# CONFIG_USB_DABUSB is not set



#

# Video4Linux support is needed for USB Multimedia device support

#



#

# USB Network Adapters

#
@@ -904,6 +900,19 @@ CONFIG_USB_MON=y 
#

# CONFIG_MMC is not set



#

# LED devices

#

# CONFIG_NEW_LEDS is not set



#

# LED drivers

#



#

# LED Triggers

#



#

# InfiniBand support

#
@@ -911,9 +920,10 @@ CONFIG_INFINIBAND=m 
# CONFIG_INFINIBAND_USER_MAD is not set

CONFIG_INFINIBAND_USER_ACCESS=m

CONFIG_INFINIBAND_MTHCA=m

# CONFIG_INFINIBAND_MTHCA_DEBUG is not set

CONFIG_INFINIBAND_MTHCA_DEBUG=y

CONFIG_INFINIBAND_IPOIB=m

# CONFIG_INFINIBAND_IPOIB_DEBUG is not set

CONFIG_INFINIBAND_IPOIB_DEBUG=y

# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set

CONFIG_INFINIBAND_SRP=m



#
@@ -923,8 +933,13 @@ CONFIG_SGI_IOC4=y 
CONFIG_SGI_IOC3=y



#

# EDAC - error detection and reporting (RAS)

# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)

#



#

# Real Time Clock

#

# CONFIG_RTC_CLASS is not set



#

# File systems
@@ -997,7 +1012,6 @@ CONFIG_TMPFS=y 
CONFIG_HUGETLBFS=y

CONFIG_HUGETLB_PAGE=y

CONFIG_RAMFS=y

CONFIG_RELAYFS_FS=m

# CONFIG_CONFIGFS_FS is not set



#

arch/ia64/ia32/binfmt_elf32.c

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ extern void ia64_elf32_init (struct pt_regs *regs); 


static void elf32_set_personality (void);



static unsigned long __attribute ((unused))

randomize_stack_top(unsigned long stack_top);



#define setup_arg_pages(bprm,tos,exec)		ia32_setup_arg_pages(bprm,exec)

#define elf_map				elf32_map

arch/ia64/ia32/ia32_entry.S

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ ia32_syscall_table: 
	data8 sys_setdomainname

	data8 sys32_newuname

	data8 sys32_modify_ldt

	data8 sys_ni_syscall	/* adjtimex */

	data8 compat_sys_adjtimex

	data8 sys32_mprotect	  /* 125 */

	data8 compat_sys_sigprocmask

	data8 sys_ni_syscall	/* create_module */

arch/ia64/kernel/mca_drv.c

+36 −18
Original line number Diff line number Diff line
@@ -62,6 +62,11 @@ typedef enum { 
	ISOLATE_NONE

} isolate_status_t;



typedef enum {

	MCA_NOT_RECOVERED = 0,

	MCA_RECOVERED	  = 1

} recovery_status_t;



/*

 *  This pool keeps pointers to the section part of SAL error record

 */
@@ -71,6 +76,18 @@ static struct { 
	int	     max_idx; /* Maximum index of section pointer list pool */

} slidx_pool;



static int

fatal_mca(const char *fmt, ...)

{

	va_list args;



	va_start(args, fmt);

	vprintk(fmt, args);

	va_end(args);



	return MCA_NOT_RECOVERED;

}



/**

 * mca_page_isolate - isolate a poisoned page in order not to use it later

 * @paddr:	poisoned memory location
@@ -424,7 +441,7 @@ recover_from_read_error(slidx_table_t *slidx, 


	/* Is target address valid? */

	if (!pbci->tv)

		return 0;

		return fatal_mca(KERN_ALERT "MCA: target address not valid\n");



	/*

	 * cpu read or memory-mapped io read
@@ -442,7 +459,7 @@ recover_from_read_error(slidx_table_t *slidx, 


	/* Is minstate valid? */

	if (!peidx_bottom(peidx) || !(peidx_bottom(peidx)->valid.minstate))

		return 0;

		return fatal_mca(KERN_ALERT "MCA: minstate not valid\n");

	psr1 =(struct ia64_psr *)&(peidx_minstate_area(peidx)->pmsa_ipsr);

	psr2 =(struct ia64_psr *)&(peidx_minstate_area(peidx)->pmsa_xpsr);
@@ -476,12 +493,13 @@ recover_from_read_error(slidx_table_t *slidx, 
			psr2->bn  = 1;

			psr2->i  = 0;



			return 1;

			return MCA_RECOVERED;

		}



	}



	return 0;

	return fatal_mca(KERN_ALERT "MCA: kernel context not recovered,"

			  " iip 0x%lx\n", pmsa->pmsa_iip);

}



/**
@@ -567,13 +585,13 @@ recover_from_processor_error(int platform, slidx_table_t *slidx, 
	 * The machine check is corrected.

	 */

	if (psp->cm == 1)

		return 1;

		return MCA_RECOVERED;



	/*

	 * The error was not contained.  Software must be reset.

	 */

	if (psp->us || psp->ci == 0)

		return 0;

		return fatal_mca(KERN_ALERT "MCA: error not contained\n");



	/*

	 * The cache check and bus check bits have four possible states
@@ -584,20 +602,22 @@ recover_from_processor_error(int platform, slidx_table_t *slidx, 
	 *    1  1	Memory error, attempt recovery

	 */

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

		return 0;

		return fatal_mca(KERN_ALERT "MCA: No bus check\n");



	/*

	 * Sorry, we cannot handle so many.

	 */

	if (peidx_bus_check_num(peidx) > 1)

		return 0;

		return fatal_mca(KERN_ALERT "MCA: Too many bus checks\n");

	/*

	 * Well, here is only one bus error.

	 */

	if (pbci->ib || pbci->cc)

		return 0;

	if (pbci->ib)

		return fatal_mca(KERN_ALERT "MCA: Internal Bus error\n");

	if (pbci->cc)

		return fatal_mca(KERN_ALERT "MCA: Cache-cache error\n");

	if (pbci->eb && pbci->bsi > 0)

		return 0;

		return fatal_mca(KERN_ALERT "MCA: External bus check fatal status\n");



	/*

	 * This is a local MCA and estimated as recoverble external bus error.
@@ -609,7 +629,7 @@ recover_from_processor_error(int platform, slidx_table_t *slidx, 
	/*

	 * On account of strange SAL error record, we cannot recover.

	 */

	return 0;

	return fatal_mca(KERN_ALERT "MCA: Strange SAL record\n");

}



/**
@@ -638,12 +658,10 @@ mca_try_to_recover(void *rec, struct ia64_sal_os_state *sos) 


	 /* Now, OS can recover when there is one processor error section */

	if (n_proc_err > 1)

		return 0;

	else if (n_proc_err == 0) {

		return fatal_mca(KERN_ALERT "MCA: Too Many Errors\n");

	else if (n_proc_err == 0)

		/* Weird SAL record ... We need not to recover */



		return 1;

	}

		return fatal_mca(KERN_ALERT "MCA: Weird SAL record\n");



	/* Make index of processor error section */

	mca_make_peidx((sal_log_processor_info_t*)
@@ -654,7 +672,7 @@ mca_try_to_recover(void *rec, struct ia64_sal_os_state *sos) 


	/* Check whether MCA is global or not */

	if (is_mca_global(&peidx, &pbci, sos))

		return 0;

		return fatal_mca(KERN_ALERT "MCA: global MCA\n");

	

	/* Try to recover a processor error */

	return recover_from_processor_error(platform_err, &slidx, &peidx,