Message ID | 20200405213357.b6ce1024b276.I7c370e20580d3122c58df5727ee2d6fb53545576@changeid |
---|---|
State | Not Applicable |
Headers | show |
Series | arch: um: fix xor.h include | expand |
On Sun, Apr 5, 2020 at 12:34 PM Johannes Berg <johannes@sipsolutions.net> wrote: > > From: Johannes Berg <johannes.berg@intel.com> > > Two independent changes here ended up going into the tree > one after another, without a necessary rename, fix that. > > Reported-by: Thomas Meyer <thomas@m3y3r.de> > Fixes: f185063bff91 ("um: Move timer-internal.h to non-shared") > Signed-off-by: Johannes Berg <johannes.berg@intel.com> Reviewed-by: Brendan Higgins <brendanhiggins@google.com> Seems pretty straightforward to me.
On Mon, Apr 6, 2020 at 7:38 PM Brendan Higgins <brendanhiggins@google.com> wrote: > > On Sun, Apr 5, 2020 at 12:34 PM Johannes Berg <johannes@sipsolutions.net> wrote: > > > > From: Johannes Berg <johannes.berg@intel.com> > > > > Two independent changes here ended up going into the tree > > one after another, without a necessary rename, fix that. > > > > Reported-by: Thomas Meyer <thomas@m3y3r.de> > > Fixes: f185063bff91 ("um: Move timer-internal.h to non-shared") > > Signed-off-by: Johannes Berg <johannes.berg@intel.com> > > Reviewed-by: Brendan Higgins <brendanhiggins@google.com> Applied, thanks!
diff --git a/arch/um/include/asm/xor.h b/arch/um/include/asm/xor.h index 7a3208c47cfc..36b33d62a35d 100644 --- a/arch/um/include/asm/xor.h +++ b/arch/um/include/asm/xor.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ #include <asm-generic/xor.h> -#include <shared/timer-internal.h> +#include <linux/time-internal.h> /* pick an arbitrary one - measuring isn't possible with inf-cpu */ #define XOR_SELECT_TEMPLATE(x) \