lkml.org 
[lkml]   [2012]   [Dec]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v7 12/27] x86, boot: pass cmd_line_ptr with unsigned long
    Date
    boot/compressed/misc.c is used for bzImage in 64bit and 32bit, and
    cmd_line_ptr could point to buffer that is above 4g, cmd_line_ptr
    should be 64 bit otherwise high 32 bit will be capped out.

    So need to change data type to unsigned long, that will be 64bit get correct
    address of command line buffer.

    and it is ok with 32bit bzImage, because unsigned long for them
    is still 32bit.

    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    ---
    arch/x86/boot/boot.h | 8 ++++----
    arch/x86/boot/cmdline.c | 4 ++--
    2 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
    index 7fadf80..5b75319 100644
    --- a/arch/x86/boot/boot.h
    +++ b/arch/x86/boot/boot.h
    @@ -285,11 +285,11 @@ struct biosregs {
    void intcall(u8 int_no, const struct biosregs *ireg, struct biosregs *oreg);

    /* cmdline.c */
    -int __cmdline_find_option(u32 cmdline_ptr, const char *option, char *buffer, int bufsize);
    -int __cmdline_find_option_bool(u32 cmdline_ptr, const char *option);
    +int __cmdline_find_option(unsigned long cmdline_ptr, const char *option, char *buffer, int bufsize);
    +int __cmdline_find_option_bool(unsigned long cmdline_ptr, const char *option);
    static inline int cmdline_find_option(const char *option, char *buffer, int bufsize)
    {
    - u32 cmd_line_ptr = boot_params.hdr.cmd_line_ptr;
    + unsigned long cmd_line_ptr = boot_params.hdr.cmd_line_ptr;

    if (cmd_line_ptr >= 0x100000)
    return -1; /* inaccessible */
    @@ -299,7 +299,7 @@ static inline int cmdline_find_option(const char *option, char *buffer, int bufs

    static inline int cmdline_find_option_bool(const char *option)
    {
    - u32 cmd_line_ptr = boot_params.hdr.cmd_line_ptr;
    + unsigned long cmd_line_ptr = boot_params.hdr.cmd_line_ptr;

    if (cmd_line_ptr >= 0x100000)
    return -1; /* inaccessible */
    diff --git a/arch/x86/boot/cmdline.c b/arch/x86/boot/cmdline.c
    index 768f00f..625d21b 100644
    --- a/arch/x86/boot/cmdline.c
    +++ b/arch/x86/boot/cmdline.c
    @@ -27,7 +27,7 @@ static inline int myisspace(u8 c)
    * Returns the length of the argument (regardless of if it was
    * truncated to fit in the buffer), or -1 on not found.
    */
    -int __cmdline_find_option(u32 cmdline_ptr, const char *option, char *buffer, int bufsize)
    +int __cmdline_find_option(unsigned long cmdline_ptr, const char *option, char *buffer, int bufsize)
    {
    addr_t cptr;
    char c;
    @@ -99,7 +99,7 @@ int __cmdline_find_option(u32 cmdline_ptr, const char *option, char *buffer, int
    * Returns the position of that option (starts counting with 1)
    * or 0 on not found
    */
    -int __cmdline_find_option_bool(u32 cmdline_ptr, const char *option)
    +int __cmdline_find_option_bool(unsigned long cmdline_ptr, const char *option)
    {
    addr_t cptr;
    char c;
    --
    1.7.10.4


    \
     
     \ /
      Last update: 2012-12-18 09:21    [W:2.950 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site