summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds2009-10-29 17:18:20 +0100
committerLinus Torvalds2009-10-29 17:18:20 +0100
commit9532faeb293f5a5f0ff06f567de14e557698dbde (patch)
tree46319ff2506340b56b34801e3a722bbaf28d55bf /include/linux
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus (diff)
parentparam: fix setting arrays of bool (diff)
downloadkernel-qcow2-linux-9532faeb293f5a5f0ff06f567de14e557698dbde.tar.gz
kernel-qcow2-linux-9532faeb293f5a5f0ff06f567de14e557698dbde.tar.xz
kernel-qcow2-linux-9532faeb293f5a5f0ff06f567de14e557698dbde.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-param-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-param-fixes: param: fix setting arrays of bool param: fix NULL comparison on oom param: fix lots of bugs with writing charp params from sysfs, by leaking mem.
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/moduleparam.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
index 6547c3cdbc4c..82a9124f7d75 100644
--- a/include/linux/moduleparam.h
+++ b/include/linux/moduleparam.h
@@ -37,7 +37,6 @@ typedef int (*param_set_fn)(const char *val, struct kernel_param *kp);
typedef int (*param_get_fn)(char *buffer, struct kernel_param *kp);
/* Flag bits for kernel_param.flags */
-#define KPARAM_KMALLOCED 1
#define KPARAM_ISBOOL 2
struct kernel_param {