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

Commit 369aa839 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6 

* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6:
  [PATCH] Use early clobber in semaphores
  [PATCH] Define vsyscall cache as blob to make clearer that user space shouldn't use it
  [PATCH] Re-positioning the bss segment
  [PATCH] Use ARRAY_SIZE in setup.c
  [PATCH] i386: replace intermediate array-size definitions with ARRAY_SIZE()
  [PATCH] x86: Clean up x86 NMI sysctls
  [PATCH] Refactor some duplicated code in mpparse.c
  [PATCH] Document iommu=panic
  [PATCH] Fix broken indentation in iommu_setup
  [PATCH] Allow disabling DAC using command line options
  [PATCH] Add proper sparse __user casts to __copy_to_user_inatomic
  [PATCH] i386: Update defconfig
  [PATCH] Update defconfig
parents bf603625 c84ef530

Documentation/x86_64/boot-options.txt

+5 −0
Original line number Diff line number Diff line
@@ -199,6 +199,11 @@ IOMMU 
   allowed  overwrite iommu off workarounds for specific chipsets.

   soft	 Use software bounce buffering (default for Intel machines)

   noaperture Don't touch the aperture for AGP.

   allowdac Allow DMA >4GB

	    When off all DMA over >4GB is forced through an IOMMU or bounce

	    buffering.

   nodac    Forbid DMA >4GB

   panic    Always panic when IOMMU overflows



  swiotlb=pages[,force]

arch/i386/defconfig

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

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.18-git5

# Tue Sep 26 09:30:47 2006

# Linux kernel version: 2.6.18-git7

# Wed Sep 27 21:53:10 2006

#

CONFIG_X86_32=y

CONFIG_GENERIC_TIME=y
@@ -210,6 +210,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 
CONFIG_PM=y

CONFIG_PM_LEGACY=y

# CONFIG_PM_DEBUG is not set

CONFIG_PM_SYSFS_DEPRECATED=y



#

# ACPI (Advanced Configuration and Power Interface) Support
@@ -292,6 +293,7 @@ CONFIG_PCI_DIRECT=y 
CONFIG_PCI_MMCONFIG=y

# CONFIG_PCIEPORTBUS is not set

CONFIG_PCI_MSI=y

# CONFIG_PCI_MULTITHREAD_PROBE is not set

# CONFIG_PCI_DEBUG is not set

CONFIG_ISA_DMA_API=y

# CONFIG_ISA is not set
@@ -1427,6 +1429,7 @@ CONFIG_KPROBES=y 
#

CONFIG_TRACE_IRQFLAGS_SUPPORT=y

# CONFIG_PRINTK_TIME is not set

# CONFIG_ENABLE_MUST_CHECK is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_UNUSED_SYMBOLS=y

CONFIG_DEBUG_KERNEL=y

arch/i386/kernel/nmi.c

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ 


#include "mach_traps.h"



int unknown_nmi_panic;

int nmi_watchdog_enabled;



/* perfctr_nmi_owner tracks the ownership of the perfctr registers:

 * evtsel_nmi_owner tracks the ownership of the event selection

 * - different performance counters/ event selection may be reserved for

arch/i386/kernel/setup.c

+2 −8
Original line number Diff line number Diff line
@@ -209,9 +209,6 @@ static struct resource adapter_rom_resources[] = { { 
	.flags	= IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM

} };



#define ADAPTER_ROM_RESOURCES \

	(sizeof adapter_rom_resources / sizeof adapter_rom_resources[0])



static struct resource video_rom_resource = {

	.name 	= "Video ROM",

	.start	= 0xc0000,
@@ -273,9 +270,6 @@ static struct resource standard_io_resources[] = { { 
	.flags	= IORESOURCE_BUSY | IORESOURCE_IO

} };



#define STANDARD_IO_RESOURCES \

	(sizeof standard_io_resources / sizeof standard_io_resources[0])



#define romsignature(x) (*(unsigned short *)(x) == 0xaa55)



static int __init romchecksum(unsigned char *rom, unsigned long length)
@@ -332,7 +326,7 @@ static void __init probe_roms(void) 
	}



	/* check for adapter roms on 2k boundaries */

	for (i = 0; i < ADAPTER_ROM_RESOURCES && start < upper; start += 2048) {

	for (i = 0; i < ARRAY_SIZE(adapter_rom_resources) && start < upper; start += 2048) {

		rom = isa_bus_to_virt(start);

		if (!romsignature(rom))

			continue;
@@ -1272,7 +1266,7 @@ static int __init request_standard_resources(void) 
	request_resource(&iomem_resource, &video_ram_resource);



	/* request I/O space for devices used on all i[345]86 PCs */

	for (i = 0; i < STANDARD_IO_RESOURCES; i++)

	for (i = 0; i < ARRAY_SIZE(standard_io_resources); i++)

		request_resource(&ioport_resource, &standard_io_resources[i]);

	return 0;

}

arch/i386/kernel/traps.c

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ 


#include "mach_traps.h"



int panic_on_unrecovered_nmi;



asmlinkage int system_call(void);



struct desc_struct default_ldt[] = { { 0, 0 }, { 0, 0 }, { 0, 0 },