lkml.org 
[lkml]   [2018]   [Apr]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.16 32/68] x86/uapi: Fix asm/bootparam.h userspace compilation errors
    Date
    4.16-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Dmitry V. Levin <ldv@altlinux.org>

    commit 9820e1c3376c641299624dd24646aed3167ad5b1 upstream.

    Consistently use types provided by <linux/types.h> to fix the following
    asm/bootparam.h userspace compilation errors:

    /usr/include/asm/bootparam.h:140:2: error: unknown type name 'u16'
    u16 version;
    /usr/include/asm/bootparam.h:141:2: error: unknown type name 'u16'
    u16 compatible_version;
    /usr/include/asm/bootparam.h:142:2: error: unknown type name 'u16'
    u16 pm_timer_address;
    /usr/include/asm/bootparam.h:143:2: error: unknown type name 'u16'
    u16 num_cpus;
    /usr/include/asm/bootparam.h:144:2: error: unknown type name 'u64'
    u64 pci_mmconfig_base;
    /usr/include/asm/bootparam.h:145:2: error: unknown type name 'u32'
    u32 tsc_khz;
    /usr/include/asm/bootparam.h:146:2: error: unknown type name 'u32'
    u32 apic_khz;
    /usr/include/asm/bootparam.h:147:2: error: unknown type name 'u8'
    u8 standard_ioapic;
    /usr/include/asm/bootparam.h:148:2: error: unknown type name 'u8'
    u8 cpu_ids[255];

    Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
    Acked-by: Jan Kiszka <jan.kiszka@siemens.com>
    Cc: <stable@vger.kernel.org> # v4.16
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Fixes: 4a362601baa6 ("x86/jailhouse: Add infrastructure for running in non-root cell")
    Link: http://lkml.kernel.org/r/20180405043210.GA13254@altlinux.org
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/x86/include/uapi/asm/bootparam.h | 18 +++++++++---------
    1 file changed, 9 insertions(+), 9 deletions(-)

    --- a/arch/x86/include/uapi/asm/bootparam.h
    +++ b/arch/x86/include/uapi/asm/bootparam.h
    @@ -137,15 +137,15 @@ struct boot_e820_entry {
    * setup data structure.
    */
    struct jailhouse_setup_data {
    - u16 version;
    - u16 compatible_version;
    - u16 pm_timer_address;
    - u16 num_cpus;
    - u64 pci_mmconfig_base;
    - u32 tsc_khz;
    - u32 apic_khz;
    - u8 standard_ioapic;
    - u8 cpu_ids[255];
    + __u16 version;
    + __u16 compatible_version;
    + __u16 pm_timer_address;
    + __u16 num_cpus;
    + __u64 pci_mmconfig_base;
    + __u32 tsc_khz;
    + __u32 apic_khz;
    + __u8 standard_ioapic;
    + __u8 cpu_ids[255];
    } __attribute__((packed));

    /* The so-called "zeropage" */

    \
     
     \ /
      Last update: 2018-04-17 18:59    [W:4.158 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site