diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 11:30:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 11:30:57 -0400 |
| commit | b2d6744849b5bf6b4593b81c136772df7a238ac9 (patch) | |
| tree | f27260a0b16412449c4205207af114646c29e2c4 /arch/s390/kernel/module.c | |
| parent | c67646641cab01c93a56674bfcd963f55442dad5 (diff) | |
| parent | d2c993d845781d160a7ef759a3e65c6892c4a270 (diff) | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] Fix sparse warnings.
[S390] path grouping and path verifications fixes.
[S390] xpram module parameter parsing.
[S390] cpu_relax() is supposed to have barrier() semantics.
[S390] fix futex_atomic_cmpxchg_inatomic
[S390] subchannel register/unregister mutex.
[S390] raw_local_save_flags/raw_local_irq_restore type check
[S390] __builtin_trap() and gcc version.
Diffstat (limited to 'arch/s390/kernel/module.c')
| -rw-r--r-- | arch/s390/kernel/module.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c index c271cdab58e2..d989ed45a7aa 100644 --- a/arch/s390/kernel/module.c +++ b/arch/s390/kernel/module.c | |||
| @@ -119,7 +119,7 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs, | |||
| 119 | int nrela, i, j; | 119 | int nrela, i, j; |
| 120 | 120 | ||
| 121 | /* Find symbol table and string table. */ | 121 | /* Find symbol table and string table. */ |
| 122 | symtab = 0; | 122 | symtab = NULL; |
| 123 | for (i = 0; i < hdr->e_shnum; i++) | 123 | for (i = 0; i < hdr->e_shnum; i++) |
| 124 | switch (sechdrs[i].sh_type) { | 124 | switch (sechdrs[i].sh_type) { |
| 125 | case SHT_SYMTAB: | 125 | case SHT_SYMTAB: |