x86: Fix earlyprintk=dbgp for machines without NX
authorJan Beulich <JBeulich@novell.com>
Fri, 28 Aug 2009 13:11:57 +0000 (14:11 +0100)
committerIngo Molnar <mingo@elte.hu>
Sat, 29 Aug 2009 13:47:32 +0000 (15:47 +0200)
commit47d25003cbd9e9030a95f7ccc4e70fec6aa7b844
tree7928401e154672714e3db17f15e701fd38ed85fd
parentb855192c08fcb14adbc5d3a7cab182022d433cca
x86: Fix earlyprintk=dbgp for machines without NX

Since parse_early_param() may (e.g. for earlyprintk=dbgp)
involve calls to page table manipulation functions (here
set_fixmap_nocache()), NX hardware support must be determined
before calling that function (so that __supported_pte_mask gets
properly set up).

But the call after parse_early_param() can also not go away, as
that will honor eventual command line specified disabling of
the NX functionality.

( This will then just result in whatever mappings got
  established during parse_early_param() having the NX bit set
  despite it being disabled on the command line, but I think
  that's tolerable).

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Cc: Yinghai Lu <yhlu.kernel@gmail.com>
LKML-Reference: <4A97F3BD02000078000121B9@vpn.id2.novell.com>
[ merged to x86/pat to resolve a conflict. ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/setup.c