summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-04-23 06:12:14 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-04-23 06:12:14 +0000
commitb9e55bb180a44f990e201c771c103469f6fb08ca (patch)
treedcbec41543db290e07d5b2723c611d5ebf9c0fac /include
parentc4ca763cc6ffd1ffef022766dde60487e42f17ae (diff)
Change all instances of __SMP__ to CONFIG_SMP and include
<linux/config.h> where necessary.
Diffstat (limited to 'include')
-rw-r--r--include/asm-mips/atomic.h6
-rw-r--r--include/asm-mips/delay.h4
-rw-r--r--include/asm-mips/hardirq.h6
-rw-r--r--include/asm-mips/pgalloc.h6
-rw-r--r--include/asm-mips/processor.h4
-rw-r--r--include/asm-mips64/atomic.h4
-rw-r--r--include/asm-mips64/delay.h4
-rw-r--r--include/asm-mips64/hardirq.h5
-rw-r--r--include/asm-mips64/pgalloc.h4
-rw-r--r--include/asm-mips64/processor.h5
-rw-r--r--include/asm-mips64/smp.h4
-rw-r--r--include/asm-mips64/system.h6
12 files changed, 38 insertions, 20 deletions
diff --git a/include/asm-mips/atomic.h b/include/asm-mips/atomic.h
index a38920e51..fbd2daee7 100644
--- a/include/asm-mips/atomic.h
+++ b/include/asm-mips/atomic.h
@@ -13,12 +13,12 @@
*
* $Id: atomic.h,v 1.6 1999/07/26 19:42:42 harald Exp $
*/
-#ifndef __ASM_MIPS_ATOMIC_H
-#define __ASM_MIPS_ATOMIC_H
+#ifndef __ASM_ATOMIC_H
+#define __ASM_ATOMIC_H
#include <linux/config.h>
-#ifdef __SMP__
+#ifdef CONFIG_SMP
typedef struct { volatile int counter; } atomic_t;
#else
typedef struct { int counter; } atomic_t;
diff --git a/include/asm-mips/delay.h b/include/asm-mips/delay.h
index 3c4769a29..98fe1ec3d 100644
--- a/include/asm-mips/delay.h
+++ b/include/asm-mips/delay.h
@@ -10,6 +10,8 @@
#ifndef _ASM_DELAY_H
#define _ASM_DELAY_H
+#include <linux/config.h>
+
extern __inline__ void
__delay(unsigned long loops)
{
@@ -42,7 +44,7 @@ extern __inline__ void __udelay(unsigned long usecs, unsigned long lps)
__delay(usecs);
}
-#ifdef __SMP__
+#ifdef CONFIG_SMP
#define __udelay_val cpu_data[smp_processor_id()].udelay_val
#else
#define __udelay_val loops_per_sec
diff --git a/include/asm-mips/hardirq.h b/include/asm-mips/hardirq.h
index f3854a267..f881937a6 100644
--- a/include/asm-mips/hardirq.h
+++ b/include/asm-mips/hardirq.h
@@ -10,6 +10,8 @@
#ifndef _ASM_HARDIRQ_H
#define _ASM_HARDIRQ_H
+#include <linux/config.h>
+
#include <linux/threads.h>
#include <linux/irq.h>
@@ -35,7 +37,7 @@ extern irq_cpustat_t irq_stat [NR_CPUS];
(local_irq_count(__cpu) + local_bh_count(__cpu) != 0); })
#define in_irq() (local_irq_count(smp_processor_id()) != 0)
-#ifndef __SMP__
+#ifndef CONFIG_SMP
#define hardirq_trylock(cpu) (local_irq_count(cpu) == 0)
#define hardirq_endlock(cpu) do { } while (0)
@@ -49,5 +51,5 @@ extern irq_cpustat_t irq_stat [NR_CPUS];
#error No habla MIPS SMP
-#endif /* __SMP__ */
+#endif /* CONFIG_SMP */
#endif /* _ASM_HARDIRQ_H */
diff --git a/include/asm-mips/pgalloc.h b/include/asm-mips/pgalloc.h
index 45677ce94..c9600661e 100644
--- a/include/asm-mips/pgalloc.h
+++ b/include/asm-mips/pgalloc.h
@@ -10,6 +10,8 @@
#ifndef _ASM_PGALLOC_H
#define _ASM_PGALLOC_H
+#include <linux/config.h>
+
/* TLB flushing:
*
* - flush_tlb_all() flushes all processes TLB entries
@@ -188,7 +190,7 @@ extern inline void set_pgdir(unsigned long address, pgd_t entry)
{
struct task_struct * p;
pgd_t *pgd;
-#ifdef __SMP__
+#ifdef CONFIG_SMP
int i;
#endif
@@ -199,7 +201,7 @@ extern inline void set_pgdir(unsigned long address, pgd_t entry)
*pgd_offset(p->mm,address) = entry;
}
read_unlock(&tasklist_lock);
-#ifndef __SMP__
+#ifndef CONFIG_SMP
for (pgd = (pgd_t *)pgd_quicklist; pgd; pgd = (pgd_t *)*(unsigned long *)pgd)
pgd[address >> PGDIR_SHIFT] = entry;
#else
diff --git a/include/asm-mips/processor.h b/include/asm-mips/processor.h
index fc4dff224..d6fb7526d 100644
--- a/include/asm-mips/processor.h
+++ b/include/asm-mips/processor.h
@@ -12,6 +12,8 @@
#ifndef _ASM_PROCESSOR_H
#define _ASM_PROCESSOR_H
+#include <linux/config.h>
+
#include <asm/isadep.h>
/*
@@ -47,7 +49,7 @@ extern char vce_available; /* Supports VCED / VCEI exceptions */
extern struct mips_cpuinfo boot_cpu_data;
extern unsigned int vced_count, vcei_count;
-#ifdef __SMP__
+#ifdef CONFIG_SMP
extern struct mips_cpuinfo cpu_data[];
#define current_cpu_data cpu_data[smp_processor_id()]
#else
diff --git a/include/asm-mips64/atomic.h b/include/asm-mips64/atomic.h
index c1d8a25fb..5d57f8a8c 100644
--- a/include/asm-mips64/atomic.h
+++ b/include/asm-mips64/atomic.h
@@ -15,9 +15,11 @@
#ifndef _ASM_ATOMIC_H
#define _ASM_ATOMIC_H
+#include <linux/config.h>
+
#include <asm/sgidefs.h>
-#ifdef __SMP__
+#ifdef CONFIG_SMP
typedef struct { volatile int counter; } atomic_t;
#else
typedef struct { int counter; } atomic_t;
diff --git a/include/asm-mips64/delay.h b/include/asm-mips64/delay.h
index f3ec30a9e..2913275ab 100644
--- a/include/asm-mips64/delay.h
+++ b/include/asm-mips64/delay.h
@@ -11,6 +11,8 @@
#ifndef _ASM_DELAY_H
#define _ASM_DELAY_H
+#include <linux/config.h>
+
extern __inline__ void
__delay(unsigned long loops)
{
@@ -43,7 +45,7 @@ extern __inline__ void __udelay(unsigned long usecs, unsigned long lps)
__delay(usecs);
}
-#ifdef __SMP__
+#ifdef CONFIG_SMP
#define __udelay_val cpu_data[smp_processor_id()].udelay_val
#else
#define __udelay_val loops_per_sec
diff --git a/include/asm-mips64/hardirq.h b/include/asm-mips64/hardirq.h
index 1c2d1e868..192b61f7b 100644
--- a/include/asm-mips64/hardirq.h
+++ b/include/asm-mips64/hardirq.h
@@ -10,6 +10,7 @@
#ifndef _ASM_HARDIRQ_H
#define _ASM_HARDIRQ_H
+#include <linux/config.h>
#include <linux/threads.h>
#include <linux/irq.h>
@@ -35,7 +36,7 @@ extern irq_cpustat_t irq_stat [NR_CPUS];
(local_irq_count(__cpu) + local_bh_count(__cpu) != 0); })
#define in_irq() (local_irq_count(smp_processor_id()) != 0)
-#ifndef __SMP__
+#ifndef CONFIG_SMP
#define hardirq_trylock(cpu) (local_irq_count(cpu) == 0)
#define hardirq_endlock(cpu) do { } while (0)
@@ -95,6 +96,6 @@ static inline void irq_exit(int cpu, int irq)
extern void synchronize_irq(void);
-#endif /* __SMP__ */
+#endif /* CONFIG_SMP */
#endif /* _ASM_HARDIRQ_H */
diff --git a/include/asm-mips64/pgalloc.h b/include/asm-mips64/pgalloc.h
index 24f7c3a3f..74d3e2998 100644
--- a/include/asm-mips64/pgalloc.h
+++ b/include/asm-mips64/pgalloc.h
@@ -220,7 +220,7 @@ extern inline void set_pgdir(unsigned long address, pgd_t entry)
{
struct task_struct * p;
pgd_t *pgd;
-#ifdef __SMP__
+#ifdef CONFIG_SMP
int i;
#endif
@@ -231,7 +231,7 @@ extern inline void set_pgdir(unsigned long address, pgd_t entry)
*pgd_offset(p->mm, address) = entry;
}
read_unlock(&tasklist_lock);
-#ifndef __SMP__
+#ifndef CONFIG_SMP
for (pgd = (pgd_t *)pgd_quicklist; pgd; pgd = (pgd_t *)*(unsigned long *)pgd)
pgd[address >> PGDIR_SHIFT] = entry;
#else
diff --git a/include/asm-mips64/processor.h b/include/asm-mips64/processor.h
index 76611f07d..0532dbf0c 100644
--- a/include/asm-mips64/processor.h
+++ b/include/asm-mips64/processor.h
@@ -12,6 +12,8 @@
#ifndef _ASM_PROCESSOR_H
#define _ASM_PROCESSOR_H
+#include <linux/config.h>
+
/*
* Default implementation of macro that returns current
* instruction pointer ("program counter").
@@ -19,7 +21,6 @@
#define current_text_addr() ({ __label__ _l; _l: &&_l;})
#if !defined (_LANGUAGE_ASSEMBLY)
-#include <linux/config.h>
#include <asm/cachectl.h>
#include <asm/mipsregs.h>
#include <asm/reg.h>
@@ -60,7 +61,7 @@ extern char mips4_available; /* CPU has MIPS IV ISA or better */
extern unsigned int vced_count, vcei_count;
extern struct cpuinfo_mips cpu_data[];
-#ifdef __SMP__
+#ifdef CONFIG_SMP
#define current_cpu_data cpu_data[smp_processor_id()]
#else
#define current_cpu_data cpu_data[0]
diff --git a/include/asm-mips64/smp.h b/include/asm-mips64/smp.h
index 0370515a0..ed0420dd4 100644
--- a/include/asm-mips64/smp.h
+++ b/include/asm-mips64/smp.h
@@ -1,7 +1,9 @@
#ifndef __ASM_SMP_H
#define __ASM_SMP_H
-#ifdef __SMP__
+#include <linux/config.h>
+
+#ifdef CONFIG_SMP
#include <linux/threads.h>
#include <linux/irq.h>
diff --git a/include/asm-mips64/system.h b/include/asm-mips64/system.h
index e70c6141b..7f518a8b8 100644
--- a/include/asm-mips64/system.h
+++ b/include/asm-mips64/system.h
@@ -11,6 +11,8 @@
#ifndef _ASM_SYSTEM_H
#define _ASM_SYSTEM_H
+#include <linux/config.h>
+
#include <asm/sgidefs.h>
#include <linux/kernel.h>
@@ -105,7 +107,7 @@ __restore_flags(int flags)
: "$8", "$9", "memory");
}
-#ifdef __SMP__
+#ifdef CONFIG_SMP
extern void __global_cli(void);
extern void __global_sti(void);
@@ -125,7 +127,7 @@ extern void __global_restore_flags(unsigned long);
#define restore_flags(x) __restore_flags(x)
#define save_and_cli(x) __save_and_cli(x)
-#endif /* __SMP__ */
+#endif /* CONFIG_SMP */
/* For spinlocks etc */
#define local_irq_save(x) __save_and_cli(x);