1. 05 3月, 2009 4 次提交
    • I
      Merge branch 'x86/urgent' into x86/mm · 6d2e91bf
      Ingo Molnar 提交于
      Conflicts:
      	arch/x86/include/asm/fixmap_64.h
      Semantic merge:
      	arch/x86/include/asm/fixmap.h
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      6d2e91bf
    • H
      x86: EFI: Back efi_ioremap with init_memory_mapping instead of FIX_MAP · dd39ecf5
      Huang Ying 提交于
      Impact: Fix boot failure on EFI system with large runtime memory range
      
      Brian Maly reported that some EFI system with large runtime memory
      range can not boot. Because the FIX_MAP used to map runtime memory
      range is smaller than run time memory range.
      
      This patch fixes this issue by re-implement efi_ioremap() with
      init_memory_mapping().
      Reported-and-tested-by: NBrian Maly <bmaly@redhat.com>
      Signed-off-by: NHuang Ying <ying.huang@intel.com>
      Cc: Brian Maly <bmaly@redhat.com>
      Cc: Yinghai Lu <yinghai@kernel.org>
      LKML-Reference: <1236135513.6204.306.camel@yhuang-dev.sh.intel.com>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      dd39ecf5
    • P
      x86: set_highmem_pages_init() cleanup, #2 · 6298e719
      Pekka Enberg 提交于
      Impact: cleanup
      
      The zones are set up at this stage so there's a highmem zone
      available even for the UMA case.
      
      The only difference there is that for machines that have
      CONFIG_HIGHMEM enabled but don't have any highmem available,
      ->zone_start_pfn is zero whereas highstart_pfn is non-zero).
      
      The field is left zeroed because of the !size test in
      free_area_init_core() but shouldn't be a problem because
      add_highpages_with_active_regions() handles empty ranges just
      fine.
      Signed-off-by: NPekka Enberg <penberg@cs.helsinki.fi>
      Cc: Mel Gorman <mel@csn.ul.ie>
      LKML-Reference: <1236154567.29024.23.camel@penberg-laptop>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      6298e719
    • B
      x86: fix DMI on EFI · ff0c0874
      Brian Maly 提交于
      Impact: reactivate DMI quirks on EFI hardware
      
      DMI tables are loaded by EFI, so the dmi calls must happen after
      efi_init() and not before.
      
      Currently Apple hardware uses DMI to determine the framebuffer mappings
      for efifb. Without DMI working you also have no video on MacBook Pro.
      
      This patch resolves the DMI issue for EFI hardware (DMI is now properly
      detected at boot), and additionally efifb now loads on Apple hardware
      (i.e. video works).
      Signed-off-by: NBrian Maly <bmaly@redhat>
      Acked-by: NYinghai Lu <yinghai@kernel.org>
      Cc: ying.huang@intel.com
      LKML-Reference: <49ADEDA3.1030406@redhat.com>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      
       arch/x86/kernel/setup.c |    5 +++--
       1 file changed, 3 insertions(+), 2 deletions(-)
      ff0c0874
  2. 04 3月, 2009 14 次提交
  3. 03 3月, 2009 22 次提交