From ecb96aba2d50114ec70e57d2e05811b9402df77a Mon Sep 17 00:00:00 2001
From: Peter Chubb <peterc@gelato.unsw.edu.au>
Date: Fri, 10 Aug 2007 13:01:10 -0700
Subject: [PATCH] --- yaml --- r: 63869 b: refs/heads/master c:
 cd5bfea278987ebfe60f3ff92a01696b17c4f978 h: refs/heads/master i:   63867:
 d50879ab5251dc196a3558cf576d8372ad83b5d4 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/acpi/resources/rsxface.c | 2 --
 trunk/kernel/kprobes.c                 | 5 +++++
 trunk/kernel/profile.c                 | 4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d5ee683ee184..231e0c01e755 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ddfca9548d8ecc26096a30667423ba919109533
+refs/heads/master: cd5bfea278987ebfe60f3ff92a01696b17c4f978
diff --git a/trunk/drivers/acpi/resources/rsxface.c b/trunk/drivers/acpi/resources/rsxface.c
index f63813a358c5..4c3fd4cdaf73 100644
--- a/trunk/drivers/acpi/resources/rsxface.c
+++ b/trunk/drivers/acpi/resources/rsxface.c
@@ -474,8 +474,6 @@ acpi_rs_match_vendor_resource(struct acpi_resource *resource, void *context)
 	return (AE_CTRL_TERMINATE);
 }
 
-ACPI_EXPORT_SYMBOL(acpi_rs_match_vendor_resource)
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_walk_resources
diff --git a/trunk/kernel/kprobes.c b/trunk/kernel/kprobes.c
index 3e9f513a728d..4b8a4493c541 100644
--- a/trunk/kernel/kprobes.c
+++ b/trunk/kernel/kprobes.c
@@ -1063,6 +1063,11 @@ EXPORT_SYMBOL_GPL(register_kprobe);
 EXPORT_SYMBOL_GPL(unregister_kprobe);
 EXPORT_SYMBOL_GPL(register_jprobe);
 EXPORT_SYMBOL_GPL(unregister_jprobe);
+#ifdef CONFIG_KPROBES
 EXPORT_SYMBOL_GPL(jprobe_return);
+#endif
+
+#ifdef CONFIG_KPROBES
 EXPORT_SYMBOL_GPL(register_kretprobe);
 EXPORT_SYMBOL_GPL(unregister_kretprobe);
+#endif
diff --git a/trunk/kernel/profile.c b/trunk/kernel/profile.c
index 5b20fe977bed..cb1e37d2dac3 100644
--- a/trunk/kernel/profile.c
+++ b/trunk/kernel/profile.c
@@ -199,11 +199,11 @@ EXPORT_SYMBOL_GPL(register_timer_hook);
 EXPORT_SYMBOL_GPL(unregister_timer_hook);
 EXPORT_SYMBOL_GPL(task_handoff_register);
 EXPORT_SYMBOL_GPL(task_handoff_unregister);
+EXPORT_SYMBOL_GPL(profile_event_register);
+EXPORT_SYMBOL_GPL(profile_event_unregister);
 
 #endif /* CONFIG_PROFILING */
 
-EXPORT_SYMBOL_GPL(profile_event_register);
-EXPORT_SYMBOL_GPL(profile_event_unregister);
 
 #ifdef CONFIG_SMP
 /*