summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-29 16:18:20 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-29 16:18:20 (GMT)
commit9532faeb293f5a5f0ff06f567de14e557698dbde (patch)
tree46319ff2506340b56b34801e3a722bbaf28d55bf /include/linux
parentadd810a1c58ba9edb6076ababe5861f36c049217 (diff)
parent3c7d76e371ac1a3802ae1673f5c63554af59325c (diff)
downloadlinux-fsl-qoriq-9532faeb293f5a5f0ff06f567de14e557698dbde.tar.xz
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 6547c3c..82a9124 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 {