diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-16 16:46:03 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-16 16:46:03 -0700 |
commit | bc231d9ede99518b67a77544d9084f15b898fe2e (patch) | |
tree | d407236d988cc82926b99ecd49d45122828108d6 /include/asm-generic | |
parent | 62a0027839a4a69bc5d2696672242019a6bb6221 (diff) | |
parent | 3cd0b53553ce28da6fc828c601041c974e1c4dde (diff) | |
download | linux-bc231d9ede99518b67a77544d9084f15b898fe2e.tar.gz linux-bc231d9ede99518b67a77544d9084f15b898fe2e.tar.bz2 linux-bc231d9ede99518b67a77544d9084f15b898fe2e.zip |
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 platform updates from Ingo Molnar:
"The main change is the addition of SGI/UV4 support"
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (22 commits)
x86/platform/UV: Fix incorrect nodes and pnodes for cpuless and memoryless nodes
x86/platform/UV: Remove Obsolete GRU MMR address translation
x86/platform/UV: Update physical address conversions for UV4
x86/platform/UV: Build GAM reference tables
x86/platform/UV: Support UV4 socket address changes
x86/platform/UV: Add obtaining GAM Range Table from UV BIOS
x86/platform/UV: Add UV4 addressing discovery function
x86/platform/UV: Fold blade info into per node hub info structs
x86/platform/UV: Allocate common per node hub info structs on local node
x86/platform/UV: Move blade local processor ID to the per cpu info struct
x86/platform/UV: Move scir info to the per cpu info struct
x86/platform/UV: Create per cpu info structs to replace per hub info structs
x86/platform/UV: Update MMIOH setup function to work for both UV3 and UV4
x86/platform/UV: Clean up redunduncies after merge of UV4 MMR definitions
x86/platform/UV: Add UV4 Specific MMR definitions
x86/platform/UV: Prep for UV4 MMR updates
x86/platform/UV: Add UV MMR Illegal Access Function
x86/platform/UV: Add UV4 Specific Defines
x86/platform/UV: Add UV Architecture Defines
x86/platform/UV: Add Initial UV4 definitions
...
Diffstat (limited to 'include/asm-generic')
0 files changed, 0 insertions, 0 deletions