diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-11 17:10:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-11 17:10:05 -0700 |
| commit | 47ea8dd8710ba32391b729c95bea005b6fd86243 (patch) | |
| tree | 387e2f5868d4d53156784e90291dfaa1931eaccd /arch/powerpc/include/asm/perf_event_server.h | |
| parent | Merge branch 'for-3.16' of git://linux-nfs.org/~bfields/linux (diff) | |
| parent | x86-32, vdso: Fix vDSO build error due to missing align_vdso_addr() (diff) | |
| download | linux-dev-47ea8dd8710ba32391b729c95bea005b6fd86243.tar.xz linux-dev-47ea8dd8710ba32391b729c95bea005b6fd86243.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Peter Anvin:
"A couple of further build fixes for the VDSO code.
This is turning into a bit of a headache, and Andy has already come up
with a more ultimate cleanup, but most likely that is 3.17 material"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86-32, vdso: Fix vDSO build error due to missing align_vdso_addr()
x86-64, vdso: Fix vDSO build breakage due to empty .rela.dyn
Diffstat (limited to 'arch/powerpc/include/asm/perf_event_server.h')
0 files changed, 0 insertions, 0 deletions