diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-30 00:30:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-30 00:30:18 -0400 |
| commit | abdba717253382a669af9c719313ec602cc95a2d (patch) | |
| tree | 9368199c0812569f796a6e9d6c3696c2e428f0cf /include | |
| parent | 2d408b42ed0a287c64a94b48e24c6bfa95035019 (diff) | |
| parent | 9f462a1a5de06503fd247186b91d4205ac1cf1ba (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Add linux/pagemap.h to asm/tlb.h
[SPARC64]: Need to set state to IDLE during sun4v IRQ enable.
[SPARC64]: Fix VIRQ enabling.
[SPARC64]: Add irqs to mdesc_node.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc64/mdesc.h | 1 | ||||
| -rw-r--r-- | include/asm-sparc64/tlb.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-sparc64/mdesc.h b/include/asm-sparc64/mdesc.h index 124eb8ca2378..c6383982b53d 100644 --- a/include/asm-sparc64/mdesc.h +++ b/include/asm-sparc64/mdesc.h | |||
| @@ -15,6 +15,7 @@ struct mdesc_node { | |||
| 15 | u64 node; | 15 | u64 node; |
| 16 | unsigned int unique_id; | 16 | unsigned int unique_id; |
| 17 | unsigned int num_arcs; | 17 | unsigned int num_arcs; |
| 18 | unsigned int irqs[2]; | ||
| 18 | struct property *properties; | 19 | struct property *properties; |
| 19 | struct mdesc_node *hash_next; | 20 | struct mdesc_node *hash_next; |
| 20 | struct mdesc_node *allnodes_next; | 21 | struct mdesc_node *allnodes_next; |
diff --git a/include/asm-sparc64/tlb.h b/include/asm-sparc64/tlb.h index 7af1e1109c49..349d1d3e9c27 100644 --- a/include/asm-sparc64/tlb.h +++ b/include/asm-sparc64/tlb.h | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | #define _SPARC64_TLB_H | 2 | #define _SPARC64_TLB_H |
| 3 | 3 | ||
| 4 | #include <linux/swap.h> | 4 | #include <linux/swap.h> |
| 5 | #include <linux/pagemap.h> | ||
| 5 | #include <asm/pgalloc.h> | 6 | #include <asm/pgalloc.h> |
| 6 | #include <asm/tlbflush.h> | 7 | #include <asm/tlbflush.h> |
| 7 | #include <asm/mmu_context.h> | 8 | #include <asm/mmu_context.h> |