From: Ian Campbell <ijc@hellion.org.uk>
To: linux-kernel@vger.kernel.org
Cc: Ian Campbell <ijc@hellion.org.uk>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>
Subject: [PATCH 8/9] x86: Unify variable names in arch/x86/boot/compressed/misc_??.c
Date: Sat, 26 Jan 2008 11:54:12 +0000 [thread overview]
Message-ID: <a14f8ca682837cfb369e54a93c2fe5d79d0836d8.1201348185.git.ijc@hellion.org.uk> (raw)
In-Reply-To: <5c9a53dfa2ac6835d88bbdde15eb54f0b68d126e.1201348185.git.ijc@hellion.org.uk>
In-Reply-To: <ff184a8ea93f18a787bb9bd0c860036219b83ee0.1201348185.git.ijc@hellion.org.uk>
size reports no change in arch/x86/boot/compressed/vmlinux.
Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
---
arch/x86/boot/compressed/misc_32.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/boot/compressed/misc_32.c b/arch/x86/boot/compressed/misc_32.c
index 7522b64..9f963af 100644
--- a/arch/x86/boot/compressed/misc_32.c
+++ b/arch/x86/boot/compressed/misc_32.c
@@ -348,7 +348,7 @@ static void error(char *x)
asm("hlt");
}
-asmlinkage void decompress_kernel(void *rmode, unsigned long end,
+asmlinkage void decompress_kernel(void *rmode, unsigned long heap,
uch *input_data, unsigned long input_len,
uch *output)
{
@@ -366,15 +366,15 @@ asmlinkage void decompress_kernel(void *rmode, unsigned long end,
cols = RM_SCREEN_INFO.orig_video_cols;
window = output; /* Output buffer (Normally at 1M) */
- free_mem_ptr = end; /* Heap */
- free_mem_end_ptr = end + HEAP_SIZE;
+ free_mem_ptr = heap; /* Heap */
+ free_mem_end_ptr = heap + HEAP_SIZE;
inbuf = input_data; /* Input buffer */
insize = input_len;
inptr = 0;
if ((u32)output & (CONFIG_PHYSICAL_ALIGN -1))
error("Destination address not CONFIG_PHYSICAL_ALIGN aligned");
- if (end > ((-__PAGE_OFFSET-(512 <<20)-1) & 0x7fffffff))
+ if (heap > ((-__PAGE_OFFSET-(512<<20)-1) & 0x7fffffff))
error("Destination address too large");
#ifndef CONFIG_RELOCATABLE
if ((u32)output != LOAD_PHYSICAL_ADDR)
--
1.5.3.8
next prev parent reply other threads:[~2008-01-26 11:57 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-26 11:54 [PATCH 1/9] x86: Unify whitespace and comments in arch/x86/boot/compressed/vmlinux_??.lds Ian Campbell
2008-01-26 11:54 ` [PATCH 2/9] x86: Unify whitespace in arch/x86/boot/compressed/vmlinux_??.scr Ian Campbell
2008-01-26 11:54 ` [PATCH 3/9] x86_64: Switch to .data.compressed in arch/x86/boot/compressed/vmlinux_64.scr Ian Campbell
2008-01-26 11:54 ` [PATCH 4/9] x86_64: Unify arch/x86/boot/compressed/vmlinux_??.scr Ian Campbell
2008-01-26 11:54 ` [PATCH 5/9] x86: Unify strings in arch/x86/boot/compressed/misc_??.c Ian Campbell
2008-01-26 11:54 ` [PATCH 6/9] x86: Unify whitespace and comments " Ian Campbell
2008-01-26 11:54 ` [PATCH 7/9] x86: Unify headers " Ian Campbell
2008-01-26 11:54 ` Ian Campbell [this message]
2008-01-26 11:54 ` [PATCH 9/9] x86: Unify arch/x86/boot/compressed/misc_??.c Ian Campbell
2008-01-27 1:03 ` [PATCH 5/9] x86: Unify strings in arch/x86/boot/compressed/misc_??.c Yinghai Lu
2008-01-27 1:11 ` H. Peter Anvin
2008-01-27 0:59 ` [PATCH 3/9] x86_64: Switch to .data.compressed in arch/x86/boot/compressed/vmlinux_64.scr Yinghai Lu
2008-01-27 22:04 ` Ian Campbell
2008-01-27 22:57 ` H. Peter Anvin
2008-01-27 23:38 ` Yinghai Lu
2008-01-28 0:33 ` H. Peter Anvin
2008-01-28 1:49 ` Yinghai Lu
2008-01-28 1:55 ` H. Peter Anvin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a14f8ca682837cfb369e54a93c2fe5d79d0836d8.1201348185.git.ijc@hellion.org.uk \
--to=ijc@hellion.org.uk \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®