direct-io.hg

view patches/linux-2.6.16.33/git-2efe55a9cec8418f0e0cde3dc3787a42fddc4411.patch @ 12988:e080700efa56

[TOOLS] Fix the build. Clearly demarcate PPC-specific stuff.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kfraser@localhost.localdomain
date Wed Dec 13 10:23:53 2006 +0000 (2006-12-13)
parents 2b43fb3afb3e
children
line source
1 From: Tobias Klauser <tklauser@nuerscht.ch>
2 Date: Mon, 26 Jun 2006 16:57:34 +0000 (+0200)
3 Subject: Storage class should be first
4 X-Git-Tag: v2.6.18-rc1
5 X-Git-Url: http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=2efe55a9cec8418f0e0cde3dc3787a42fddc4411
7 Storage class should be first
9 Storage class should be before const
11 Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
12 Signed-off-by: Adrian Bunk <bunk@stusta.de>
13 ---
15 --- a/arch/i386/kernel/machine_kexec.c
16 +++ b/arch/i386/kernel/machine_kexec.c
17 @@ -133,9 +133,9 @@ typedef asmlinkage NORET_TYPE void (*rel
18 unsigned long start_address,
19 unsigned int has_pae) ATTRIB_NORET;
21 -const extern unsigned char relocate_new_kernel[];
22 +extern const unsigned char relocate_new_kernel[];
23 extern void relocate_new_kernel_end(void);
24 -const extern unsigned int relocate_new_kernel_size;
25 +extern const unsigned int relocate_new_kernel_size;
27 /*
28 * A architecture hook called to validate the
29 --- a/arch/powerpc/kernel/machine_kexec_32.c
30 +++ b/arch/powerpc/kernel/machine_kexec_32.c
31 @@ -30,8 +30,8 @@ typedef NORET_TYPE void (*relocate_new_k
32 */
33 void default_machine_kexec(struct kimage *image)
34 {
35 - const extern unsigned char relocate_new_kernel[];
36 - const extern unsigned int relocate_new_kernel_size;
37 + extern const unsigned char relocate_new_kernel[];
38 + extern const unsigned int relocate_new_kernel_size;
39 unsigned long page_list;
40 unsigned long reboot_code_buffer, reboot_code_buffer_phys;
41 relocate_new_kernel_t rnk;
42 --- a/arch/ppc/kernel/machine_kexec.c
43 +++ b/arch/ppc/kernel/machine_kexec.c
44 @@ -25,8 +25,8 @@ typedef NORET_TYPE void (*relocate_new_k
45 unsigned long reboot_code_buffer,
46 unsigned long start_address) ATTRIB_NORET;
48 -const extern unsigned char relocate_new_kernel[];
49 -const extern unsigned int relocate_new_kernel_size;
50 +extern const unsigned char relocate_new_kernel[];
51 +extern const unsigned int relocate_new_kernel_size;
53 void machine_shutdown(void)
54 {
55 --- a/arch/s390/kernel/machine_kexec.c
56 +++ b/arch/s390/kernel/machine_kexec.c
57 @@ -27,8 +27,8 @@ static void kexec_halt_all_cpus(void *);
59 typedef void (*relocate_kernel_t) (kimage_entry_t *, unsigned long);
61 -const extern unsigned char relocate_kernel[];
62 -const extern unsigned long long relocate_kernel_len;
63 +extern const unsigned char relocate_kernel[];
64 +extern const unsigned long long relocate_kernel_len;
66 int
67 machine_kexec_prepare(struct kimage *image)
68 --- a/arch/sh/kernel/machine_kexec.c
69 +++ b/arch/sh/kernel/machine_kexec.c
70 @@ -25,8 +25,8 @@ typedef NORET_TYPE void (*relocate_new_k
71 unsigned long start_address,
72 unsigned long vbr_reg) ATTRIB_NORET;
74 -const extern unsigned char relocate_new_kernel[];
75 -const extern unsigned int relocate_new_kernel_size;
76 +extern const unsigned char relocate_new_kernel[];
77 +extern const unsigned int relocate_new_kernel_size;
78 extern void *gdb_vbr_vector;
80 /*
81 --- a/arch/x86_64/kernel/machine_kexec.c
82 +++ b/arch/x86_64/kernel/machine_kexec.c
83 @@ -149,8 +149,8 @@ typedef NORET_TYPE void (*relocate_new_k
84 unsigned long start_address,
85 unsigned long pgtable) ATTRIB_NORET;
87 -const extern unsigned char relocate_new_kernel[];
88 -const extern unsigned long relocate_new_kernel_size;
89 +extern const unsigned char relocate_new_kernel[];
90 +extern const unsigned long relocate_new_kernel_size;
92 int machine_kexec_prepare(struct kimage *image)
93 {