Commit c788b88c authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds

[PATCH] janitor: remove __SMP__

Three small 1-line patches to get rid of any remaining __SMP__
references in the 2.6 kernel. 

From: Ron Gage  <ron@rongage.org>
parent 03d4199e
...@@ -731,7 +731,7 @@ int a2232board_init(void) ...@@ -731,7 +731,7 @@ int a2232board_init(void)
volatile u_char *to; volatile u_char *to;
volatile struct a2232memory *mem; volatile struct a2232memory *mem;
#ifdef __SMP__ #ifdef CONFIG_SMP
return -ENODEV; /* This driver is not SMP aware. Is there an SMP ZorroII-bus-machine? */ return -ENODEV; /* This driver is not SMP aware. Is there an SMP ZorroII-bus-machine? */
#endif #endif
......
...@@ -93,7 +93,7 @@ typedef void (*__cleanup_module_func_t)(void); ...@@ -93,7 +93,7 @@ typedef void (*__cleanup_module_func_t)(void);
* Used prior to schedule_timeout calls.. * Used prior to schedule_timeout calls..
*/ */
#define __set_current_state(state_value) do { current->state = state_value; } while (0) #define __set_current_state(state_value) do { current->state = state_value; } while (0)
#ifdef __SMP__ #ifdef CONFIG_SMP
#define set_current_state(state_value) do { __set_current_state(state_value); mb(); } while (0) #define set_current_state(state_value) do { __set_current_state(state_value); mb(); } while (0)
#else #else
#define set_current_state(state_value) __set_current_state(state_value) #define set_current_state(state_value) __set_current_state(state_value)
......
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
#include <linux/module.h> #include <linux/module.h>
MODULE_AUTHOR ("3ware Inc."); MODULE_AUTHOR ("3ware Inc.");
#ifdef __SMP__ #ifdef CONFIG_SMP
MODULE_DESCRIPTION ("3ware Storage Controller Linux Driver (SMP)"); MODULE_DESCRIPTION ("3ware Storage Controller Linux Driver (SMP)");
#else #else
MODULE_DESCRIPTION ("3ware Storage Controller Linux Driver"); MODULE_DESCRIPTION ("3ware Storage Controller Linux Driver");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment