tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'work.alpha' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull alpha updates from Al Viro:
"FEN (floating-point enable) fault fix deals with a really old oopsable
braino, the rest is alpha/boot compile fixes and minor cleaning up"

* 'work.alpha' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
alpha/boot/misc: trim unused declarations
alpha/boot/tools/objstrip: fix the check for ELF header
alpha/boot: fix the breakage from -isystem series...
alpha: fix FEN fault handling

Linus Torvalds 10cc5d48 d6b9cf41

+21 -23
+1 -1
arch/alpha/boot/bootp.c
··· 18 18 #include <asm/hwrpb.h> 19 19 #include <asm/io.h> 20 20 21 - #include <stdarg.h> 21 + #include <linux/stdarg.h> 22 22 23 23 #include "ksize.h" 24 24
+1 -1
arch/alpha/boot/bootpz.c
··· 20 20 #include <asm/hwrpb.h> 21 21 #include <asm/io.h> 22 22 23 - #include <stdarg.h> 23 + #include <linux/stdarg.h> 24 24 25 25 #include "kzsize.h" 26 26
+1 -1
arch/alpha/boot/main.c
··· 15 15 #include <asm/console.h> 16 16 #include <asm/hwrpb.h> 17 17 18 - #include <stdarg.h> 18 + #include <linux/stdarg.h> 19 19 20 20 #include "ksize.h" 21 21
-2
arch/alpha/boot/misc.c
··· 89 89 static ulg bytes_out; 90 90 91 91 static void error(char *m); 92 - static void gzip_mark(void **); 93 - static void gzip_release(void **); 94 92 95 93 extern int end; 96 94 static ulg free_mem_ptr;
+2 -2
arch/alpha/boot/stdio.c
··· 2 2 /* 3 3 * Copyright (C) Paul Mackerras 1997. 4 4 */ 5 - #include <stdarg.h> 6 - #include <stddef.h> 5 + #include <linux/string.h> 6 + #include <linux/stdarg.h> 7 7 8 8 size_t strnlen(const char * s, size_t count) 9 9 {
+1 -1
arch/alpha/boot/tools/objstrip.c
··· 148 148 #ifdef __ELF__ 149 149 elf = (struct elfhdr *) buf; 150 150 151 - if (elf->e_ident[0] == 0x7f && str_has_prefix((char *)elf->e_ident + 1, "ELF")) { 151 + if (memcmp(&elf->e_ident[EI_MAG0], ELFMAG, SELFMAG) == 0) { 152 152 if (elf->e_type != ET_EXEC) { 153 153 fprintf(stderr, "%s: %s is not an ELF executable\n", 154 154 prog_name, inname);
+15 -15
arch/alpha/kernel/traps.c
··· 233 233 { 234 234 int signo, code; 235 235 236 - if ((regs->ps & ~IPL_MAX) == 0) { 236 + if (type == 3) { /* FEN fault */ 237 + /* Irritating users can call PAL_clrfen to disable the 238 + FPU for the process. The kernel will then trap in 239 + do_switch_stack and undo_switch_stack when we try 240 + to save and restore the FP registers. 241 + 242 + Given that GCC by default generates code that uses the 243 + FP registers, PAL_clrfen is not useful except for DoS 244 + attacks. So turn the bleeding FPU back on and be done 245 + with it. */ 246 + current_thread_info()->pcb.flags |= 1; 247 + __reload_thread(&current_thread_info()->pcb); 248 + return; 249 + } 250 + if (!user_mode(regs)) { 237 251 if (type == 1) { 238 252 const unsigned int *data 239 253 = (const unsigned int *) regs->pc; ··· 379 365 } 380 366 } 381 367 break; 382 - 383 - case 3: /* FEN fault */ 384 - /* Irritating users can call PAL_clrfen to disable the 385 - FPU for the process. The kernel will then trap in 386 - do_switch_stack and undo_switch_stack when we try 387 - to save and restore the FP registers. 388 - 389 - Given that GCC by default generates code that uses the 390 - FP registers, PAL_clrfen is not useful except for DoS 391 - attacks. So turn the bleeding FPU back on and be done 392 - with it. */ 393 - current_thread_info()->pcb.flags |= 1; 394 - __reload_thread(&current_thread_info()->pcb); 395 - return; 396 368 397 369 case 5: /* illoc */ 398 370 default: /* unexpected instruction-fault type */