Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 30633
b: refs/heads/master
c: 2efe55a
h: refs/heads/master
i:
  30631: ddd63e0
v: v3
  • Loading branch information
Tobias Klauser authored and Adrian Bunk committed Jun 26, 2006
1 parent ef0b744 commit 0f0305c
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 48a1204c462985378e02b4c5129901f3dbc93f80
refs/heads/master: 2efe55a9cec8418f0e0cde3dc3787a42fddc4411
4 changes: 2 additions & 2 deletions trunk/arch/i386/kernel/machine_kexec.c
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,9 @@ typedef asmlinkage NORET_TYPE void (*relocate_new_kernel_t)(
unsigned long start_address,
unsigned int has_pae) ATTRIB_NORET;

const extern unsigned char relocate_new_kernel[];
extern const unsigned char relocate_new_kernel[];
extern void relocate_new_kernel_end(void);
const extern unsigned int relocate_new_kernel_size;
extern const unsigned int relocate_new_kernel_size;

/*
* A architecture hook called to validate the
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/powerpc/kernel/machine_kexec_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ typedef NORET_TYPE void (*relocate_new_kernel_t)(
*/
void default_machine_kexec(struct kimage *image)
{
const extern unsigned char relocate_new_kernel[];
const extern unsigned int relocate_new_kernel_size;
extern const unsigned char relocate_new_kernel[];
extern const unsigned int relocate_new_kernel_size;
unsigned long page_list;
unsigned long reboot_code_buffer, reboot_code_buffer_phys;
relocate_new_kernel_t rnk;
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/ppc/kernel/machine_kexec.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ typedef NORET_TYPE void (*relocate_new_kernel_t)(
unsigned long reboot_code_buffer,
unsigned long start_address) ATTRIB_NORET;

const extern unsigned char relocate_new_kernel[];
const extern unsigned int relocate_new_kernel_size;
extern const unsigned char relocate_new_kernel[];
extern const unsigned int relocate_new_kernel_size;

void machine_shutdown(void)
{
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/s390/kernel/machine_kexec.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ static void kexec_halt_all_cpus(void *);

typedef void (*relocate_kernel_t) (kimage_entry_t *, unsigned long);

const extern unsigned char relocate_kernel[];
const extern unsigned long long relocate_kernel_len;
extern const unsigned char relocate_kernel[];
extern const unsigned long long relocate_kernel_len;

int
machine_kexec_prepare(struct kimage *image)
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/sh/kernel/machine_kexec.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ typedef NORET_TYPE void (*relocate_new_kernel_t)(
unsigned long start_address,
unsigned long vbr_reg) ATTRIB_NORET;

const extern unsigned char relocate_new_kernel[];
const extern unsigned int relocate_new_kernel_size;
extern const unsigned char relocate_new_kernel[];
extern const unsigned int relocate_new_kernel_size;
extern void *gdb_vbr_vector;

/*
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/x86_64/kernel/machine_kexec.c
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@ typedef NORET_TYPE void (*relocate_new_kernel_t)(unsigned long indirection_page,
unsigned long start_address,
unsigned long pgtable) ATTRIB_NORET;

const extern unsigned char relocate_new_kernel[];
const extern unsigned long relocate_new_kernel_size;
extern const unsigned char relocate_new_kernel[];
extern const unsigned long relocate_new_kernel_size;

int machine_kexec_prepare(struct kimage *image)
{
Expand Down

0 comments on commit 0f0305c

Please sign in to comment.