diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-17 18:36:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-17 18:36:19 -0700 |
| commit | 392abeea52db4dc870c0ea41912df8ca60b27d44 (patch) | |
| tree | a2683db754940ea8fb5e4aa78aedbfe2b786b3a4 /arch/x86 | |
| parent | 472db19ff5729cc9d054d6f87ba5147b21ec0787 (diff) | |
| parent | beed5336eba6a5a70c97e9f4bfff525915a25003 (diff) | |
| download | linux-392abeea52db4dc870c0ea41912df8ca60b27d44.tar.bz2 | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
vt,console,kdb: preserve console_blanked while in kdb
vt: fix regression warnings from KMS merge
arm,kgdb: fix GDB_MAX_REGS no longer used
kgdb: add missing __percpu markup in arch/x86/kernel/kgdb.c
kdb: fix compile error without CONFIG_KALLSYMS
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/kgdb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c index ef10940e1af0..852b81967a37 100644 --- a/arch/x86/kernel/kgdb.c +++ b/arch/x86/kernel/kgdb.c @@ -194,7 +194,7 @@ static struct hw_breakpoint { unsigned long addr; int len; int type; - struct perf_event **pev; + struct perf_event * __percpu *pev; } breakinfo[HBP_NUM]; static unsigned long early_dr7; |