summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nios2sim-ng.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/nios2sim-ng.h b/nios2sim-ng.h
index 9be1d0d..40cb2dd 100644
--- a/nios2sim-ng.h
+++ b/nios2sim-ng.h
@@ -26,15 +26,17 @@ extern bool verbose;
do { if (verbose) fprintf(stdout, fmt, ##args); } while (0)
#ifdef DEBUG
# define dbg(fmt, args...) fprintf(stdout, fmt, ##args)
+# define trace(fmt, args...) dbg("%s: " fmt, __func__, ##args)
#else
# define dbg(fmt, args...)
+# define trace(fmt, args...)
#endif
static inline size_t size_scale(size_t size)
{
- if (size > 1024 * 1024)
+ if (size >= 1024 * 1024)
size /= 1024 * 1024;
- else if (size > 1024)
+ else if (size >= 1024)
size /= 1024;
return size;
@@ -44,9 +46,9 @@ static inline char *size_postfix(size_t size)
{
char *ret = "";
- if (size > 1024 * 1024)
+ if (size >= 1024 * 1024)
ret = "M";
- else if (size > 1024)
+ else if (size >= 1024)
ret = "K";
return ret;
RSP: 0018:ffff880212987b68 EFLAGS: 00010006 RAX: 0000000000020000 RBX: 0000002fbead7500 RCX: 0000000000000000 RDX: 0000000000000292 RSI: ffff880212987ba8 RDI: 0000002fbead7d08 RBP: ffff880212987b68 R08: 0000000000000246 R09: ffff880216e572a0 R10: ffffffff815fd677 R11: ffffea0008469580 R12: ffffffff8130966f R13: ffff880212987ba8 R14: 0000002fbead7d08 R15: ffff8800d8c6b830 FS: 00002b5e6c84e7c0(0000) GS:ffff880216e40000(0000) knlGS:0000000055731700 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000002fbead7d08 CR3: 000000021270f000 CR4: 00000000000006e0 Stack: ffff880212987b98 ffffffff81075f17 ffffffff8130966f 0000000000000009 0000000000000000 0000000000000000 ffff880212987bd0 ffffffff81075f7c 0000000000000292 ffff880212987c08 ffff8800d8c6b800 0000000000000026 Call Trace: [<ffffffff81075f17>] __lock_task_sighand+0x47/0x80 [<ffffffff8130966f>] ? apparmor_cred_prepare+0x2f/0x50 [<ffffffff81075f7c>] do_send_sig_info+0x2c/0x80 [<ffffffff81075fee>] send_sig_info+0x1e/0x30 [<ffffffff8130242d>] aa_audit+0x13d/0x190 [<ffffffff8130c1dc>] aa_audit_file+0xbc/0x130 [<ffffffff8130966f>] ? apparmor_cred_prepare+0x2f/0x50 [<ffffffff81304cc2>] aa_change_hat+0x202/0x530 [<ffffffff81308fc6>] aa_setprocattr_changehat+0x116/0x1d0 [<ffffffff8130a11d>] apparmor_setprocattr+0x25d/0x300 [<ffffffff812cee56>] security_setprocattr+0x16/0x20 [<ffffffff8121fc87>] proc_pid_attr_write+0x107/0x130 [<ffffffff811b7604>] vfs_write+0xb4/0x1f0 [<ffffffff811b8039>] SyS_write+0x49/0xa0 [<ffffffff8171a1bf>] tracesys+0xe1/0xe6 Signed-off-by: John Johansen <john.johansen@canonical.com> Acked-by: Seth Arnold <seth.arnold@canonical.com>
Diffstat (limited to 'security/apparmor')
-rw-r--r--security/apparmor/audit.c3
-rw-r--r--security/apparmor/file.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/security/apparmor/audit.c b/security/apparmor/audit.c