From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756116AbYLIU0r (ORCPT ); Tue, 9 Dec 2008 15:26:47 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755280AbYLIUXZ (ORCPT ); Tue, 9 Dec 2008 15:23:25 -0500 Received: from mx2.redhat.com ([66.187.237.31]:34854 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754733AbYLIUXJ (ORCPT ); Tue, 9 Dec 2008 15:23:09 -0500 From: Avi Kivity To: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 16/44] Merge branch 'x86/crashdump' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip Date: Tue, 9 Dec 2008 22:22:31 +0200 Message-Id: <1228854179-23002-17-git-send-email-avi@redhat.com> In-Reply-To: <1228854179-23002-1-git-send-email-avi@redhat.com> References: <1228854179-23002-1-git-send-email-avi@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --- arch/x86/include/asm/kexec.h | 31 +++++----- arch/x86/include/asm/reboot.h | 5 ++ arch/x86/kernel/crash.c | 70 +++------------------ arch/x86/kernel/machine_kexec_32.c | 104 ++++++++++++++++++++++++------- arch/x86/kernel/reboot.c | 95 ++++++++++++++++++++++++++++ arch/x86/kernel/relocate_kernel_32.S | 115 ---------------------------------- include/linux/kexec.h | 4 + 7 files changed, 210 insertions(+), 214 deletions(-) [This is a merge from the x86 forest]