From 73a31d601c17e11ae14bace3a503264d43127746 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Fri, 13 Jul 2007 18:54:10 +0100 Subject: [PATCH] --- yaml --- r: 62196 b: refs/heads/master c: 798d9023e440085f00b352f1c1af8894959ff63e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/tpm/tpm_bios.c | 11 +++-------- .../asm-mips/mach-cobalt/cpu-feature-overrides.h | 3 ++- .../asm-mips/mach-excite/cpu-feature-overrides.h | 2 ++ .../asm-mips/mach-ip22/cpu-feature-overrides.h | 3 ++- .../asm-mips/mach-ip27/cpu-feature-overrides.h | 3 ++- .../asm-mips/mach-ip32/cpu-feature-overrides.h | 3 ++- .../asm-mips/mach-qemu/cpu-feature-overrides.h | 3 ++- .../include/asm-mips/mach-rm/cpu-feature-overrides.h | 3 ++- .../asm-mips/mach-sibyte/cpu-feature-overrides.h | 3 ++- .../asm-mips/mach-yosemite/cpu-feature-overrides.h | 3 ++- trunk/kernel/ksysfs.c | 4 ++-- 12 files changed, 24 insertions(+), 19 deletions(-) diff --git a/[refs] b/[refs] index 047f7263185b..400066277ff1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b1937ac0ef1541c0ea44e6f81c33d2f59803957 +refs/heads/master: 798d9023e440085f00b352f1c1af8894959ff63e diff --git a/trunk/drivers/char/tpm/tpm_bios.c b/trunk/drivers/char/tpm/tpm_bios.c index 8677fc6a545e..4b26ce48189b 100644 --- a/trunk/drivers/char/tpm/tpm_bios.c +++ b/trunk/drivers/char/tpm/tpm_bios.c @@ -465,7 +465,7 @@ static int tpm_binary_bios_measurements_open(struct inode *inode, return -ENOMEM; if ((err = read_log(log))) - goto out_free; + return err; /* now register seq file */ err = seq_open(file, &tpm_binary_b_measurments_seqops); @@ -473,15 +473,10 @@ static int tpm_binary_bios_measurements_open(struct inode *inode, seq = file->private_data; seq->private = log; } else { - goto out_free; + kfree(log->bios_event_log); + kfree(log); } - -out: return err; -out_free: - kfree(log->bios_event_log); - kfree(log); - goto out; } const struct file_operations tpm_binary_bios_measurements_ops = { diff --git a/trunk/include/asm-mips/mach-cobalt/cpu-feature-overrides.h b/trunk/include/asm-mips/mach-cobalt/cpu-feature-overrides.h index c6dfa59d1986..3aeec4516f0d 100644 --- a/trunk/include/asm-mips/mach-cobalt/cpu-feature-overrides.h +++ b/trunk/include/asm-mips/mach-cobalt/cpu-feature-overrides.h @@ -3,7 +3,7 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. * - * Copyright (C) 2006 Ralf Baechle (ralf@linux-mips.org) + * Copyright (C) 2006, 07 Ralf Baechle (ralf@linux-mips.org) */ #ifndef __ASM_COBALT_CPU_FEATURE_OVERRIDES_H #define __ASM_COBALT_CPU_FEATURE_OVERRIDES_H @@ -46,6 +46,7 @@ #define cpu_has_ic_fills_f_dc 0 #define cpu_icache_snoops_remote_store 0 #define cpu_has_dsp 0 +#define cpu_has_mipsmt 0 #define cpu_has_mips32r1 0 #define cpu_has_mips32r2 0 diff --git a/trunk/include/asm-mips/mach-excite/cpu-feature-overrides.h b/trunk/include/asm-mips/mach-excite/cpu-feature-overrides.h index 0d31854222f9..e963aacf2281 100644 --- a/trunk/include/asm-mips/mach-excite/cpu-feature-overrides.h +++ b/trunk/include/asm-mips/mach-excite/cpu-feature-overrides.h @@ -4,6 +4,7 @@ * for more details. * * Copyright (C) 2004 Thomas Koeller + * Copyright (C) 2007 Ralf Baechle (ralf@linux-mips.org) */ #ifndef __ASM_MACH_EXCITE_CPU_FEATURE_OVERRIDES_H #define __ASM_MACH_EXCITE_CPU_FEATURE_OVERRIDES_H @@ -27,6 +28,7 @@ #define cpu_has_ic_fills_f_dc 0 #define cpu_has_dsp 0 #define cpu_icache_snoops_remote_store 0 +#define cpu_has_mipsmt 0 #define cpu_has_nofpuex 0 #define cpu_has_64bits 1 diff --git a/trunk/include/asm-mips/mach-ip22/cpu-feature-overrides.h b/trunk/include/asm-mips/mach-ip22/cpu-feature-overrides.h index f7c5dc8a5336..9edb41bad3af 100644 --- a/trunk/include/asm-mips/mach-ip22/cpu-feature-overrides.h +++ b/trunk/include/asm-mips/mach-ip22/cpu-feature-overrides.h @@ -3,7 +3,7 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. * - * Copyright (C) 2003 Ralf Baechle + * Copyright (C) 2003, 07 Ralf Baechle */ #ifndef __ASM_MACH_IP22_CPU_FEATURE_OVERRIDES_H #define __ASM_MACH_IP22_CPU_FEATURE_OVERRIDES_H @@ -30,6 +30,7 @@ #define cpu_has_ic_fills_f_dc 0 #define cpu_has_dsp 0 +#define cpu_has_mipsmt 0 #define cpu_has_nofpuex 0 #define cpu_has_64bits 1 diff --git a/trunk/include/asm-mips/mach-ip27/cpu-feature-overrides.h b/trunk/include/asm-mips/mach-ip27/cpu-feature-overrides.h index a071974b67bb..80c7f03b11fc 100644 --- a/trunk/include/asm-mips/mach-ip27/cpu-feature-overrides.h +++ b/trunk/include/asm-mips/mach-ip27/cpu-feature-overrides.h @@ -3,7 +3,7 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. * - * Copyright (C) 2003 Ralf Baechle + * Copyright (C) 2003, 07 Ralf Baechle */ #ifndef __ASM_MACH_IP27_CPU_FEATURE_OVERRIDES_H #define __ASM_MACH_IP27_CPU_FEATURE_OVERRIDES_H @@ -27,6 +27,7 @@ #define cpu_has_ic_fills_f_dc 0 #define cpu_has_dsp 0 #define cpu_icache_snoops_remote_store 1 +#define cpu_has_mipsmt 0 #define cpu_has_nofpuex 0 #define cpu_has_64bits 1 diff --git a/trunk/include/asm-mips/mach-ip32/cpu-feature-overrides.h b/trunk/include/asm-mips/mach-ip32/cpu-feature-overrides.h index 2a3de092bf13..9b4bd6cda272 100644 --- a/trunk/include/asm-mips/mach-ip32/cpu-feature-overrides.h +++ b/trunk/include/asm-mips/mach-ip32/cpu-feature-overrides.h @@ -4,7 +4,7 @@ * for more details. * * Copyright (C) 2005 Ilya A. Volynets-Evenbakh - * Copyright (C) 2005 Ralf Baechle (ralf@linux-mips.org) + * Copyright (C) 2005, 07 Ralf Baechle (ralf@linux-mips.org) */ #ifndef __ASM_MACH_IP32_CPU_FEATURE_OVERRIDES_H #define __ASM_MACH_IP32_CPU_FEATURE_OVERRIDES_H @@ -38,6 +38,7 @@ #define cpu_has_ic_fills_f_dc 0 #define cpu_has_dsp 0 #define cpu_has_4k_cache 1 +#define cpu_has_mipsmt 0 #define cpu_has_mips32r1 0 diff --git a/trunk/include/asm-mips/mach-qemu/cpu-feature-overrides.h b/trunk/include/asm-mips/mach-qemu/cpu-feature-overrides.h index 529445dacedb..d2daaed235d5 100644 --- a/trunk/include/asm-mips/mach-qemu/cpu-feature-overrides.h +++ b/trunk/include/asm-mips/mach-qemu/cpu-feature-overrides.h @@ -3,7 +3,7 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. * - * Copyright (C) 2003 Ralf Baechle + * Copyright (C) 2003, 07 Ralf Baechle */ #ifndef __ASM_MACH_QEMU_CPU_FEATURE_OVERRIDES_H #define __ASM_MACH_QEMU_CPU_FEATURE_OVERRIDES_H @@ -24,6 +24,7 @@ #define cpu_has_ic_fills_f_dc 0 #define cpu_has_dsp 0 +#define cpu_has_mipsmt 0 #define cpu_has_nofpuex 0 #define cpu_has_64bits 0 diff --git a/trunk/include/asm-mips/mach-rm/cpu-feature-overrides.h b/trunk/include/asm-mips/mach-rm/cpu-feature-overrides.h index 7e07283140a3..4682ff5c3f23 100644 --- a/trunk/include/asm-mips/mach-rm/cpu-feature-overrides.h +++ b/trunk/include/asm-mips/mach-rm/cpu-feature-overrides.h @@ -3,7 +3,7 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. * - * Copyright (C) 2003, 2004 Ralf Baechle + * Copyright (C) 2003, 04, 07 Ralf Baechle (ralf@linux-mips.org) * * SNI RM200 C apparently was only shipped with R4600 V2.0 and R5000 processors. */ @@ -32,6 +32,7 @@ #define cpu_has_dsp 0 #define cpu_has_nofpuex 0 #define cpu_has_64bits 1 +#define cpu_has_mipsmt 0 #define cpu_has_mips32r1 0 #define cpu_has_mips32r2 0 diff --git a/trunk/include/asm-mips/mach-sibyte/cpu-feature-overrides.h b/trunk/include/asm-mips/mach-sibyte/cpu-feature-overrides.h index a25968f277a2..dd3d92a2568d 100644 --- a/trunk/include/asm-mips/mach-sibyte/cpu-feature-overrides.h +++ b/trunk/include/asm-mips/mach-sibyte/cpu-feature-overrides.h @@ -3,7 +3,7 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. * - * Copyright (C) 2003, 2004 Ralf Baechle + * Copyright (C) 2003, 04, 07 Ralf Baechle (ralf@linux-mips.org) */ #ifndef __ASM_MACH_SIBYTE_CPU_FEATURE_OVERRIDES_H #define __ASM_MACH_SIBYTE_CPU_FEATURE_OVERRIDES_H @@ -26,6 +26,7 @@ #define cpu_has_dc_aliases 0 #define cpu_has_ic_fills_f_dc 0 #define cpu_has_dsp 0 +#define cpu_has_mipsmt 0 #define cpu_icache_snoops_remote_store 0 #define cpu_has_nofpuex 0 diff --git a/trunk/include/asm-mips/mach-yosemite/cpu-feature-overrides.h b/trunk/include/asm-mips/mach-yosemite/cpu-feature-overrides.h index 42cebb7ce7a6..e095e3444a98 100644 --- a/trunk/include/asm-mips/mach-yosemite/cpu-feature-overrides.h +++ b/trunk/include/asm-mips/mach-yosemite/cpu-feature-overrides.h @@ -3,7 +3,7 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. * - * Copyright (C) 2003, 2004 Ralf Baechle + * Copyright (C) 2003, 04, 07 Ralf Baechle (ralf@linux-mips.org) */ #ifndef __ASM_MACH_YOSEMITE_CPU_FEATURE_OVERRIDES_H #define __ASM_MACH_YOSEMITE_CPU_FEATURE_OVERRIDES_H @@ -26,6 +26,7 @@ #define cpu_has_dc_aliases 0 #define cpu_has_ic_fills_f_dc 0 #define cpu_has_dsp 0 +#define cpu_has_mipsmt 0 #define cpu_icache_snoops_remote_store 0 #define cpu_has_nofpuex 0 diff --git a/trunk/kernel/ksysfs.c b/trunk/kernel/ksysfs.c index d0e5c48e18c7..2565e1b6dd7b 100644 --- a/trunk/kernel/ksysfs.c +++ b/trunk/kernel/ksysfs.c @@ -65,8 +65,8 @@ KERNEL_ATTR_RO(kexec_crash_loaded); /* * Make /sys/kernel/notes give the raw contents of our kernel .notes section. */ -extern const void __start_notes __attribute__((weak)); -extern const void __stop_notes __attribute__((weak)); +extern const char __start_notes __attribute__((weak)); +extern const char __stop_notes __attribute__((weak)); #define notes_size (&__stop_notes - &__start_notes) static ssize_t notes_read(struct kobject *kobj, struct bin_attribute *bin_attr,