diff options
-rw-r--r-- | arch/mips/boot/compressed/dbg.c | 4 | ||||
-rw-r--r-- | arch/mips/oprofile/common.c | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/arch/mips/boot/compressed/dbg.c b/arch/mips/boot/compressed/dbg.c index ff4dc7a33a9f..134a6162e394 100644 --- a/arch/mips/boot/compressed/dbg.c +++ b/arch/mips/boot/compressed/dbg.c | |||
@@ -5,11 +5,11 @@ | |||
5 | * please select SYS_SUPPORTS_ZBOOT_UART16550 for your machine. othewise, you | 5 | * please select SYS_SUPPORTS_ZBOOT_UART16550 for your machine. othewise, you |
6 | * need to implement your own putc(). | 6 | * need to implement your own putc(). |
7 | */ | 7 | */ |
8 | 8 | #include <linux/compiler.h> | |
9 | #include <linux/init.h> | 9 | #include <linux/init.h> |
10 | #include <linux/types.h> | 10 | #include <linux/types.h> |
11 | 11 | ||
12 | void __attribute__ ((weak)) putc(char c) | 12 | void __weak putc(char c) |
13 | { | 13 | { |
14 | } | 14 | } |
15 | 15 | ||
diff --git a/arch/mips/oprofile/common.c b/arch/mips/oprofile/common.c index 7832ad257a14..f9eb1aba6345 100644 --- a/arch/mips/oprofile/common.c +++ b/arch/mips/oprofile/common.c | |||
@@ -6,6 +6,7 @@ | |||
6 | * Copyright (C) 2004, 2005 Ralf Baechle | 6 | * Copyright (C) 2004, 2005 Ralf Baechle |
7 | * Copyright (C) 2005 MIPS Technologies, Inc. | 7 | * Copyright (C) 2005 MIPS Technologies, Inc. |
8 | */ | 8 | */ |
9 | #include <linux/compiler.h> | ||
9 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
10 | #include <linux/init.h> | 11 | #include <linux/init.h> |
11 | #include <linux/oprofile.h> | 12 | #include <linux/oprofile.h> |
@@ -14,9 +15,9 @@ | |||
14 | 15 | ||
15 | #include "op_impl.h" | 16 | #include "op_impl.h" |
16 | 17 | ||
17 | extern struct op_mips_model op_model_mipsxx_ops __attribute__((weak)); | 18 | extern struct op_mips_model op_model_mipsxx_ops __weak; |
18 | extern struct op_mips_model op_model_rm9000_ops __attribute__((weak)); | 19 | extern struct op_mips_model op_model_rm9000_ops __weak; |
19 | extern struct op_mips_model op_model_loongson2_ops __attribute__((weak)); | 20 | extern struct op_mips_model op_model_loongson2_ops __weak; |
20 | 21 | ||
21 | static struct op_mips_model *model; | 22 | static struct op_mips_model *model; |
22 | 23 | ||