diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-07-26 20:40:47 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-07-26 20:40:47 +0200 |
| commit | a04fd1aa4f807e2f97632a46070306e1389264ed (patch) | |
| tree | fc2511add6defbbcb3f5285ef78fd0c34ccc5512 /crypto/userspace/ncr-limits.c | |
| parent | 16ace6317db2c47b36b08b0addfe91356151c08d (diff) | |
| parent | 935be4945512eb37461a226c51ede5e8b05cbe24 (diff) | |
| download | kernel-crypto-a04fd1aa4f807e2f97632a46070306e1389264ed.tar.gz kernel-crypto-a04fd1aa4f807e2f97632a46070306e1389264ed.tar.xz kernel-crypto-a04fd1aa4f807e2f97632a46070306e1389264ed.zip | |
Merge branch 'standalone-master' into standalone-rename
Conflicts:
crypto/userspace/ncr-data.c
crypto/userspace/ncr_int.h
examples/Makefile
examples/ncr.c
examples/pk.c
examples/speed.c
ncr-int.h
ncr_int.h
Diffstat (limited to 'crypto/userspace/ncr-limits.c')
| -rw-r--r-- | crypto/userspace/ncr-limits.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/crypto/userspace/ncr-limits.c b/crypto/userspace/ncr-limits.c index 746434c5d1b..7a98f3c4f38 100644 --- a/crypto/userspace/ncr-limits.c +++ b/crypto/userspace/ncr-limits.c @@ -29,17 +29,15 @@ #include <linux/file.h> #include <linux/cred.h> #include "ncr.h" -#include "ncr_int.h" +#include "ncr-int.h" /* arbitrary now */ static unsigned int max_per_user[] = { [LIMIT_TYPE_KEY] = 128, - [LIMIT_TYPE_DATA] = 128, }; static unsigned int max_per_process[] = { [LIMIT_TYPE_KEY] = 64, - [LIMIT_TYPE_DATA] = 64, }; struct limit_user_item_st { |