1. 18 7月, 2008 3 次提交
    • R
      x86: fix asm/e820.h for userspace inclusion · 2567d71c
      Rusty Russell 提交于
      asm-x86/e820.h is included from userspace.  'x86: make e820.c to have
      common functions' (b79cd8f1) broke it:
      
      	make -C Documentation/lguest
      	cc -Wall -Wmissing-declarations -Wmissing-prototypes -O3 -I../../include
      lguest.c  -lz -o lguest
      	In file included from ../../include/asm-x86/bootparam.h:8,
      	                 from lguest.c:45:
      	../../include/asm/e820.h:66: error: expected ‘)’ before ‘start’
      	../../include/asm/e820.h:67: error: expected ‘)’ before ‘start’
      	../../include/asm/e820.h:68: error: expected ‘)’ before ‘start’
      	../../include/asm/e820.h:72: error: expected ‘=’, ‘,’, ‘;’, ‘asm’
      or ‘__attribute__’ before ‘e820_update_range’
      	...
      Signed-off-by: NRusty Russell <rusty@rustcorp.com.au>
      Cc: Yinghai Lu <yhlu.kernel@gmail.com>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      2567d71c
    • Y
      x86: fix numaq_tsc_disable · 9354094a
      Yinghai Lu 提交于
      fix:
      
       arch/x86/kernel/numaq_32.c: In function ‘numaq_tsc_disable’:
       arch/x86/kernel/numaq_32.c:99: warning: ‘return’ with a value, in function returning void
      Signed-off-by: NYinghai Lu <yhlu.kernel@gmail.com>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      9354094a
    • I
      Merge branch 'linus' into x86/urgent · c43c1be0
      Ingo Molnar 提交于
      c43c1be0
  2. 17 7月, 2008 37 次提交