| Message ID | 20201005131044.87276-1-andriy.shevchenko@linux.intel.com |
|---|---|
| State | Accepted |
| Commit | 47e538d86d5776ac8152146c3ed3d22326243190 |
| Headers | show |
| Series | [v1] gpiolib: Disable compat ->read() code in UML case | expand |
On Mon, Oct 5, 2020 at 3:11 PM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > 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: 5ad284ab3a01 ("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> Patch applied for fixes. Yours, Linus Walleij
diff --git a/drivers/gpio/gpiolib-cdev.c b/drivers/gpio/gpiolib-cdev.c index 76c36b05aef6..fed5a3b2172f 100644 --- a/drivers/gpio/gpiolib-cdev.c +++ b/drivers/gpio/gpiolib-cdev.c @@ -425,7 +425,7 @@ static __poll_t lineevent_poll(struct file *file, static ssize_t lineevent_get_size(void) { -#ifdef __x86_64__ +#if defined(CONFIG_X86_64) && !defined(CONFIG_UML) /* i386 has no padding after 'id' */ if (in_ia32_syscall()) { struct compat_gpioeevent_data {
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: 5ad284ab3a01 ("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> --- drivers/gpio/gpiolib-cdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)