diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-09 06:12:06 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-09 06:12:06 -0400 |
| commit | 2a5f2e3e6cd1ce9fb3f8b186b6bc9aa1f1497a92 (patch) | |
| tree | b2306840f227972a7c9d4a2b75e516fe81358ce8 /kernel/marker.c | |
| parent | 02539d71fa98d5737bb668b02286c76241e4bac9 (diff) | |
| parent | 78be76476a34a77f0ea9db2f78ba46a2b0fd5ab5 (diff) | |
Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge
Diffstat (limited to 'kernel/marker.c')
| -rw-r--r-- | kernel/marker.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/marker.c b/kernel/marker.c index 005b95954593..b5a9fe1d50d5 100644 --- a/kernel/marker.c +++ b/kernel/marker.c | |||
| @@ -23,12 +23,13 @@ | |||
| 23 | #include <linux/rcupdate.h> | 23 | #include <linux/rcupdate.h> |
| 24 | #include <linux/marker.h> | 24 | #include <linux/marker.h> |
| 25 | #include <linux/err.h> | 25 | #include <linux/err.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | extern struct marker __start___markers[]; | 28 | extern struct marker __start___markers[]; |
| 28 | extern struct marker __stop___markers[]; | 29 | extern struct marker __stop___markers[]; |
| 29 | 30 | ||
| 30 | /* Set to 1 to enable marker debug output */ | 31 | /* Set to 1 to enable marker debug output */ |
| 31 | const int marker_debug; | 32 | static const int marker_debug; |
| 32 | 33 | ||
| 33 | /* | 34 | /* |
| 34 | * markers_mutex nests inside module_mutex. Markers mutex protects the builtin | 35 | * markers_mutex nests inside module_mutex. Markers mutex protects the builtin |