diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-05-23 21:27:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-05-23 21:27:03 -0700 |
| commit | 5d652eb5c57cc529e88770d667f1c4630a305220 (patch) | |
| tree | 7ef5ae0b6a2044561ec492fe7e719d63399dfc54 /include | |
| parent | 134133793eb9cac88652c41da00faa460b90df74 (diff) | |
| parent | 208bc4952676a841f248eacf03fc7a27dfdcd55f (diff) | |
Merge penguin:v2.5/linux
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-i386/tlb.h | 4 | ||||
| -rw-r--r-- | include/asm-sparc64/tlb.h | 8 | ||||
| -rw-r--r-- | include/linux/buffer_head.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/include/asm-i386/tlb.h b/include/asm-i386/tlb.h index b91e6abd1fd4..844c3d4c9aaa 100644 --- a/include/asm-i386/tlb.h +++ b/include/asm-i386/tlb.h @@ -5,8 +5,8 @@ * x86 doesn't need any special per-pte or * per-vma handling.. */ -#define tlb_start_vma(tlb, vma, start, end) do { } while (0) -#define tlb_end_vma(tlb, vma, start, end) do { } while (0) +#define tlb_start_vma(tlb, vma) do { } while (0) +#define tlb_end_vma(tlb, vma) do { } while (0) #define tlb_remove_tlb_entry(tlb, pte, address) do { } while (0) /* diff --git a/include/asm-sparc64/tlb.h b/include/asm-sparc64/tlb.h index f0e011119b40..ebc228702646 100644 --- a/include/asm-sparc64/tlb.h +++ b/include/asm-sparc64/tlb.h @@ -3,10 +3,10 @@ #define tlb_flush(tlb) flush_tlb_mm((tlb)->mm) -#define tlb_start_vma(tlb, vma, start, end) \ - flush_cache_range(vma, start, end) -#define tlb_end_vma(tlb, vma, start, end) \ - flush_tlb_range(vma, start, end) +#define tlb_start_vma(tlb, vma) \ + flush_cache_range(vma, vma->vm_start, vma->vm_end) +#define tlb_end_vma(tlb, vma) \ + flush_tlb_range(vma, vma->vm_start, vma->vm_end) #define tlb_remove_tlb_entry(tlb, pte, address) do { } while (0) diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index 1a542191bbd2..b52eb321e898 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h @@ -9,9 +9,9 @@ #include <linux/types.h> #include <linux/fs.h> +#include <linux/linkage.h> #include <asm/atomic.h> - enum bh_state_bits { BH_Uptodate, /* Contains valid data */ BH_Dirty, /* Is dirty */ |