1. 02 6月, 2009 3 次提交
    • N
      x86: Print real IOAPIC version for x86-64 · 58f892e0
      Naga Chumbalkar 提交于
      Fix the fact that the IOAPIC version number in the x86_64 code path always
      gets assigned to 0, instead of the correct value.
      
      Before the patch: (from "dmesg" output):
      
       ACPI: IOAPIC (id[0x08] address[0xfec00000] gsi_base[0])
       IOAPIC[0]: apic_id 8, version 0, address 0xfec00000, GSI 0-23     <---
      
       After the patch:
       ACPI: IOAPIC (id[0x08] address[0xfec00000] gsi_base[0])
       IOAPIC[0]: apic_id 8, version 32, address 0xfec00000, GSI 0-23    <---
      
      History:
      
      io_apic_get_version() was compiled out of the x86_64 code path in the commit
      f2c2cca3:
      
      Author: Andi Kleen <ak@suse.de>
      Date:   Tue Sep 26 10:52:37 2006 +0200
      
          [PATCH] Remove APIC version/cpu capability mpparse checking/printing
      
          ACPI went to great trouble to get the APIC version and CPU capabilities
          of different CPUs before passing them to the mpparser. But all
          that data was used was to print it out.  Actually it even faked some data
          based on the boot cpu, not on the actual CPU being booted.
      
          Remove all this code because it's not needed.
      
          Cc: len.brown@intel.com
      
      At the time, the IOAPIC version number was deliberately not printed
      in the x86_64 code path. However, after the x86 and x86_64 files were
      merged, the net result is that the IOAPIC version is printed incorrectly
      in the x86_64 code path.
      
      The patch below provides a fix. I have tested it with acpi, and with
      acpi=off, and did not see any problems.
      Signed-off-by: NNaga Chumbalkar <nagananda.chumbalkar@hp.com>
      Acked-by: NYinghai Lu <yhlu.kernel@gmail.com>
      LKML-Reference: <20090416014230.4885.94926.sendpatchset@localhost.localdomain>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      *************************
      58f892e0
    • I
      Merge branch 'x86/cpufeature' into irq/numa · ee4c24a5
      Ingo Molnar 提交于
      Merge reason: irq/numa didnt build because this commit:
      
        2759c328: x86: don't call read_apic_id if !cpu_has_apic
      
      Had a dependency on x86/cpufeature changes. Pull in that
      (small) branch to fix the dependency.
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      ee4c24a5
    • I
      Merge branch 'linus' into irq/numa · 3d58f48b
      Ingo Molnar 提交于
      Conflicts:
      	arch/mips/sibyte/bcm1480/irq.c
      	arch/mips/sibyte/sb1250/irq.c
      
      Merge reason: we gathered a few conflicts plus update to latest upstream fixes.
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      3d58f48b
  2. 01 6月, 2009 10 次提交
  3. 31 5月, 2009 2 次提交
  4. 30 5月, 2009 19 次提交
  5. 29 5月, 2009 6 次提交