mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6: (43 commits) security/tomoyo: Remove now unnecessary handling of security_sysctl. security/tomoyo: Add a special case to handle accesses through the internal proc mount. sysctl: Drop & in front of every proc_handler. sysctl: Remove CTL_NONE and CTL_UNNUMBERED sysctl: kill dead ctl_handler definitions. sysctl: Remove the last of the generic binary sysctl support sysctl net: Remove unused binary sysctl code sysctl security/tomoyo: Don't look at ctl_name sysctl arm: Remove binary sysctl support sysctl x86: Remove dead binary sysctl support sysctl sh: Remove dead binary sysctl support sysctl powerpc: Remove dead binary sysctl support sysctl ia64: Remove dead binary sysctl support sysctl s390: Remove dead sysctl binary support sysctl frv: Remove dead binary sysctl support sysctl mips/lasat: Remove dead binary sysctl support sysctl drivers: Remove dead binary sysctl support sysctl crypto: Remove dead binary sysctl support sysctl security/keys: Remove dead binary sysctl support sysctl kernel: Remove binary sysctl logic ...
This commit is contained in:
commit
1557d33007
135 changed files with 2183 additions and 4748 deletions
|
|
@ -48,7 +48,7 @@ out:
|
|||
static struct ctl_table *find_in_table(struct ctl_table *p, struct qstr *name)
|
||||
{
|
||||
int len;
|
||||
for ( ; p->ctl_name || p->procname; p++) {
|
||||
for ( ; p->procname; p++) {
|
||||
|
||||
if (!p->procname)
|
||||
continue;
|
||||
|
|
@ -218,7 +218,7 @@ static int scan(struct ctl_table_header *head, ctl_table *table,
|
|||
void *dirent, filldir_t filldir)
|
||||
{
|
||||
|
||||
for (; table->ctl_name || table->procname; table++, (*pos)++) {
|
||||
for (; table->procname; table++, (*pos)++) {
|
||||
int res;
|
||||
|
||||
/* Can't do anything without a proc name */
|
||||
|
|
|
|||
Loading…
Reference in a new issue