From 42421fb911d01004e7e87c261e5b632f205e8d98 Mon Sep 17 00:00:00 2001 From: Sebastian Ott Date: Sat, 26 Jan 2008 14:10:36 +0100 Subject: [PATCH] --- yaml --- r: 77171 b: refs/heads/master c: 661ca0da3e1fa60c9e56f995fd83772ffa9ffe90 h: refs/heads/master i: 77169: 0493ba47f3ff09b64dde6822ec249f46538f7b8d 77167: 3a7abd0bdf7ea1edb23d47bb617265767723289e v: v3 --- [refs] | 2 +- trunk/Documentation/kernel-parameters.txt | 8 ++++++-- trunk/security/selinux/ss/services.c | 3 --- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 167bcf9b53d2..efdc901d6ea7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 69e4d4c3e1cb23fce81deeae08b502d27bad6993 +refs/heads/master: 661ca0da3e1fa60c9e56f995fd83772ffa9ffe90 diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index 65de5ba7b74c..d29b6d926a42 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -370,8 +370,6 @@ and is between 256 and 4096 characters. It is defined in the file configured. Potentially dangerous and should only be used if you are entirely sure of the consequences. - chandev= [HW,NET] Generic channel device initialisation - checkreqprot [SELINUX] Set initial checkreqprot flag value. Format: { "0" | "1" } See security/selinux/Kconfig help text. @@ -382,6 +380,12 @@ and is between 256 and 4096 characters. It is defined in the file Value can be changed at runtime via /selinux/checkreqprot. + cio_ignore= [S390] + See Documentation/s390/CommonIO for details. + + cio_msg= [S390] + See Documentation/s390/CommonIO for details. + clock= [BUGS=X86-32, HW] gettimeofday clocksource override. [Deprecated] Forces specified clocksource (if available) to be used diff --git a/trunk/security/selinux/ss/services.c b/trunk/security/selinux/ss/services.c index 4bf715d4cf29..f83b19daed16 100644 --- a/trunk/security/selinux/ss/services.c +++ b/trunk/security/selinux/ss/services.c @@ -1744,9 +1744,6 @@ int security_genfs_sid(const char *fstype, struct ocontext *c; int rc = 0, cmp = 0; - while (path[0] == '/' && path[1] == '/') - path++; - POLICY_RDLOCK; for (genfs = policydb.genfs; genfs; genfs = genfs->next) {