Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

Browse source

* 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, UV: Correct UV2 BAU destination timeout
  x86, UV: Correct failed topology memory leak
  x86, UV: Remove cpumask_t from the stack
  x86, UV: Rename hubmask to pnmask
  x86, UV: Correct reset_with_ipi()
  x86, UV: Allow for non-consecutive sockets
  x86, UV: Inline header file functions
  x86, UV: Fix smp_processor_id() use in a preemptable region
  x66, UV: Enable 64-bit ACPI MFCG support for SGI UV2 platform
  x86, UV: Clean up uv_mmrs.h

...

This commit is contained in:

Linus Torvalds 2011-07-22 17:04:55 -07:00

parent 8051207959 ae90c232be

commit 3e0b8df79d

4 changed files with 1691 additions and 1329 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

59

arch/x86/include/asm/uv/uv_bau.h

View file

2861

arch/x86/include/asm/uv/uv_mmrs.h

View file

File diff suppressed because it is too large Load diff

3

arch/x86/pci/mmconfig-shared.c

View file

69

arch/x86/platform/uv/tlb_uv.c

View file