diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-10-18 00:32:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-10-18 00:32:32 -0700 |
| commit | 367c46394099d2cd79ef899bc85337d158dcb5b5 (patch) | |
| tree | e85b9bc5c784a582c2fff3f7a16f7f0015c8978c /security | |
| parent | a1bed4d5ff69bcf8fa484ad1ab5ba54a08b2593f (diff) | |
| parent | 3932252874162e2c7f7b87ba91f34155b67404a5 (diff) | |
Merge bk://linux-bt.bkbits.net/bt-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'security')
| -rw-r--r-- | security/capability.c | 6 | ||||
| -rw-r--r-- | security/dummy.c | 6 | ||||
| -rw-r--r-- | security/security.c | 12 |
3 files changed, 6 insertions, 18 deletions
diff --git a/security/capability.c b/security/capability.c index 6f9b25ba65bd..809fac9a470b 100644 --- a/security/capability.c +++ b/security/capability.c @@ -442,11 +442,6 @@ static void cap_file_free_security (struct file *file) return; } -static int cap_file_llseek (struct file *file) -{ - return 0; -} - static int cap_file_ioctl (struct file *file, unsigned int command, unsigned long arg) { @@ -787,7 +782,6 @@ static struct security_operations capability_ops = { .file_permission = cap_file_permission, .file_alloc_security = cap_file_alloc_security, .file_free_security = cap_file_free_security, - .file_llseek = cap_file_llseek, .file_ioctl = cap_file_ioctl, .file_mmap = cap_file_mmap, .file_mprotect = cap_file_mprotect, diff --git a/security/dummy.c b/security/dummy.c index 0b3ca57db95b..aa65562474eb 100644 --- a/security/dummy.c +++ b/security/dummy.c @@ -344,11 +344,6 @@ static void dummy_file_free_security (struct file *file) return; } -static int dummy_file_llseek (struct file *file) -{ - return 0; -} - static int dummy_file_ioctl (struct file *file, unsigned int command, unsigned long arg) { @@ -602,7 +597,6 @@ struct security_operations dummy_security_ops = { .file_permission = dummy_file_permission, .file_alloc_security = dummy_file_alloc_security, .file_free_security = dummy_file_free_security, - .file_llseek = dummy_file_llseek, .file_ioctl = dummy_file_ioctl, .file_mmap = dummy_file_mmap, .file_mprotect = dummy_file_mprotect, diff --git a/security/security.c b/security/security.c index 892208b20bc4..57746fb90878 100644 --- a/security/security.c +++ b/security/security.c @@ -241,9 +241,9 @@ asmlinkage long sys_security (unsigned int id, unsigned int call, return security_ops->sys_security (id, call, args); } -EXPORT_SYMBOL (register_security); -EXPORT_SYMBOL (unregister_security); -EXPORT_SYMBOL (mod_reg_security); -EXPORT_SYMBOL (mod_unreg_security); -EXPORT_SYMBOL (capable); -EXPORT_SYMBOL (security_ops); +EXPORT_SYMBOL_GPL(register_security); +EXPORT_SYMBOL_GPL(unregister_security); +EXPORT_SYMBOL_GPL(mod_reg_security); +EXPORT_SYMBOL_GPL(mod_unreg_security); +EXPORT_SYMBOL(capable); +EXPORT_SYMBOL(security_ops); |