projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull video into test branch
[linux-drm-fsl-dcu.git]
/
arch
/
i386
/
kernel
/
Makefile
diff --git
a/arch/i386/kernel/Makefile
b/arch/i386/kernel/Makefile
index 5427a842e841d90ee09e77628cce1abb3d402ea8..1e8988e558c54971fe08fbe9f868a72c7126a924 100644
(file)
--- a/
arch/i386/kernel/Makefile
+++ b/
arch/i386/kernel/Makefile
@@
-4,9
+4,9
@@
extra-y := head.o init_task.o vmlinux.lds
extra-y := head.o init_task.o vmlinux.lds
-obj-y := process.o s
emaphore.o s
ignal.o entry.o traps.o irq.o \
+obj-y := process.o signal.o entry.o traps.o irq.o \
ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_i386.o \
ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_i386.o \
- pci-dma.o i386_ksyms.o i387.o bootflag.o \
+ pci-dma.o i386_ksyms.o i387.o bootflag.o
e820.o
\
quirks.o i8237.o topology.o alternative.o i8253.o tsc.o
obj-$(CONFIG_STACKTRACE) += stacktrace.o
quirks.o i8237.o topology.o alternative.o i8253.o tsc.o
obj-$(CONFIG_STACKTRACE) += stacktrace.o
@@
-40,6
+40,9
@@
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
obj-$(CONFIG_HPET_TIMER) += hpet.o
obj-$(CONFIG_K8_NB) += k8.o
obj-$(CONFIG_HPET_TIMER) += hpet.o
obj-$(CONFIG_K8_NB) += k8.o
+# Make sure this is linked after any other paravirt_ops structs: see head.S
+obj-$(CONFIG_PARAVIRT) += paravirt.o
+
EXTRA_AFLAGS := -traditional
obj-$(CONFIG_SCx200) += scx200.o
EXTRA_AFLAGS := -traditional
obj-$(CONFIG_SCx200) += scx200.o
@@
-81,4
+84,5
@@
$(obj)/vsyscall-syms.o: $(src)/vsyscall.lds \
$(call if_changed,syscall)
k8-y += ../../x86_64/kernel/k8.o
$(call if_changed,syscall)
k8-y += ../../x86_64/kernel/k8.o
+stacktrace-y += ../../x86_64/kernel/stacktrace.o