diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2013-01-10 16:21:07 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2013-01-10 16:21:07 -0500 |
| commit | 8d00682ce5ddaedfb62287773d21c727f08fda69 (patch) | |
| tree | 61a4b7bac5960c6f0ab25fe087404e9ca1725e05 /include/litmus/fpmath.h | |
| parent | fdf0a6b73001976c5d02d631ebdd0927819d7c91 (diff) | |
| parent | 1235a665a5e00dc762e6646c01381b3ed5019d86 (diff) | |
Merge branch 'wip-gpu-cleanup' into wip-2012.3-gpu
Conflicts:
include/litmus/fpmath.h
include/litmus/litmus.h
include/litmus/rt_param.h
include/litmus/trace.h
kernel/sched.c
kernel/softirq.c
litmus/edf_common.c
litmus/jobs.c
litmus/litmus.c
litmus/locking.c
litmus/preempt.c
litmus/sched_cedf.c
litmus/sched_gsn_edf.c
litmus/sched_litmus.c
litmus/sync.c
Diffstat (limited to 'include/litmus/fpmath.h')
| -rw-r--r-- | include/litmus/fpmath.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/litmus/fpmath.h b/include/litmus/fpmath.h index 642de98542c8..3d545fd2f5c5 100644 --- a/include/litmus/fpmath.h +++ b/include/litmus/fpmath.h | |||
| @@ -1,11 +1,12 @@ | |||
| 1 | #ifndef __FP_MATH_H__ | 1 | #ifndef __FP_MATH_H__ |
| 2 | #define __FP_MATH_H__ | 2 | #define __FP_MATH_H__ |
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | ||
| 4 | #include <linux/math64.h> | 5 | #include <linux/math64.h> |
| 5 | 6 | #else | |
| 6 | #ifndef __KERNEL__ | ||
| 7 | #include <stdint.h> | 7 | #include <stdint.h> |
| 8 | #define abs(x) (((x) < 0) ? -(x) : x) | 8 | #define abs(x) (((x) < 0) ? -(x) : x) |
| 9 | #define div64_s64(a, b) (a)/(b) | ||
| 9 | #endif | 10 | #endif |
| 10 | 11 | ||
| 11 | // Use 64-bit because we want to track things at the nanosecond scale. | 12 | // Use 64-bit because we want to track things at the nanosecond scale. |