Patchwork [06/13] Revert "UBUNTU: SAUCE: Fix MODULE_IMPORT/MODULE_EXPORT"

login
register
mail settings
Submitter Leann Ogasawara
Date May 21, 2010, 11:17 p.m.
Message ID <1274483878.19284.3331.camel@emiko>
Download mbox | patch
Permalink /patch/53221/
State Accepted
Delegated to: Leann Ogasawara
Headers show

Comments

Leann Ogasawara - May 21, 2010, 11:17 p.m.
>From d014edba67f05992abe33d821d98c27ffa5d6561 Mon Sep 17 00:00:00 2001
From: Leann Ogasawara <leann.ogasawara@canonical.com>
Date: Fri, 21 May 2010 15:01:45 -0700
Subject: [PATCH 06/13] Revert "UBUNTU: SAUCE: Fix MODULE_IMPORT/MODULE_EXPORT"

This reverts commit 1980cfad7f9cb0faf00a669096fd933db2837335.

There are no consumers of these macros in Maverick.  It was noted that
we side stepped the issue by building in the dependent service, e.g.
libphy.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
---
 include/linux/module.h |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

Patch

diff --git a/include/linux/module.h b/include/linux/module.h
index d76b5fc..a9158a6 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -732,8 +732,7 @@  static inline void module_bug_cleanup(struct module *mod) {}
  * and modprobe do the heavy lifting of loading the modules in the
  * correct dependency order.
  */
-#define MODULE_EXPORT(mod_name) int sym_link_##mod_name; EXPORT_SYMBOL(sym_link_##mod_name);
-#define MODULE_IMPORT(mod_name) extern int sym_link_##mod_name; int func_sym_link_##mod_name(void) {sym_link_##mod_name=1;}; EXPORT_SYMBOL(func_sym_link_##mod_name);
-
+#define MODULE_EXPORT(mod_name) int mod_name; EXPORT_SYMBOL(mod_name);
+#define MODULE_IMPORT(mod_name) extern int mod_name;
 
 #endif /* _LINUX_MODULE_H */