1. 17 Jul, 2008 4 commits
    • Ingo Molnar's avatar
      x86: rename CONFIG_NONPROMISC_DEVMEM to CONFIG_PROMISC_DEVMEM · 64d206d8
      Ingo Molnar authored
      Linus observed:
      
      > The real bug is that we shouldn't have "double negatives", and
      > certainly not negative config options. Making that "promiscuous
      > /dev/mem" option a negated thing as a config option was bad.
      
      right ... lets rename this option. There should never be a negation
      in config options.
      
      [ that reminds me of CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER, but that
        is for another commit ;-) ]
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      64d206d8
    • Rusty Russell's avatar
      x86: fix asm/e820.h for userspace inclusion · 2567d71c
      Rusty Russell authored
      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: default avatarRusty Russell <rusty@rustcorp.com.au>
      Cc: Yinghai Lu <yhlu.kernel@gmail.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      2567d71c
    • Yinghai Lu's avatar
      x86: fix numaq_tsc_disable · 9354094a
      Yinghai Lu authored
      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: default avatarYinghai Lu <yhlu.kernel@gmail.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      9354094a
    • Ingo Molnar's avatar
      Merge branch 'linus' into x86/urgent · c43c1be0
      Ingo Molnar authored
      c43c1be0
  2. 16 Jul, 2008 36 commits