Changeset aa85487 in mainline for kernel/arch/sparc64/Makefile.inc

Timestamp:

2010-03-07T15:11:56Z (14 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

aadf01e

Parents:

2e99277 (diff), 137691a (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 mainline changes, revision 308

File:

• kernel/arch/sparc64/Makefile.inc (modified) (3 diffs)

kernel/arch/sparc64/Makefile.inc

@@ -75 +75 @@
         arch/$(KARCH)/src/dummy.s \
         arch/$(KARCH)/src/mm/$(USARCH)/as.c \
-        arch/$(KARCH)/src/mm/cache.S \
         arch/$(KARCH)/src/mm/$(USARCH)/frame.c \
         arch/$(KARCH)/src/mm/page.c \
@@ -93 +92 @@
         arch/$(KARCH)/src/drivers/sgcn.c \
         arch/$(KARCH)/src/drivers/pci.c \
-        arch/$(KARCH)/src/drivers/fhc.c
+        arch/$(KARCH)/src/drivers/fhc.c \
+        arch/$(KARCH)/src/trap/$(USARCH)/interrupt.c
+
+ifeq ($(USARCH),sun4u)
+        ARCH_SOURCES += \
+                arch/$(KARCH)/src/mm/cache.S
+endif
 
 ifeq ($(USARCH),sun4v)
@@ -108 +113 @@
 ifeq ($(CONFIG_SMP),y)
         ARCH_SOURCES += \
-                arch/$(KARCH)/src/smp/ipi.c \
-                arch/$(KARCH)/src/smp/smp.c
+                arch/$(KARCH)/src/smp/$(USARCH)/smp.c \
+                arch/$(KARCH)/src/smp/$(USARCH)/ipi.c
 endif