alpha: more u64/ull type fixes
PATCH 1/1 alpha: more u64/ull type fixes
From: Randy Dunlap <[email protected]>
More alpha u64/ull fixes, on top of Andrew's 2 small patches.
Signed-off-by Randy Dunlap <[email protected]>
cc:
--- arch/alpha/include/asm/machvec.h | 2 +- arch/alpha/kernel/proto.h | 14 +++++++------- arch/alpha/kernel/sys_jensen.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-)
arch/alpha/include/asm/machvec.h +1 -1
@@ -80,7 +80,7 @@ struct alpha_machine_vectorvoid (*update_irq_hw)(unsigned long ,unsigned long ,int );void (*ack_irq)(unsigned long );void (*device_interrupt)(unsigned long vector); -void (*machine_check)(u64 vector,u64 la); +void (*machine_check)(unsigned long vector,unsigned long la);void (*smp_callin)(void );void (*init_arch)(void );
arch/alpha/kernel/proto.h +7 -7
@@ -20,7 +20,7 @@ struct pci_controller;extern struct pci_ops apecs_pci_ops;extern void apecs_init_arch (void );extern void apecs_pci_clr_err (void ); -extern void apecs_machine_check (u64 ,u64 ); +extern void apecs_machine_check (unsigned long vector,unsigned long la_ptr);extern void apecs_pci_tbi (struct pci_controller *,dma_addr_t ,dma_addr_t );/* core_cia.c */
@@ -29,7 +29,7 @@ extern void cia_init_pci(void);extern void cia_init_arch (void );extern void pyxis_init_arch (void );extern void cia_kill_arch (int ); -extern void cia_machine_check (u64 ,u64 ); +extern void cia_machine_check (unsigned long vector,unsigned long la_ptr);extern void cia_pci_tbi (struct pci_controller *,dma_addr_t ,dma_addr_t );/* core_irongate.c */
@@ -42,7 +42,7 @@ extern void irongate_machine_check(u64,/* core_lca.c */ extern struct pci_ops lca_pci_ops;extern void lca_init_arch (void ); -extern void lca_machine_check (u64 ,u64 ); +extern void lca_machine_check (unsigned long vector,unsigned long la_ptr);extern void lca_pci_tbi (struct pci_controller *,dma_addr_t ,dma_addr_t );/* core_marvel.c */
@@ -72,14 +72,14 @@ extern struct pci_ops polaris_pci_ops;extern int polaris_read_config_dword (struct pci_dev *,int ,u32 *);extern int polaris_write_config_dword (struct pci_dev *,int ,u32 );extern void polaris_init_arch (void ); -extern void polaris_machine_check (u64 ,u64 ); +extern void polaris_machine_check (unsigned long vector,unsigned long la_ptr);#define polaris_pci_tbi ((void *)0)/* core_t2.c */ extern struct pci_ops t2_pci_ops;extern void t2_init_arch (void );extern void t2_kill_arch (int ); -extern void t2_machine_check (u64 ,u64 ); +extern void t2_machine_check (unsigned long vector,unsigned long la_ptr);extern void t2_pci_tbi (struct pci_controller *,dma_addr_t ,dma_addr_t );/* core_titan.c */
@@ -94,14 +94,14 @@ extern struct _alpha_agp_info *titan_agpextern struct pci_ops tsunami_pci_ops;extern void tsunami_init_arch (void );extern void tsunami_kill_arch (int ); -extern void tsunami_machine_check (u64 ,u64 ); +extern void tsunami_machine_check (unsigned long vector,unsigned long la_ptr);extern void tsunami_pci_tbi (struct pci_controller *,dma_addr_t ,dma_addr_t );/* core_wildfire.c */ extern struct pci_ops wildfire_pci_ops;extern void wildfire_init_arch (void );extern void wildfire_kill_arch (int ); -extern void wildfire_machine_check (u64 ,u64 ); +extern void wildfire_machine_check (unsigned long vector,unsigned long la_ptr);extern void wildfire_pci_tbi (struct pci_controller *,dma_addr_t ,dma_addr_t );extern int wildfire_pa_to_nid (unsigned long );extern int wildfire_cpuid_to_nid (int );
arch/alpha/kernel/sys_jensen.c +1 -1
@@ -244,7 +244,7 @@ jensen_init_arch(void) }static void -jensen_machine_check (u64 vector,u64 la) +jensen_machine_check (unsigned long vector,unsigned long la) {printk (KERN_CRIT "Machine check\n" ); }