| Serge Bazanski | bb7db92 | 2020-04-30 12:43:10 +0200 | [diff] [blame^] | 1 | Copyright 2020 The Monogon Project Authors. |
| 2 | |
| 3 | Licensed under the Apache License, Version 2.0 (the "License"); |
| 4 | you may not use this file except in compliance with the License. |
| 5 | You may obtain a copy of the License at |
| 6 | |
| 7 | http://www.apache.org/licenses/LICENSE-2.0 |
| 8 | |
| 9 | Unless required by applicable law or agreed to in writing, software |
| 10 | distributed under the License is distributed on an "AS IS" BASIS, |
| 11 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 12 | See the License for the specific language governing permissions and |
| 13 | limitations under the License. |
| 14 | |
| 15 | |
| 16 | From 69b2c3b6e2594a3f28e4ea1141bef542456b3eb2 Mon Sep 17 00:00:00 2001 |
| 17 | From: Lorenz Brun <lorenz@brun.one> |
| 18 | Date: Wed, 5 Feb 2020 17:14:19 +0100 |
| 19 | Subject: [PATCH] Fix vdso include that breaks in an external |
| 20 | |
| 21 | --- |
| 22 | vdso/cycle_clock.h | 2 +- |
| 23 | vdso/seqlock.h | 4 ++-- |
| 24 | vdso/vdso.cc | 4 ++-- |
| 25 | vdso/vdso_time.cc | 8 ++++---- |
| 26 | 4 files changed, 9 insertions(+), 9 deletions(-) |
| 27 | |
| 28 | diff --git a/vdso/cycle_clock.h b/vdso/cycle_clock.h |
| 29 | index 5d3fbb25..fe15812c 100644 |
| 30 | --- a/vdso/cycle_clock.h |
| 31 | +++ b/vdso/cycle_clock.h |
| 32 | @@ -17,7 +17,7 @@ |
| 33 | |
| 34 | #include <stdint.h> |
| 35 | |
| 36 | -#include "vdso/barrier.h" |
| 37 | +#include "barrier.h" |
| 38 | |
| 39 | namespace vdso { |
| 40 | |
| 41 | diff --git a/vdso/seqlock.h b/vdso/seqlock.h |
| 42 | index 7a173174..fff99748 100644 |
| 43 | --- a/vdso/seqlock.h |
| 44 | +++ b/vdso/seqlock.h |
| 45 | @@ -18,8 +18,8 @@ |
| 46 | |
| 47 | #include <stdint.h> |
| 48 | |
| 49 | -#include "vdso/barrier.h" |
| 50 | -#include "vdso/compiler.h" |
| 51 | +#include "barrier.h" |
| 52 | +#include "compiler.h" |
| 53 | |
| 54 | namespace vdso { |
| 55 | |
| 56 | diff --git a/vdso/vdso.cc b/vdso/vdso.cc |
| 57 | index 8bb80a7a..210d31ff 100644 |
| 58 | --- a/vdso/vdso.cc |
| 59 | +++ b/vdso/vdso.cc |
| 60 | @@ -19,8 +19,8 @@ |
| 61 | #include <sys/time.h> |
| 62 | #include <time.h> |
| 63 | |
| 64 | -#include "vdso/syscalls.h" |
| 65 | -#include "vdso/vdso_time.h" |
| 66 | +#include "syscalls.h" |
| 67 | +#include "vdso_time.h" |
| 68 | |
| 69 | namespace vdso { |
| 70 | namespace { |
| 71 | diff --git a/vdso/vdso_time.cc b/vdso/vdso_time.cc |
| 72 | index 1bb4bb86..fb5b281f 100644 |
| 73 | --- a/vdso/vdso_time.cc |
| 74 | +++ b/vdso/vdso_time.cc |
| 75 | @@ -12,15 +12,15 @@ |
| 76 | // See the License for the specific language governing permissions and |
| 77 | // limitations under the License. |
| 78 | |
| 79 | -#include "vdso/vdso_time.h" |
| 80 | +#include "vdso_time.h" |
| 81 | |
| 82 | #include <stdint.h> |
| 83 | #include <sys/time.h> |
| 84 | #include <time.h> |
| 85 | |
| 86 | -#include "vdso/cycle_clock.h" |
| 87 | -#include "vdso/seqlock.h" |
| 88 | -#include "vdso/syscalls.h" |
| 89 | +#include "cycle_clock.h" |
| 90 | +#include "seqlock.h" |
| 91 | +#include "syscalls.h" |
| 92 | |
| 93 | // struct params defines the layout of the parameter page maintained by the |
| 94 | // kernel (i.e., sentry). |
| 95 | -- |
| 96 | 2.20.1 |
| 97 | |