Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753516Ab2BTMMh (ORCPT ); Mon, 20 Feb 2012 07:12:37 -0500 Received: from mail-wi0-f174.google.com ([209.85.212.174]:62104 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752686Ab2BTMMg convert rfc822-to-8bit (ORCPT ); Mon, 20 Feb 2012 07:12:36 -0500 MIME-Version: 1.0 In-Reply-To: <1329696488-16970-7-git-send-email-hpa@zytor.com> References: <1329696488-16970-1-git-send-email-hpa@zytor.com> <1329696488-16970-7-git-send-email-hpa@zytor.com> Date: Mon, 20 Feb 2012 13:12:34 +0100 X-Google-Sender-Auth: 5Oho65wLGdNuqy55oXfaCSKAU-8 Message-ID: Subject: Re: [PATCH 06/30] sysinfo: Use explicit types in From: Geert Uytterhoeven To: "H. Peter Anvin" Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de, torvalds@linux-foundation.org, akpm@linux-foundation.org, hjl.tools@gmail.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3278 Lines: 59 On Mon, Feb 20, 2012 at 01:07, H. Peter Anvin wrote: > --- a/include/linux/sysinfo.h > +++ b/include/linux/sysinfo.h > @@ -1,22 +1,24 @@ >  #ifndef _LINUX_SYSINFO_H >  #define _LINUX_SYSINFO_H > > +#include > + >  #define SI_LOAD_SHIFT  16 >  struct sysinfo { > -       long uptime;                    /* Seconds since boot */ > -       unsigned long loads[3];         /* 1, 5, and 15 minute load averages */ > -       unsigned long totalram;         /* Total usable main memory size */ > -       unsigned long freeram;          /* Available memory size */ > -       unsigned long sharedram;        /* Amount of shared memory */ > -       unsigned long bufferram;        /* Memory used by buffers */ > -       unsigned long totalswap;        /* Total swap space size */ > -       unsigned long freeswap;         /* swap space still available */ > -       unsigned short procs;           /* Number of current processes */ > -       unsigned short pad;             /* explicit padding for m68k */ > -       unsigned long totalhigh;        /* Total high memory size */ > -       unsigned long freehigh;         /* Available high memory size */ > -       unsigned int mem_unit;          /* Memory unit size in bytes */ > -       char _f[20-2*sizeof(long)-sizeof(int)]; /* Padding: libc5 uses this.. */ > +       __kernel_long_t uptime;         /* Seconds since boot */ > +       __kernel_ulong_t loads[3];      /* 1, 5, and 15 minute load averages */ > +       __kernel_ulong_t totalram;      /* Total usable main memory size */ > +       __kernel_ulong_t freeram;       /* Available memory size */ > +       __kernel_ulong_t sharedram;     /* Amount of shared memory */ > +       __kernel_ulong_t bufferram;     /* Memory used by buffers */ > +       __kernel_ulong_t totalswap;     /* Total swap space size */ > +       __kernel_ulong_t freeswap;      /* swap space still available */ > +       __u16 procs;                    /* Number of current processes */ > +       __u16 pad;                      /* Explicit padding for m68k */ Fueling the discussion about natural vs. 4-byte alignment? > +       __kernel_ulong_t totalhigh;     /* Total high memory size */ > +       __kernel_ulong_t freehigh;      /* Available high memory size */ > +       __u32 mem_unit;                 /* Memory unit size in bytes */ > +       char _f[20-2*sizeof(__kernel_ulong_t)-sizeof(__u32)];   /* Padding: libc5 uses this.. */ >  }; Gr{oetje,eeting}s,                         Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.                                 -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/