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

Commit c83d1280 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core

parents 51ca3c67 8d7ccaa5 8067794b a677f58a

arch/x86/kernel/cpu/mtrr/main.c

+1 −1
Original line number Diff line number Diff line
@@ -729,7 +729,7 @@ struct var_mtrr_range_state { 
	mtrr_type type;

};



struct var_mtrr_range_state __initdata range_state[RANGE_NUM];

static struct var_mtrr_range_state __initdata range_state[RANGE_NUM];

static int __initdata debug_print;



static int __init

arch/x86/kernel/entry_64.S

+2 −2
Original line number Diff line number Diff line
@@ -275,9 +275,9 @@ ENTRY(native_usergs_sysret64) 
ENTRY(ret_from_fork)

	CFI_DEFAULT_STACK

	push kernel_eflags(%rip)

	CFI_ADJUST_CFA_OFFSET 4

	CFI_ADJUST_CFA_OFFSET 8

	popf				# reset kernel eflags

	CFI_ADJUST_CFA_OFFSET -4

	CFI_ADJUST_CFA_OFFSET -8

	call schedule_tail

	GET_THREAD_INFO(%rcx)

	testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT),TI_flags(%rcx)

arch/x86/kernel/genx2apic_uv_x.c

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ int is_uv_system(void) 
{

	return uv_system_type != UV_NONE;

}

EXPORT_SYMBOL_GPL(is_uv_system);



DEFINE_PER_CPU(struct uv_hub_info_s, __uv_hub_info);

EXPORT_PER_CPU_SYMBOL_GPL(__uv_hub_info);

arch/x86/kernel/io_apic_32.c

+4 −4
Original line number Diff line number Diff line
@@ -1483,6 +1483,7 @@ static void print_APIC_bitfield(int base) 
void /*__init*/ print_local_APIC(void *dummy)

{

	unsigned int v, ver, maxlvt;

	u64 icr;



	if (apic_verbosity == APIC_QUIET)

		return;
@@ -1533,10 +1534,9 @@ void /*__init*/ print_local_APIC(void *dummy) 
		printk(KERN_DEBUG "... APIC ESR: %08x\n", v);

	}



	v = apic_read(APIC_ICR);

	printk(KERN_DEBUG "... APIC ICR: %08x\n", v);

	v = apic_read(APIC_ICR2);

	printk(KERN_DEBUG "... APIC ICR2: %08x\n", v);

	icr = apic_icr_read();

	printk(KERN_DEBUG "... APIC ICR: %08x\n", icr);

	printk(KERN_DEBUG "... APIC ICR2: %08x\n", icr >> 32);



	v = apic_read(APIC_LVTT);

	printk(KERN_DEBUG "... APIC LVTT: %08x\n", v);

arch/x86/kernel/ioport.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/slab.h>

#include <linux/thread_info.h>

#include <linux/syscalls.h>

#include <asm/syscalls.h>



/* Set EXTENT bits starting at BASE in BITMAP to value TURN_ON. */

static void set_bitmap(unsigned long *bitmap, unsigned int base,