diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/x86/vdso/vvar.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/x86/vdso/vvar.c')
| -rw-r--r-- | arch/x86/vdso/vvar.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/x86/vdso/vvar.c b/arch/x86/vdso/vvar.c deleted file mode 100644 index 1b7e703684f9..000000000000 --- a/arch/x86/vdso/vvar.c +++ /dev/null | |||
| @@ -1,12 +0,0 @@ | |||
| 1 | /* Define pointer to external vDSO variables. | ||
| 2 | These are part of the vDSO. The kernel fills in the real addresses | ||
| 3 | at boot time. This is done because when the vdso is linked the | ||
| 4 | kernel isn't yet and we don't know the final addresses. */ | ||
| 5 | #include <linux/kernel.h> | ||
| 6 | #include <linux/time.h> | ||
| 7 | #include <asm/vsyscall.h> | ||
| 8 | #include <asm/timex.h> | ||
| 9 | #include <asm/vgtod.h> | ||
| 10 | |||
| 11 | #define VEXTERN(x) typeof (__ ## x) *const vdso_ ## x = (void *)VMAGIC; | ||
| 12 | #include "vextern.h" | ||