diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-04-19 01:55:58 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-04-19 01:56:17 -0400 |
| commit | 68d2cf25d39324c54b5e42de7915c623a0917abe (patch) | |
| tree | ff1291450d7e6630bc77ec1363c3db8d74fa58b0 /samples | |
| parent | 176fcc5c5f0131504a55e1e1d35389c49a9177c2 (diff) | |
| parent | 5d2cd90922c778908bd0cd669e572a5b5eafd737 (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge reason: we'll be queueing up dependent changes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/Kconfig | 2 | ||||
| -rw-r--r-- | samples/hw_breakpoint/data_breakpoint.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/samples/Kconfig b/samples/Kconfig index e03cf0e374d7..41063e7592d2 100644 --- a/samples/Kconfig +++ b/samples/Kconfig | |||
| @@ -55,7 +55,7 @@ config SAMPLE_KFIFO | |||
| 55 | If in doubt, say "N" here. | 55 | If in doubt, say "N" here. |
| 56 | 56 | ||
| 57 | config SAMPLE_KDB | 57 | config SAMPLE_KDB |
| 58 | tristate "Build kdb command exmaple -- loadable modules only" | 58 | tristate "Build kdb command example -- loadable modules only" |
| 59 | depends on KGDB_KDB && m | 59 | depends on KGDB_KDB && m |
| 60 | help | 60 | help |
| 61 | Build an example of how to dynamically add the hello | 61 | Build an example of how to dynamically add the hello |
diff --git a/samples/hw_breakpoint/data_breakpoint.c b/samples/hw_breakpoint/data_breakpoint.c index bd0f337afcab..063653955f9f 100644 --- a/samples/hw_breakpoint/data_breakpoint.c +++ b/samples/hw_breakpoint/data_breakpoint.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | * | 19 | * |
| 20 | * This file is a kernel module that places a breakpoint over ksym_name kernel | 20 | * This file is a kernel module that places a breakpoint over ksym_name kernel |
| 21 | * variable using Hardware Breakpoint register. The corresponding handler which | 21 | * variable using Hardware Breakpoint register. The corresponding handler which |
| 22 | * prints a backtrace is invoked everytime a write operation is performed on | 22 | * prints a backtrace is invoked every time a write operation is performed on |
| 23 | * that variable. | 23 | * that variable. |
| 24 | * | 24 | * |
| 25 | * Copyright (C) IBM Corporation, 2009 | 25 | * Copyright (C) IBM Corporation, 2009 |