Context Navigation

← Previous Change
Next Change →

Changeset 76ca3f7 in mainline for kernel/arch/sparc64/src

Timestamp:

2010-03-23T20:49:54Z (16 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e417b96

Parents:

b48ebd19 (diff), 63f8966 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mailnline changes, revision 329

Location:

kernel/arch/sparc64/src

Files:

: 23 edited

console.c (modified) (2 diffs)
ddi/ddi.c (modified) (1 diff)
debug/stacktrace.c (modified) (1 diff)
drivers/fhc.c (modified) (1 diff)
drivers/kbd.c (modified) (1 diff)
drivers/pci.c (modified) (1 diff)
drivers/scr.c (modified) (1 diff)
drivers/sgcn.c (modified) (1 diff)
mm/sun4u/frame.c (modified) (1 diff)
mm/sun4u/tlb.c (modified) (1 diff)
mm/sun4u/tsb.c (modified) (1 diff)
mm/sun4v/frame.c (modified) (1 diff)
mm/sun4v/tlb.c (modified) (1 diff)
mm/sun4v/tsb.c (modified) (1 diff)
smp/sun4u/smp.c (modified) (1 diff)
smp/sun4v/smp.c (modified) (2 diffs)
sun4u/sparc64.c (modified) (1 diff)
sun4v/md.c (modified) (1 diff)
sun4v/sparc64.c (modified) (1 diff)
trap/interrupt.c (modified) (1 diff)
trap/sun4u/interrupt.c (modified) (1 diff)
trap/sun4v/interrupt.c (modified) (1 diff)
trap/trap.c (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

kernel/arch/sparc64/src/console.c

-              rb48ebd19
+              r76ca3f7
 #include <arch/console.h>
 #include <arch/types.h>
+#include <typedefs.h>
 #include <arch/drivers/scr.h>
 …
 #include <arch.h>
 #include <panic.h>
 #include <string.h>
+#include <str.h>
 #include <print.h>

kernel/arch/sparc64/src/ddi/ddi.c

rb48ebd19	r76ca3f7
35	35	#include <ddi/ddi.h>
36	36	#include <proc/task.h>
37		#include <~~arch/type~~s.h>
	37	#include <typedefs.h>
38	38
39	39	/** Enable I/O space range for task.

kernel/arch/sparc64/src/debug/stacktrace.c

rb48ebd19	r76ca3f7
35	35	#include <stacktrace.h>
36	36	#include <syscall/copy.h>
37		~~#include <arch/types.h>~~
38	37	#include <typedefs.h>
39	38

kernel/arch/sparc64/src/drivers/fhc.c

rb48ebd19	r76ca3f7
44	44	#include <mm/page.h>
45	45	#include <mm/slab.h>
46		#include <~~arch/type~~s.h>
	46	#include <typedefs.h>
47	47	#include <genarch/ofw/ofw_tree.h>
48	48	#include <genarch/ofw/fhc.h>

kernel/arch/sparc64/src/drivers/kbd.c

-              rb48ebd19
+              r76ca3f7
 #include <mm/page.h>
 #include <arch/mm/page.h>
 #include <arch/types.h>
+#include <typedefs.h>
 #include <align.h>
 #include <string.h>
+#include <str.h>
 #include <print.h>
 #include <sysinfo/sysinfo.h>

kernel/arch/sparc64/src/drivers/pci.c

-              rb48ebd19
+              r76ca3f7
 #include <mm/page.h>
 #include <mm/slab.h>
 #include <arch/types.h>
+#include <typedefs.h>
 #include <debug.h>
 #include <print.h>
 #include <string.h>
+#include <str.h>
 #include <arch/asm.h>
 #include <sysinfo/sysinfo.h>
 #define SABRE_INTERNAL_REG      0
 #define PSYCHO_INTERNAL_REG     2
+#define PSYCHO_INTERNAL_REG     2
 #define OBIO_IMR_BASE   0x200

kernel/arch/sparc64/src/drivers/scr.c

-              rb48ebd19
+              r76ca3f7
 #include <console/chardev.h>
 #include <console/console.h>
 #include <arch/types.h>
 #include <string.h>
+#include <typedefs.h>
+#include <str.h>
 #include <align.h>
 #include <print.h>

kernel/arch/sparc64/src/drivers/sgcn.c

rb48ebd19	r76ca3f7
40	40	#include <genarch/ofw/ofw_tree.h>
41	41	#include <debug.h>
42		#include <str~~ing~~.h>
	42	#include <str.h>
43	43	#include <print.h>
44	44	#include <mm/page.h>

kernel/arch/sparc64/src/mm/sun4u/frame.c

rb48ebd19	r76ca3f7
36	36	#include <mm/frame.h>
37	37	#include <arch/boot/boot.h>
38		#include <~~arch/type~~s.h>
	38	#include <typedefs.h>
39	39	#include <config.h>
40	40	#include <align.h>

kernel/arch/sparc64/src/mm/sun4u/tlb.c

rb48ebd19	r76ca3f7
44	44	#include <arch.h>
45	45	#include <print.h>
46		#include <~~arch/type~~s.h>
	46	#include <typedefs.h>
47	47	#include <config.h>
48	48	#include <arch/trap/trap.h>

kernel/arch/sparc64/src/mm/sun4u/tsb.c

rb48ebd19	r76ca3f7
38	38	#include <arch/barrier.h>
39	39	#include <mm/as.h>
40		#include <~~arch/type~~s.h>
	40	#include <typedefs.h>
41	41	#include <macros.h>
42	42	#include <debug.h>

kernel/arch/sparc64/src/mm/sun4v/frame.c

rb48ebd19	r76ca3f7
36	36	#include <mm/frame.h>
37	37	#include <arch/boot/boot.h>
38		#include <~~arch/type~~s.h>
	38	#include <typedefs.h>
39	39	#include <config.h>
40	40	#include <align.h>

kernel/arch/sparc64/src/mm/sun4v/tlb.c

rb48ebd19	r76ca3f7
46	46	#include <arch.h>
47	47	#include <print.h>
48		#include <~~arch/type~~s.h>
	48	#include <typedefs.h>
49	49	#include <config.h>
50	50	#include <arch/trap/trap.h>

kernel/arch/sparc64/src/mm/sun4v/tsb.c

rb48ebd19	r76ca3f7
40	40	#include <arch/barrier.h>
41	41	#include <mm/as.h>
42		#include <~~arch/type~~s.h>
	42	#include <typedefs.h>
43	43	#include <macros.h>
44	44	#include <debug.h>

kernel/arch/sparc64/src/smp/sun4u/smp.c

rb48ebd19	r76ca3f7
41	41	#include <config.h>
42	42	#include <macros.h>
43		#include <~~arch/type~~s.h>
	43	#include <typedefs.h>
44	44	#include <synch/synch.h>
45	45	#include <synch/waitq.h>

kernel/arch/sparc64/src/smp/sun4v/smp.c

-              rb48ebd19
+              r76ca3f7
 #include <macros.h>
 #include <func.h>
 #include <arch/types.h>
+#include <typedefs.h>
 #include <synch/synch.h>
 #include <synch/waitq.h>
 …
 #include <time/delay.h>
 #include <arch/smp/sun4v/smp.h>
 #include <string.h>
+#include <str.h>
 /** hypervisor code of the "running" state of the CPU */

kernel/arch/sparc64/src/sun4u/sparc64.c

rb48ebd19	r76ca3f7
48	48	#include <userspace.h>
49	49	#include <ddi/irq.h>
50		#include <str~~ing~~.h>
	50	#include <str.h>
51	51
52	52	bootinfo_t bootinfo;

kernel/arch/sparc64/src/sun4v/md.c

rb48ebd19	r76ca3f7
37	37	#include <func.h>
38	38	#include <print.h>
39		#include <str~~ing~~.h>
	39	#include <str.h>
40	40	#include <arch/sun4v/md.h>
41	41	#include <arch/sun4v/hypercall.h>

kernel/arch/sparc64/src/sun4v/sparc64.c

rb48ebd19	r76ca3f7
49	49	#include <userspace.h>
50	50	#include <ddi/irq.h>
51		#include <str~~ing~~.h>
	51	#include <str.h>
52	52	#include <arch/drivers/niagara.h>
53	53

kernel/arch/sparc64/src/trap/interrupt.c

rb48ebd19	r76ca3f7
39	39	#include <interrupt.h>
40	40	#include <ddi/irq.h>
41		#include <~~arch/type~~s.h>
	41	#include <typedefs.h>
42	42	#include <debug.h>
43	43	#include <arch/asm.h>

kernel/arch/sparc64/src/trap/sun4u/interrupt.c

rb48ebd19	r76ca3f7
38	38	#include <interrupt.h>
39	39	#include <ddi/irq.h>
40		#include <~~arch/type~~s.h>
	40	#include <typedefs.h>
41	41	#include <debug.h>
42	42	#include <arch/asm.h>

kernel/arch/sparc64/src/trap/sun4v/interrupt.c

rb48ebd19	r76ca3f7
38	38	#include <interrupt.h>
39	39	#include <ddi/irq.h>
40		#include <~~arch/type~~s.h>
	40	#include <typedefs.h>
41	41	#include <debug.h>
42	42	#include <arch/asm.h>

kernel/arch/sparc64/src/trap/trap.c

rb48ebd19	r76ca3f7
43	43	#include <memstr.h>
44	44	#include <debug.h>
45		#include <~~arch/type~~s.h>
	45	#include <typedefs.h>
46	46	#include <arch/drivers/tick.h>
47	47

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 76ca3f7 in mainline for kernel/arch/sparc64/src

Legend:

Download in other formats: