]>
Commit | Line | Data |
---|---|---|
bcd4f083 GKH |
1 | From 44266416f786514ec43a0d15ad951c34566b99c9 Mon Sep 17 00:00:00 2001 |
2 | From: Anton Vorontsov <cbouatmailru@gmail.com> | |
3 | Date: Mon, 29 Nov 2010 18:46:22 +0300 | |
4 | Subject: ARM: cns3xxx: Fix build with CONFIG_PCI=y | |
5 | ||
6 | From: Anton Vorontsov <cbouatmailru@gmail.com> | |
7 | ||
8 | commit 44266416f786514ec43a0d15ad951c34566b99c9 upstream. | |
9 | ||
10 | commit 6338a6aa7c082f11d55712251e14178c68bf5869 ("ARM: 6269/1: Add 'code' | |
11 | parameter for hook_fault_code()") breaks CNS3xxx build: | |
12 | ||
13 | CC arch/arm/mach-cns3xxx/pcie.o | |
14 | pcie.c: In function 'cns3xxx_pcie_init': | |
15 | pcie.c:373: warning: passing argument 4 of 'hook_fault_code' makes integer from pointer without a cast | |
16 | pcie.c:373: error: too few arguments to function 'hook_fault_code' | |
17 | ||
18 | This commit fixes the small issue. | |
19 | ||
20 | Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com> | |
21 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
22 | ||
23 | --- | |
24 | arch/arm/mach-cns3xxx/pcie.c | 2 +- | |
25 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
26 | ||
27 | --- a/arch/arm/mach-cns3xxx/pcie.c | |
28 | +++ b/arch/arm/mach-cns3xxx/pcie.c | |
29 | @@ -369,7 +369,7 @@ static int __init cns3xxx_pcie_init(void | |
30 | { | |
31 | int i; | |
32 | ||
33 | - hook_fault_code(16 + 6, cns3xxx_pcie_abort_handler, SIGBUS, | |
34 | + hook_fault_code(16 + 6, cns3xxx_pcie_abort_handler, SIGBUS, 0, | |
35 | "imprecise external abort"); | |
36 | ||
37 | for (i = 0; i < ARRAY_SIZE(cns3xxx_pcie); i++) { |