mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-04-03 12:05:13 +02:00
6aac2c5476
This reverts commitda780c4a07which is commit887c5c12e8upstream. Reason being that the patch depends on at least commit0b8b2668f9("um: insert scheduler ticks when userspace does not yield") in order to build. Otherwise it fails with: | /usr/bin/ld: arch/um/kernel/skas/syscall.o: in function `handle_syscall': | linux-6.12.27/arch/um/kernel/skas/syscall.c:43:(.text+0xa2): undefined | reference to `tt_extra_sched_jiffies' | collect2: error: ld returned 1 exit status The author Benjamin Berg commented: "I think it is better to just not backport commit0b8b2668f9("um: insert scheduler ticks when userspace does not yield")" Link: https://lore.kernel.org/linux-um/8ce0b6056a9726e540f61bce77311278654219eb.camel@sipsolutions.net/ Cc: <stable@vger.kernel.org> # 6.12.y Cc: Benjamin Berg <benjamin.berg@intel.com> Signed-off-by: Christian Lamparter <chunkeey@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
92 lines
2.2 KiB
C
92 lines
2.2 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* Copyright (C) 2012 - 2014 Cisco Systems
|
|
* Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
|
|
*/
|
|
|
|
#ifndef __TIMER_INTERNAL_H__
|
|
#define __TIMER_INTERNAL_H__
|
|
#include <linux/list.h>
|
|
#include <asm/bug.h>
|
|
#include <shared/timetravel.h>
|
|
|
|
#define TIMER_MULTIPLIER 256
|
|
#define TIMER_MIN_DELTA 500
|
|
|
|
#ifdef CONFIG_UML_TIME_TRAVEL_SUPPORT
|
|
struct time_travel_event {
|
|
unsigned long long time;
|
|
void (*fn)(struct time_travel_event *d);
|
|
struct list_head list;
|
|
bool pending, onstack;
|
|
};
|
|
|
|
void time_travel_sleep(void);
|
|
|
|
static inline void
|
|
time_travel_set_event_fn(struct time_travel_event *e,
|
|
void (*fn)(struct time_travel_event *d))
|
|
{
|
|
e->fn = fn;
|
|
}
|
|
|
|
void __time_travel_propagate_time(void);
|
|
|
|
static inline void time_travel_propagate_time(void)
|
|
{
|
|
if (time_travel_mode == TT_MODE_EXTERNAL)
|
|
__time_travel_propagate_time();
|
|
}
|
|
|
|
void __time_travel_wait_readable(int fd);
|
|
|
|
static inline void time_travel_wait_readable(int fd)
|
|
{
|
|
if (time_travel_mode == TT_MODE_EXTERNAL)
|
|
__time_travel_wait_readable(fd);
|
|
}
|
|
|
|
void time_travel_add_irq_event(struct time_travel_event *e);
|
|
void time_travel_add_event_rel(struct time_travel_event *e,
|
|
unsigned long long delay_ns);
|
|
bool time_travel_del_event(struct time_travel_event *e);
|
|
#else
|
|
struct time_travel_event {
|
|
};
|
|
|
|
static inline void time_travel_sleep(void)
|
|
{
|
|
}
|
|
|
|
/* this is a macro so the event/function need not exist */
|
|
#define time_travel_set_event_fn(e, fn) do {} while (0)
|
|
|
|
static inline void time_travel_propagate_time(void)
|
|
{
|
|
}
|
|
|
|
static inline void time_travel_wait_readable(int fd)
|
|
{
|
|
}
|
|
|
|
static inline void time_travel_add_irq_event(struct time_travel_event *e)
|
|
{
|
|
WARN_ON(1);
|
|
}
|
|
|
|
/*
|
|
* not inlines so the data structure need not exist,
|
|
* cause linker failures
|
|
*/
|
|
extern void time_travel_not_configured(void);
|
|
#define time_travel_add_event_rel(...) time_travel_not_configured()
|
|
#define time_travel_del_event(...) time_travel_not_configured()
|
|
#endif /* CONFIG_UML_TIME_TRAVEL_SUPPORT */
|
|
|
|
/*
|
|
* Without CONFIG_UML_TIME_TRAVEL_SUPPORT this is a linker error if used,
|
|
* which is intentional since we really shouldn't link it in that case.
|
|
*/
|
|
void time_travel_ndelay(unsigned long nsec);
|
|
#endif /* __TIMER_INTERNAL_H__ */
|