diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-07-18 20:38:57 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-07-18 20:38:57 -0400 |
| commit | 1ff8392c32a2645d2665ca779ecb91bb29361c13 (patch) | |
| tree | 860b95e9a499ade4060848740fc6ce1fbb4e4e8d /scripts/kallsyms.c | |
| parent | 70b315b0dd3879cb3ab8aadffb14f10b2d19b9c3 (diff) | |
| parent | 5bae7ac9feba925fd0099057f6b23d7be80b7b41 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/cifs/export.c
Diffstat (limited to 'scripts/kallsyms.c')
| -rw-r--r-- | scripts/kallsyms.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c index 8b809b264d18..10b006694e5d 100644 --- a/scripts/kallsyms.c +++ b/scripts/kallsyms.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #include <string.h> | 31 | #include <string.h> |
| 32 | #include <ctype.h> | 32 | #include <ctype.h> |
| 33 | 33 | ||
| 34 | #define KSYM_NAME_LEN 127 | 34 | #define KSYM_NAME_LEN 128 |
| 35 | 35 | ||
| 36 | 36 | ||
| 37 | struct sym_entry { | 37 | struct sym_entry { |
| @@ -254,7 +254,7 @@ static void write_src(void) | |||
| 254 | unsigned int i, k, off; | 254 | unsigned int i, k, off; |
| 255 | unsigned int best_idx[256]; | 255 | unsigned int best_idx[256]; |
| 256 | unsigned int *markers; | 256 | unsigned int *markers; |
| 257 | char buf[KSYM_NAME_LEN+1]; | 257 | char buf[KSYM_NAME_LEN]; |
| 258 | 258 | ||
| 259 | printf("#include <asm/types.h>\n"); | 259 | printf("#include <asm/types.h>\n"); |
| 260 | printf("#if BITS_PER_LONG == 64\n"); | 260 | printf("#if BITS_PER_LONG == 64\n"); |