Commit b8228758 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-misc 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-misc: (28 commits)
  x86: section mismatch fixes, #3
  x86: section mismatch fixes, #2
  x86: pgtable_32.h - prototype and section mismatch fixes
  x86: unlock_ExtINT_logic() - fix section mismatch warnings
  x86: uniq_ioapic_id - fix section mismatch warning
  x86: trampoline_32.S - switch to .cpuinit.data
  x86: use get_bios_ebda()
  x86: remove duplicate get_bios_ebda() from rio.h
  x86: get_bios_ebda() requires asm/io.h
  x86: use cpumask function for present, possible, and online cpus
  x86: cleanup div_sc() usage
  x86: cleanup clocksource_hz2mult usage
  x86: remove unnecessary memset and NULL check after alloc_bootmem()
  x86: use bitmap library for pin_programmed
  x86: use MP_intsrc_info()
  x86: use BUILD_BUG_ON() for the size of struct intel_mp_floating
  x86_64 ia32 ptrace: convert to compat_arch_ptrace
  x86_64 ia32 ptrace: use compat_ptrace_request for siginfo
  x86 signals: lift set_fs
  x86 signals: lift flags diddling code
  ...
parents 2a8a2719 5afca33a

arch/x86/Kconfig.cpu

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ config M386 


	  Here are the settings recommended for greatest speed:

	  - "386" for the AMD/Cyrix/Intel 386DX/DXL/SL/SLC/SX, Cyrix/TI

	  486DLC/DLC2, UMC 486SX-S and NexGen Nx586.  Only "386" kernels

	  will run on a 386 class machine.

	  486DLC/DLC2, and UMC 486SX-S.  Only "386" kernels will run on a 386

	  class machine.

	  - "486" for the AMD/Cyrix/IBM/Intel 486DX/DX2/DX4 or

	  SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5D or U5S.

	  - "586" for generic Pentium CPUs lacking the TSC

arch/x86/ia32/ia32_signal.c

+0 −10
Original line number Diff line number Diff line
@@ -499,11 +499,6 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka, 
	regs->cs = __USER32_CS;

	regs->ss = __USER32_DS;



	set_fs(USER_DS);

	regs->flags &= ~(X86_EFLAGS_TF | X86_EFLAGS_DF);

	if (test_thread_flag(TIF_SINGLESTEP))

		ptrace_notify(SIGTRAP);



#if DEBUG_SIG

	printk(KERN_DEBUG "SIG deliver (%s:%d): sp=%p pc=%lx ra=%u\n",

	       current->comm, current->pid, frame, regs->ip, frame->pretcode);
@@ -599,11 +594,6 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, 
	regs->cs = __USER32_CS;

	regs->ss = __USER32_DS;



	set_fs(USER_DS);

	regs->flags &= ~(X86_EFLAGS_TF | X86_EFLAGS_DF);

	if (test_thread_flag(TIF_SINGLESTEP))

		ptrace_notify(SIGTRAP);



#if DEBUG_SIG

	printk(KERN_DEBUG "SIG deliver (%s:%d): sp=%p pc=%lx ra=%u\n",

	       current->comm, current->pid, frame, regs->ip, frame->pretcode);

arch/x86/ia32/ia32entry.S

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ ia32_sys_call_table: 
	.quad sys_setuid16

	.quad sys_getuid16

	.quad compat_sys_stime	/* stime */		/* 25 */

	.quad sys32_ptrace	/* ptrace */

	.quad compat_sys_ptrace	/* ptrace */

	.quad sys_alarm

	.quad sys_fstat	/* (old)fstat */

	.quad sys_pause

arch/x86/kernel/acpi/boot.c

+0 −4
Original line number Diff line number Diff line
@@ -697,10 +697,6 @@ static int __init acpi_parse_hpet(struct acpi_table_header *table) 
#define HPET_RESOURCE_NAME_SIZE 9

	hpet_res = alloc_bootmem(sizeof(*hpet_res) + HPET_RESOURCE_NAME_SIZE);



	if (!hpet_res)

		return 0;



	memset(hpet_res, 0, sizeof(*hpet_res));

	hpet_res->name = (void *)&hpet_res[1];

	hpet_res->flags = IORESOURCE_MEM;

	snprintf((char *)hpet_res->name, HPET_RESOURCE_NAME_SIZE, "HPET %u",

arch/x86/kernel/apic_32.c

+2 −1
Original line number Diff line number Diff line
@@ -451,7 +451,8 @@ void __init setup_boot_APIC_clock(void) 
	}



	/* Calculate the scaled math multiplication factor */

	lapic_clockevent.mult = div_sc(delta, TICK_NSEC * LAPIC_CAL_LOOPS, 32);

	lapic_clockevent.mult = div_sc(delta, TICK_NSEC * LAPIC_CAL_LOOPS,

				       lapic_clockevent.shift);

	lapic_clockevent.max_delta_ns =

		clockevent_delta2ns(0x7FFFFF, &lapic_clockevent);

	lapic_clockevent.min_delta_ns =

CRA Git | Maintained and supported by SUSTech CRA and CCSE