Commit 02f36038 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branches 'softirq-for-linus', 'x86-debug-for-linus',... 

Merge branches 'softirq-for-linus', 'x86-debug-for-linus', 'x86-numa-for-linus', 'x86-quirks-for-linus', 'x86-setup-for-linus', 'x86-uv-for-linus' and 'x86-vm86-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'softirq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  softirqs: Make wakeup_softirqd static

* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, asm: Restore parentheses around one pushl_cfi argument
  x86, asm: Fix ancient-GAS workaround
  x86, asm: Fix CFI macro invocations to deal with shortcomings in gas

* 'x86-numa-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, numa: Assign CPUs to nodes in round-robin manner on fake NUMA

* 'x86-quirks-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: HPET force enable for CX700 / VIA Epia LT

* 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, setup: Use string copy operation to optimze copy in kernel compression

* 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, UV: Use allocated buffer in tlb_uv.c:tunables_read()

* 'x86-vm86-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, vm86: Fix preemption bug for int1 debug and int3 breakpoint handlers.
parents 6c2754c2 676cb02d 07bd8516 50f2d7f6 892df7f8 68f4d5a0 b365a85c 6554287b

Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ targets += arch/$(SRCARCH)/kernel/asm-offsets.s 
# Default sed regexp - multiline due to syntax constraints

define sed-y

	"/^->/{s:->#\(.*\):/* \1 */:; \

	s:^->\([^ ]*\) [\$$#]*\([-0-9]*\) \(.*\):#define \1 (\2) /* \3 */:; \

	s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \

	s:->::; p;}"

endef

arch/x86/boot/compressed/misc.c

+23 −6
Original line number Diff line number Diff line
@@ -229,18 +229,35 @@ void *memset(void *s, int c, size_t n) 
		ss[i] = c;

	return s;

}



#ifdef CONFIG_X86_32

void *memcpy(void *dest, const void *src, size_t n)

{

	int i;

	const char *s = src;

	char *d = dest;

	int d0, d1, d2;

	asm volatile(

		"rep ; movsl\n\t"

		"movl %4,%%ecx\n\t"

		"rep ; movsb\n\t"

		: "=&c" (d0), "=&D" (d1), "=&S" (d2)

		: "0" (n >> 2), "g" (n & 3), "1" (dest), "2" (src)

		: "memory");



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

		d[i] = s[i];

	return dest;

}

#else

void *memcpy(void *dest, const void *src, size_t n)

{

	long d0, d1, d2;

	asm volatile(

		"rep ; movsq\n\t"

		"movq %4,%%rcx\n\t"

		"rep ; movsb\n\t"

		: "=&c" (d0), "=&D" (d1), "=&S" (d2)

		: "0" (n >> 3), "g" (n & 7), "1" (dest), "2" (src)

		: "memory");



	return dest;

}

#endif



static void error(char *x)

{

arch/x86/include/asm/calling.h

+27 −25
Original line number Diff line number Diff line
@@ -48,36 +48,38 @@ For 32-bit we have the following conventions - kernel is built with 




/*

 * 64-bit system call stack frame layout defines and helpers,

 * for assembly code:

 * 64-bit system call stack frame layout defines and helpers, for

 * assembly code (note that the seemingly unnecessary parentheses

 * are to prevent cpp from inserting spaces in expressions that get

 * passed to macros):

 */



#define R15		  0

#define R14		  8

#define R13		 16

#define R12		 24

#define RBP		 32

#define RBX		 40

#define R15		  (0)

#define R14		  (8)

#define R13		 (16)

#define R12		 (24)

#define RBP		 (32)

#define RBX		 (40)



/* arguments: interrupts/non tracing syscalls only save up to here: */

#define R11		 48

#define R10		 56

#define R9		 64

#define R8		 72

#define RAX		 80

#define RCX		 88

#define RDX		 96

#define RSI		104

#define RDI		112

#define ORIG_RAX	120       /* + error_code */

#define R11		 (48)

#define R10		 (56)

#define R9		 (64)

#define R8		 (72)

#define RAX		 (80)

#define RCX		 (88)

#define RDX		 (96)

#define RSI		(104)

#define RDI		(112)

#define ORIG_RAX	(120)       /* + error_code */

/* end of arguments */



/* cpu exception frame or undefined in case of fast syscall: */

#define RIP		128

#define CS		136

#define EFLAGS		144

#define RSP		152

#define SS		160

#define RIP		(128)

#define CS		(136)

#define EFLAGS		(144)

#define RSP		(152)

#define SS		(160)



#define ARGOFFSET	R11

#define SWFRAME		ORIG_RAX
@@ -111,7 +113,7 @@ For 32-bit we have the following conventions - kernel is built with 
	.endif

	.endm



#define ARG_SKIP	9*8

#define ARG_SKIP	(9*8)



	.macro RESTORE_ARGS skiprax=0, addskip=0, skiprcx=0, skipr11=0, \

			    skipr8910=0, skiprdx=0
@@ -169,7 +171,7 @@ For 32-bit we have the following conventions - kernel is built with 
	.endif

	.endm



#define REST_SKIP	6*8

#define REST_SKIP	(6*8)



	.macro SAVE_REST

	subq $REST_SKIP, %rsp

arch/x86/include/asm/entry_arch.h

+4 −15
Original line number Diff line number Diff line
@@ -16,22 +16,11 @@ BUILD_INTERRUPT(call_function_single_interrupt,CALL_FUNCTION_SINGLE_VECTOR) 
BUILD_INTERRUPT(irq_move_cleanup_interrupt,IRQ_MOVE_CLEANUP_VECTOR)

BUILD_INTERRUPT(reboot_interrupt,REBOOT_VECTOR)



BUILD_INTERRUPT3(invalidate_interrupt0,INVALIDATE_TLB_VECTOR_START+0,

		 smp_invalidate_interrupt)

BUILD_INTERRUPT3(invalidate_interrupt1,INVALIDATE_TLB_VECTOR_START+1,

		 smp_invalidate_interrupt)

BUILD_INTERRUPT3(invalidate_interrupt2,INVALIDATE_TLB_VECTOR_START+2,

		 smp_invalidate_interrupt)

BUILD_INTERRUPT3(invalidate_interrupt3,INVALIDATE_TLB_VECTOR_START+3,

		 smp_invalidate_interrupt)

BUILD_INTERRUPT3(invalidate_interrupt4,INVALIDATE_TLB_VECTOR_START+4,

		 smp_invalidate_interrupt)

BUILD_INTERRUPT3(invalidate_interrupt5,INVALIDATE_TLB_VECTOR_START+5,

		 smp_invalidate_interrupt)

BUILD_INTERRUPT3(invalidate_interrupt6,INVALIDATE_TLB_VECTOR_START+6,

		 smp_invalidate_interrupt)

BUILD_INTERRUPT3(invalidate_interrupt7,INVALIDATE_TLB_VECTOR_START+7,

.irpc idx, "01234567"

BUILD_INTERRUPT3(invalidate_interrupt\idx,

		 (INVALIDATE_TLB_VECTOR_START)+\idx,

		 smp_invalidate_interrupt)

.endr

#endif



BUILD_INTERRUPT(x86_platform_ipi, X86_PLATFORM_IPI_VECTOR)

arch/x86/include/asm/segment.h

+16 −16
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 


#define GDT_ENTRY_DEFAULT_USER_DS	15



#define GDT_ENTRY_KERNEL_BASE	12

#define GDT_ENTRY_KERNEL_BASE		(12)



#define GDT_ENTRY_KERNEL_CS		(GDT_ENTRY_KERNEL_BASE+0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE