Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ffb1c0c authored by Ivan Kokshaysky's avatar Ivan Kokshaysky Committed by Linus Torvalds
Browse files

alpha: titan and marvel build fixes 



These platforms got broken after u64 => 'long long' conversion.

Apparently that change was compile-tested with 'make allmodconfig', but it
doesn't include systems that depend on !ALPHA_LEGACY_START_ADDRESS.

Signed-off-by: default avatarIvan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Richard Henderson <rth@twiddle.net
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b175dc09

arch/alpha/kernel/err_ev6.c

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ ev6_process_logout_frame(struct el_common *mchk_header, int print) 
}



void

ev6_machine_check(u64 vector, u64 la_ptr)

ev6_machine_check(unsigned long vector, unsigned long la_ptr)

{

	struct el_common *mchk_header = (struct el_common *)la_ptr;

arch/alpha/kernel/err_ev7.c

+2 −2
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ ev7_collect_logout_frame_subpackets(struct el_subpacket *el_ptr, 
}



void

ev7_machine_check(u64 vector, u64 la_ptr)

ev7_machine_check(unsigned long vector, unsigned long la_ptr)

{

	struct el_subpacket *el_ptr = (struct el_subpacket *)la_ptr;

	char *saved_err_prefix = err_print_prefix;
@@ -246,7 +246,7 @@ ev7_process_pal_subpacket(struct el_subpacket *header) 


	switch(header->type) {

	case EL_TYPE__PAL__LOGOUT_FRAME:

		printk("%s*** MCHK occurred on LPID %ld (RBOX %llx)\n",

		printk("%s*** MCHK occurred on LPID %lld (RBOX %llx)\n",

		       err_print_prefix,

		       packet->by_type.logout.whami, 

		       packet->by_type.logout.rbox_whami);

arch/alpha/kernel/err_impl.h

+5 −5
Original line number Diff line number Diff line
@@ -60,26 +60,26 @@ extern struct ev7_lf_subpackets * 
ev7_collect_logout_frame_subpackets(struct el_subpacket *,

				    struct ev7_lf_subpackets *);

extern void ev7_register_error_handlers(void);

extern void ev7_machine_check(u64, u64);

extern void ev7_machine_check(unsigned long, unsigned long);



/*

 * err_ev6.c

 */

extern void ev6_register_error_handlers(void);

extern int ev6_process_logout_frame(struct el_common *, int);

extern void ev6_machine_check(u64, u64);

extern void ev6_machine_check(unsigned long, unsigned long);



/*

 * err_marvel.c

 */

extern void marvel_machine_check(u64, u64);

extern void marvel_machine_check(unsigned long, unsigned long);

extern void marvel_register_error_handlers(void);



/*

 * err_titan.c

 */

extern int titan_process_logout_frame(struct el_common *, int);

extern void titan_machine_check(u64, u64);

extern void titan_machine_check(unsigned long, unsigned long);

extern void titan_register_error_handlers(void);

extern int privateer_process_logout_frame(struct el_common *, int);

extern void privateer_machine_check(u64, u64);
 
extern void privateer_machine_check(unsigned long, unsigned long);

arch/alpha/kernel/err_marvel.c

+1 −1
Original line number Diff line number Diff line
@@ -1042,7 +1042,7 @@ marvel_process_logout_frame(struct ev7_lf_subpackets *lf_subpackets, int print) 
}



void

marvel_machine_check(u64 vector, u64 la_ptr)

marvel_machine_check(unsigned long vector, unsigned long la_ptr)

{

	struct el_subpacket *el_ptr = (struct el_subpacket *)la_ptr;

	int (*process_frame)(struct ev7_lf_subpackets *, int) = NULL;

arch/alpha/kernel/err_titan.c

+2 −2
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ titan_process_logout_frame(struct el_common *mchk_header, int print) 
}



void

titan_machine_check(u64 vector, u64 la_ptr)

titan_machine_check(unsigned long vector, unsigned long la_ptr)

{

	struct el_common *mchk_header = (struct el_common *)la_ptr;

	struct el_TITAN_sysdata_mcheck *tmchk =
@@ -702,7 +702,7 @@ privateer_process_logout_frame(struct el_common *mchk_header, int print) 
}



void

privateer_machine_check(u64 vector, u64 la_ptr)

privateer_machine_check(unsigned long vector, unsigned long la_ptr)

{

	struct el_common *mchk_header = (struct el_common *)la_ptr;

	struct el_TITAN_sysdata_mcheck *tmchk =