Commit f5ad1a78 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] x86-64: Fix race in exit_idle
  [PATCH] x86-64: Fix vgetcpu when CONFIG_HOTPLUG_CPU is disabled
  [PATCH] x86: Add acpi_user_timer_override option for Asus boards
  [PATCH] x86-64: setup saved_max_pfn correctly (kdump)
  [PATCH] x86-64: Handle reserve_bootmem_generic beyond end_pfn
  [PATCH] x86-64: shorten the x86_64 boot setup GDT to what the comment says
  [PATCH] x86-64: Fix PTRACE_[SG]ET_THREAD_AREA regression with ia32 emulation.
  [PATCH] x86-64: Fix partial page check to ensure unusable memory is not being marked usable.
  Revert "[PATCH] MMCONFIG and new Intel motherboards"
parents 9a3a04ac 9446868b

Documentation/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -164,6 +164,10 @@ and is between 256 and 4096 characters. It is defined in the file 
	acpi_skip_timer_override [HW,ACPI]

			Recognize and ignore IRQ0/pin2 Interrupt Override.

			For broken nForce2 BIOS resulting in XT-PIC timer.

	acpi_use_timer_override [HW,ACPI}

			Use timer override. For some broken Nvidia NF5 boards

			that require a timer override, but don't have

			HPET



	acpi_dbg_layer=	[HW,ACPI]

			Format: <int>

arch/i386/kernel/acpi/boot.c

+8 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ EXPORT_SYMBOL(acpi_strict); 
acpi_interrupt_flags acpi_sci_flags __initdata;

int acpi_sci_override_gsi __initdata;

int acpi_skip_timer_override __initdata;

int acpi_use_timer_override __initdata;



#ifdef CONFIG_X86_LOCAL_APIC

static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE;
@@ -1300,6 +1301,13 @@ static int __init parse_acpi_skip_timer_override(char *arg) 
	return 0;

}

early_param("acpi_skip_timer_override", parse_acpi_skip_timer_override);



static int __init parse_acpi_use_timer_override(char *arg)

{

	acpi_use_timer_override = 1;

	return 0;

}

early_param("acpi_use_timer_override", parse_acpi_use_timer_override);

#endif /* CONFIG_X86_IO_APIC */



static int __init setup_acpi_sci(char *s)

arch/i386/kernel/acpi/earlyquirk.c

+7 −1
Original line number Diff line number Diff line
@@ -27,11 +27,17 @@ static int __init check_bridge(int vendor, int device) 
#ifdef CONFIG_ACPI

	/* According to Nvidia all timer overrides are bogus unless HPET

	   is enabled. */

	if (vendor == PCI_VENDOR_ID_NVIDIA) {

	if (!acpi_use_timer_override && vendor == PCI_VENDOR_ID_NVIDIA) {

		nvidia_hpet_detected = 0;

		acpi_table_parse(ACPI_HPET, nvidia_hpet_check);

		if (nvidia_hpet_detected == 0) {

			acpi_skip_timer_override = 1;

			  printk(KERN_INFO "Nvidia board "

                       "detected. Ignoring ACPI "

                       "timer override.\n");

                printk(KERN_INFO "If you got timer trouble "

			 	 "try acpi_use_timer_override\n");



		}

	}

#endif

arch/x86_64/boot/setup.S

+2 −3
Original line number Diff line number Diff line
@@ -836,13 +836,12 @@ gdt: 
	.word	0x9200				# data read/write

	.word	0x00CF				# granularity = 4096, 386

						#  (+5th nibble of limit)

gdt_end:

idt_48:

	.word	0				# idt limit = 0

	.word	0, 0				# idt base = 0L

gdt_48:

	.word	0x8000				# gdt limit=2048,

						#  256 GDT entries



	.word	gdt_end-gdt-1			# gdt limit

	.word	0, 0				# gdt base (filled in later)



# Include video setup & detection code

arch/x86_64/ia32/ptrace32.c

+2 −0
Original line number Diff line number Diff line
@@ -244,6 +244,8 @@ asmlinkage long sys32_ptrace(long request, u32 pid, u32 addr, u32 data) 
	case PTRACE_DETACH:

	case PTRACE_SYSCALL:

	case PTRACE_SETOPTIONS:

	case PTRACE_SET_THREAD_AREA:

	case PTRACE_GET_THREAD_AREA:

		return sys_ptrace(request, pid, addr, data); 



	default:

CRA Git | Maintained and supported by SUSTech CRA and CCSE