Skip to content

Commit 47e538d

Browse files
andy-shevLinus Walleij
authored andcommitted
gpiolib: Disable compat ->read() code in UML case
It appears that UML (arch/um) has no compat.h header defined and hence can't compile a recently provided piece of code in GPIO library. Disable compat ->read() code in UML case to avoid compilation errors. While at it, use pattern which is already being used in the kernel elsewhere. Fixes: 5ad284a ("gpiolib: Fix line event handling in syscall compatible mode") Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Link: https://lore.kernel.org/r/20201005131044.87276-1-andriy.shevchenko@linux.intel.com Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
1 parent 549738f commit 47e538d

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/gpio/gpiolib-cdev.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ static __poll_t lineevent_poll(struct file *file,
425425

426426
static ssize_t lineevent_get_size(void)
427427
{
428-
#ifdef __x86_64__
428+
#if defined(CONFIG_X86_64) && !defined(CONFIG_UML)
429429
/* i386 has no padding after 'id' */
430430
if (in_ia32_syscall()) {
431431
struct compat_gpioeevent_data {

0 commit comments

Comments
 (0)