diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
| commit | bd3c97a7c718bfb9f1e4f31c16c383a5c6f815eb (patch) | |
| tree | 3f56594e813c6f35cbacbdb3e137ba5bfd0b3069 /lib | |
| parent | 6c33cafc794d07c9254c160789120a0e98c088c9 (diff) | |
| parent | 0215ffb08ce99e2bb59eca114a99499a4d06e704 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig.debug | 2 | ||||
| -rw-r--r-- | lib/string.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 77491e311791..d3679103a8e4 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
| @@ -341,7 +341,7 @@ config FRAME_POINTER | |||
| 341 | 341 | ||
| 342 | config UNWIND_INFO | 342 | config UNWIND_INFO |
| 343 | bool "Compile the kernel with frame unwind information" | 343 | bool "Compile the kernel with frame unwind information" |
| 344 | depends on !IA64 && !PARISC | 344 | depends on !IA64 && !PARISC && !ARM |
| 345 | depends on !MODULES || !(MIPS || PPC || SUPERH || V850) | 345 | depends on !MODULES || !(MIPS || PPC || SUPERH || V850) |
| 346 | help | 346 | help |
| 347 | If you say Y here the resulting kernel image will be slightly larger | 347 | If you say Y here the resulting kernel image will be slightly larger |
diff --git a/lib/string.c b/lib/string.c index 63077267367e..a485d75962af 100644 --- a/lib/string.c +++ b/lib/string.c | |||
| @@ -320,7 +320,7 @@ char *strstrip(char *s) | |||
| 320 | return s; | 320 | return s; |
| 321 | 321 | ||
| 322 | end = s + size - 1; | 322 | end = s + size - 1; |
| 323 | while (end != s && isspace(*end)) | 323 | while (end >= s && isspace(*end)) |
| 324 | end--; | 324 | end--; |
| 325 | *(end + 1) = '\0'; | 325 | *(end + 1) = '\0'; |
| 326 | 326 | ||