* [patch] 3/6 2.6.2-rc2 mca.c cleanup - Mark variables and functions static where possible
@ 2004-02-05 2:31 Keith Owens
0 siblings, 0 replies; only message in thread
From: Keith Owens @ 2004-02-05 2:31 UTC (permalink / raw)
To: linux-ia64
Mark variables and functions static where possible
Index: 2-rc2.4/include/asm-ia64/mca.h
--- 2-rc2.4/include/asm-ia64/mca.h Thu, 05 Feb 2004 11:48:21 +1100 kaos (linux-2.6/V/b/0_mca.h 1.1.1.2 644)
+++ 2-rc2.5/include/asm-ia64/mca.h Thu, 05 Feb 2004 11:53:36 +1100 kaos (linux-2.6/V/b/0_mca.h 1.1.1.3 644)
@@ -2,7 +2,7 @@
* File: mca.h
* Purpose: Machine check handling specific defines
*
- * Copyright (C) 1999 Silicon Graphics, Inc.
+ * Copyright (C) 1999, 2004 Silicon Graphics, Inc.
* Copyright (C) Vijay Chander (vijay@engr.sgi.com)
* Copyright (C) Srinivasa Thirumalachar (sprasad@engr.sgi.com)
*/
@@ -142,12 +142,6 @@ extern void ia64_os_mca_dispatch_end(voi
extern void ia64_mca_ucmc_handler(void);
extern void ia64_monarch_init_handler(void);
extern void ia64_slave_init_handler(void);
-extern irqreturn_t ia64_mca_rendez_int_handler(int,void *,struct pt_regs *);
-extern irqreturn_t ia64_mca_wakeup_int_handler(int,void *,struct pt_regs *);
-extern irqreturn_t ia64_mca_cmc_int_handler(int,void *,struct pt_regs *);
-extern irqreturn_t ia64_mca_cmc_int_caller(int,void *,struct pt_regs *);
-extern irqreturn_t ia64_mca_cpe_int_handler(int,void *,struct pt_regs *);
-extern irqreturn_t ia64_mca_cpe_int_caller(int,void *,struct pt_regs *);
extern void ia64_mca_cmc_vector_setup(void);
extern int ia64_mca_check_errors(void);
Index: 2-rc2.4/arch/ia64/kernel/mca.c
--- 2-rc2.4/arch/ia64/kernel/mca.c Thu, 05 Feb 2004 11:48:21 +1100 kaos (linux-2.6/Z/c/43_mca.c 1.1.1.3 644)
+++ 2-rc2.5/arch/ia64/kernel/mca.c Thu, 05 Feb 2004 11:53:36 +1100 kaos (linux-2.6/Z/c/43_mca.c 1.1.1.4 644)
@@ -44,6 +44,7 @@
* 2004-02-01 Keith Owens <kaos@sgi.com>
* Avoid deadlock when using printk() for MCA and INIT records.
* Delete all record printing code, moved to salinfo_decode in user space.
+ * Mark variables and functions static where possible.
*/
#include <linux/config.h>
#include <linux/types.h>
@@ -79,7 +80,7 @@ typedef struct ia64_fptr {
unsigned long gp;
} ia64_fptr_t;
-ia64_mc_info_t ia64_mc_info;
+static ia64_mc_info_t ia64_mc_info;
ia64_mca_sal_to_os_state_t ia64_sal_to_os_handoff_state;
ia64_mca_os_to_sal_state_t ia64_os_to_sal_handoff_state;
u64 ia64_mca_proc_state_dump[512];
@@ -93,6 +94,12 @@ static void ia64_mca_wakeup_ipi_wait(v
static void ia64_mca_wakeup(int cpu);
static void ia64_mca_wakeup_all(void);
static void ia64_log_init(int);
+static irqreturn_t ia64_mca_rendez_int_handler(int,void *,struct pt_regs *);
+static irqreturn_t ia64_mca_wakeup_int_handler(int,void *,struct pt_regs *);
+static irqreturn_t ia64_mca_cmc_int_handler(int,void *,struct pt_regs *);
+static irqreturn_t ia64_mca_cpe_int_handler(int, void *, struct pt_regs *);
+static irqreturn_t ia64_mca_cmc_int_caller(int,void *,struct pt_regs *);
+static irqreturn_t ia64_mca_cpe_int_caller(int,void *,struct pt_regs *);
extern void ia64_monarch_init_handler (void);
extern void ia64_slave_init_handler (void);
static u64 ia64_log_get(int sal_info_type, u8 **buffer);
@@ -199,13 +206,13 @@ ia64_mca_log_sal_error_record(int sal_in
* platform dependent error handling
*/
#ifndef PLATFORM_MCA_HANDLERS
-void
+static void
mca_handler_platform (void)
{
}
-irqreturn_t
+static irqreturn_t
ia64_mca_cpe_int_handler (int cpe_irq, void *arg, struct pt_regs *ptregs)
{
IA64_MCA_DEBUG("ia64_mca_cpe_int_handler: received interrupt. CPU:%d vector = %#x\n",
@@ -357,7 +364,7 @@ fetch_min_state (pal_min_state_area_t *m
PUT_NAT_BIT(sw->caller_unat, &pt->r30); PUT_NAT_BIT(sw->caller_unat, &pt->r31);
}
-void
+static void
init_handler_platform (pal_min_state_area_t *ms,
struct pt_regs *pt, struct switch_stack *sw)
{
@@ -415,7 +422,7 @@ init_handler_platform (pal_min_state_are
* Outputs
* None
*/
-void
+static void
ia64_mca_init_platform (void)
{
@@ -521,7 +528,7 @@ ia64_mca_cmc_vector_setup (void)
* Outputs
* None
*/
-void
+static void
ia64_mca_cmc_vector_disable (void *dummy)
{
cmcv_reg_t cmcv;
@@ -548,7 +555,7 @@ ia64_mca_cmc_vector_disable (void *dummy
* Outputs
* None
*/
-void
+static void
ia64_mca_cmc_vector_enable (void *dummy)
{
cmcv_reg_t cmcv;
@@ -782,7 +789,7 @@ ia64_mca_init(void)
* Inputs : None
* Outputs : None
*/
-void
+static void
ia64_mca_wakeup_ipi_wait(void)
{
int irr_num = (IA64_MCA_WAKEUP_VECTOR >> 6);
@@ -816,7 +823,7 @@ ia64_mca_wakeup_ipi_wait(void)
* Inputs : cpuid
* Outputs : None
*/
-void
+static void
ia64_mca_wakeup(int cpu)
{
platform_send_ipi(cpu, IA64_MCA_WAKEUP_VECTOR, IA64_IPI_DM_INT, 0);
@@ -832,7 +839,7 @@ ia64_mca_wakeup(int cpu)
* Inputs : None
* Outputs : None
*/
-void
+static void
ia64_mca_wakeup_all(void)
{
int cpu;
@@ -857,7 +864,7 @@ ia64_mca_wakeup_all(void)
* Inputs : None
* Outputs : None
*/
-irqreturn_t
+static irqreturn_t
ia64_mca_rendez_int_handler(int rendez_irq, void *arg, struct pt_regs *ptregs)
{
unsigned long flags;
@@ -899,7 +906,7 @@ ia64_mca_rendez_int_handler(int rendez_i
* Outputs : None
*
*/
-irqreturn_t
+static irqreturn_t
ia64_mca_wakeup_int_handler(int wakeup_irq, void *arg, struct pt_regs *ptregs)
{
return IRQ_HANDLED;
@@ -919,7 +926,7 @@ ia64_mca_wakeup_int_handler(int wakeup_i
* Outputs : None
*/
-void
+static void
ia64_return_to_sal_check(void)
{
pal_processor_state_info_t *psp = (pal_processor_state_info_t *)
@@ -1002,7 +1009,7 @@ static DECLARE_WORK(cmc_enable_work, ia6
* Outputs
* None
*/
-irqreturn_t
+static irqreturn_t
ia64_mca_cmc_int_handler(int cmc_irq, void *arg, struct pt_regs *ptregs)
{
static unsigned long cmc_history[CMC_HISTORY_LENGTH];
@@ -1105,7 +1112,7 @@ static ia64_state_log_t ia64_state_log[I
* Outputs
* handled
*/
-irqreturn_t
+static irqreturn_t
ia64_mca_cmc_int_caller(int cpe_irq, void *arg, struct pt_regs *ptregs)
{
static int start_count = -1;
@@ -1172,7 +1179,7 @@ ia64_mca_cmc_poll (unsigned long dummy)
* Outputs
* handled
*/
-irqreturn_t
+static irqreturn_t
ia64_mca_cpe_int_caller(int cpe_irq, void *arg, struct pt_regs *ptregs)
{
static int start_count = -1;
@@ -1298,7 +1305,7 @@ ia64_init_handler (struct pt_regs *pt, s
* Inputs : info_type (SAL_INFO_TYPE_{MCA,INIT,CMC,CPE})
* Outputs : None
*/
-void
+static void
ia64_log_init(int sal_info_type)
{
u64 max_size = 0;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2004-02-05 2:31 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-02-05 2:31 [patch] 3/6 2.6.2-rc2 mca.c cleanup - Mark variables and functions static where possible Keith Owens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox