diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-03-16 14:48:12 -0700 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-03-16 14:48:12 -0700 |
| commit | d524cb7bd569bd8fcf136c7ee4b37a215ded71b5 (patch) | |
| tree | 0616ebb87bbc0c44e45aa7c92fe21c6709fa73bd /security | |
| parent | e7d7017fd16ef10545602f8d176aff52778ed0e3 (diff) | |
| parent | dbdafe5ccf02d6a59e412ac8314a030ec703e880 (diff) | |
| download | lwn-d524cb7bd569bd8fcf136c7ee4b37a215ded71b5.tar.gz lwn-d524cb7bd569bd8fcf136c7ee4b37a215ded71b5.zip | |
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.33.y
Conflicts:
Makefile
arch/x86/kernel/apic/io_apic.c
drivers/staging/mimio/mimio.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'security')
| -rw-r--r-- | security/selinux/ss/ebitmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/ss/ebitmap.c b/security/selinux/ss/ebitmap.c index 68c7348d1acc..04b6145d767f 100644 --- a/security/selinux/ss/ebitmap.c +++ b/security/selinux/ss/ebitmap.c @@ -128,7 +128,7 @@ int ebitmap_netlbl_export(struct ebitmap *ebmap, cmap_idx = delta / NETLBL_CATMAP_MAPSIZE; cmap_sft = delta % NETLBL_CATMAP_MAPSIZE; c_iter->bitmap[cmap_idx] - |= e_iter->maps[cmap_idx] << cmap_sft; + |= e_iter->maps[i] << cmap_sft; } e_iter = e_iter->next; } |