From 4774673d8d9343e2b261ab1ba7c52a4c9c80cd47 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Tue, 6 Nov 2012 15:49:27 -0500 Subject: [PATCH] --- yaml --- r: 335551 b: refs/heads/master c: 6bf926ddd44ddc67edbeb28d4069f207f2c6e07e h: refs/heads/master i: 335549: c5fcb5361d04f4a3e4163bfc2f14c43975fe8f86 335547: 021f687bb728b991df6444093876195e79f1f9cb 335543: bfb6c68392d692175912033ddb6b5fa8642e41e4 335535: 45fe6513d74a92bf9a2c6e389c1ffa72151f9e2a 335519: d86c691e081efd63e4c4951993b07714efe39465 335487: 4144d20f8802cf70dbb846e8ae05580e5969f385 v: v3 --- [refs] | 2 +- trunk/drivers/xen/Makefile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 440f22108fd4..eef5e778e497 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 772aebcefeff310f80e32b874988af0076cb799d +refs/heads/master: 6bf926ddd44ddc67edbeb28d4069f207f2c6e07e diff --git a/trunk/drivers/xen/Makefile b/trunk/drivers/xen/Makefile index 46de6cdfccb3..74354708c6c4 100644 --- a/trunk/drivers/xen/Makefile +++ b/trunk/drivers/xen/Makefile @@ -2,7 +2,8 @@ ifneq ($(CONFIG_ARM),y) obj-y += manage.o balloon.o obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o endif -obj-y += grant-table.o features.o events.o fallback.o +obj-$(CONFIG_X86) += fallback.o +obj-y += grant-table.o features.o events.o obj-y += xenbus/ nostackp := $(call cc-option, -fno-stack-protector)