linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Cong Wang <amwang@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [Patch] powerpc: fix build errors due to the movement of reboot events
Date: Wed, 06 Jul 2011 16:59:14 +0800	[thread overview]
Message-ID: <4E1423E2.8090706@redhat.com> (raw)
In-Reply-To: <20110701203702.a15ecf19.sfr@canb.auug.org.au>

[-- Attachment #1: Type: text/plain, Size: 215 bytes --]

Hi, Andrew,

Please fold this patch into notifiers-sys-move-reboot-notifiers-into-rebooth.patch.

With this patch applied, make allyesconfig succeeds on ppc64.

Signed-off-by: WANG Cong <amwang@redhat.com>

Thanks!

[-- Attachment #2: ppc-build-fix.diff --]
[-- Type: text/plain, Size: 725 bytes --]

diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index 271ff63..0e0ea94 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -24,6 +24,7 @@
 #include <linux/cpumask.h>
 #include <linux/memblock.h>
 #include <linux/slab.h>
+#include <linux/reboot.h>
 
 #include <asm/prom.h>
 #include <asm/rtas.h>
diff --git a/arch/powerpc/kernel/rtas_flash.c b/arch/powerpc/kernel/rtas_flash.c
index bf5f5ce..e037c74 100644
--- a/arch/powerpc/kernel/rtas_flash.c
+++ b/arch/powerpc/kernel/rtas_flash.c
@@ -17,6 +17,7 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/proc_fs.h>
+#include <linux/reboot.h>
 #include <asm/delay.h>
 #include <asm/uaccess.h>
 #include <asm/rtas.h>

      parent reply	other threads:[~2011-07-06  8:59 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-01  5:19 linux-next: build failure after merge of the akpm tree Stephen Rothwell
2011-07-01  5:32 ` Cong Wang
2011-07-01  7:08   ` Stephen Rothwell
2011-07-01 10:10     ` Cong Wang
2011-07-01 10:37       ` Stephen Rothwell
2011-07-04  1:30         ` Cong Wang
2011-07-06  8:59         ` Cong Wang [this message]

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=4E1423E2.8090706@redhat.com \
    --to=amwang@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /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;
as well as URLs for NNTP newsgroup(s).