diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 19:25:53 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 19:25:53 +0000 |
| commit | 57445428488a2862840c4d7c96d7746c11031aaf (patch) | |
| tree | 60b88b3a21896a33ee4dccc727d88b745a9ff731 /include/asm-sparc | |
| parent | 2e837819b1563679b55363d469239fdf4f17fbbb (diff) | |
Merge with Linu 2.4.0-test6-pre6.
Diffstat (limited to 'include/asm-sparc')
| -rw-r--r-- | include/asm-sparc/highmem.h | 1 | ||||
| -rw-r--r-- | include/asm-sparc/irq.h | 2 | ||||
| -rw-r--r-- | include/asm-sparc/pgtable.h | 4 | ||||
| -rw-r--r-- | include/asm-sparc/softirq.h | 1 |
4 files changed, 3 insertions, 5 deletions
diff --git a/include/asm-sparc/highmem.h b/include/asm-sparc/highmem.h index ede2167e1..0724061e4 100644 --- a/include/asm-sparc/highmem.h +++ b/include/asm-sparc/highmem.h @@ -20,7 +20,6 @@ #ifdef __KERNEL__ -#include <linux/config.h> #include <linux/init.h> #include <linux/interrupt.h> #include <asm/vaddrs.h> diff --git a/include/asm-sparc/irq.h b/include/asm-sparc/irq.h index 4b6dd0dae..a58a80810 100644 --- a/include/asm-sparc/irq.h +++ b/include/asm-sparc/irq.h @@ -1,4 +1,4 @@ -/* $Id: irq.h,v 1.30 2000/06/30 10:18:39 davem Exp $ +/* $Id: irq.h,v 1.31 2000/08/05 10:48:41 davem Exp $ * irq.h: IRQ registers on the Sparc. * * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) diff --git a/include/asm-sparc/pgtable.h b/include/asm-sparc/pgtable.h index 53039cc9c..5e1dc8b63 100644 --- a/include/asm-sparc/pgtable.h +++ b/include/asm-sparc/pgtable.h @@ -1,4 +1,4 @@ -/* $Id: pgtable.h,v 1.97 2000/07/07 07:33:11 anton Exp $ */ +/* $Id: pgtable.h,v 1.99 2000/08/05 13:30:34 davem Exp $ */ #ifndef _SPARC_PGTABLE_H #define _SPARC_PGTABLE_H @@ -307,7 +307,7 @@ BTFIXUPDEF_CALL_CONST(pte_t, pte_mkyoung, pte_t) #define page_pte(page) page_pte_prot(page, __pgprot(0)) /* Permanent address of a page. */ -#define page_address(page) ({ if (!(page)->virtual) BUG(); (page)->virtual; }) +#define page_address(page) ((page)->virtual) #define pte_page(x) (mem_map+pte_pagenr(x)) /* diff --git a/include/asm-sparc/softirq.h b/include/asm-sparc/softirq.h index 100f25a22..92dde254b 100644 --- a/include/asm-sparc/softirq.h +++ b/include/asm-sparc/softirq.h @@ -7,7 +7,6 @@ #ifndef __SPARC_SOFTIRQ_H #define __SPARC_SOFTIRQ_H -#include <linux/config.h> #include <linux/threads.h> /* For NR_CPUS */ #include <asm/atomic.h> |