public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Jeff Garzik <jgarzik@pobox.com>
To: Andrew Morton <akpm@osdl.org>,
	Richard Henderson <rth@twiddle.net>,
	Dave Jones <davej@redhat.com>, Greg KH <greg@kroah.com>,
	"chas williams - CONTRACTOR" <chas@cmf.nrl.navy.mil>,
	Leendert van Doorn <leendert@watson.ibm.com>,
	Reiner Sailer <sailer@watson.ibm.com>
Cc: Linux Kernel <linux-kernel@vger.kernel.org>
Subject: [PATCH] alpha build fixes
Date: Fri, 18 Mar 2005 23:34:07 -0500	[thread overview]
Message-ID: <423BABBF.6030103@pobox.com> (raw)

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

Needed this to build Fedora rawhide kernel (2.6.12-rc1 + some patches) 
on alpha.  This is the upstream portion of the build fixes.

Signed-off-by: Jeff Garzik <jgarzik@pobox.com>


[-- Attachment #2: kernel-build1.patch --]
[-- Type: text/x-patch, Size: 2566 bytes --]

diff -urN ../kernel-2.6.11.orig/linux-2.6.11/drivers/char/agp/generic.c linux-2.6.11/drivers/char/agp/generic.c
--- ../kernel-2.6.11.orig/linux-2.6.11/drivers/char/agp/generic.c	2005-03-18 16:45:23.000000000 -0500
+++ linux-2.6.11/drivers/char/agp/generic.c	2005-03-18 18:34:00.000000000 -0500
@@ -35,6 +35,7 @@
 #include <linux/pm.h>
 #include <linux/agp_backend.h>
 #include <linux/vmalloc.h>
+#include <linux/dma-mapping.h>
 #include <linux/mm.h>
 #include <asm/io.h>
 #include <asm/cacheflush.h>
diff -urN ../kernel-2.6.11.orig/linux-2.6.11/include/asm-alpha/pci.h linux-2.6.11/include/asm-alpha/pci.h
--- ../kernel-2.6.11.orig/linux-2.6.11/include/asm-alpha/pci.h	2005-03-02 02:38:34.000000000 -0500
+++ linux-2.6.11/include/asm-alpha/pci.h	2005-03-18 18:39:31.000000000 -0500
@@ -223,6 +223,12 @@
 	/* Nothing to do. */
 }
 
+/* TODO: integrate with include/asm-generic/pci.h ? */
+static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
+{
+	return channel ? 15 : 14;
+}
+
 extern void pcibios_resource_to_bus(struct pci_dev *, struct pci_bus_region *,
 				    struct resource *);
 
diff -urN ../kernel-2.6.11.orig/linux-2.6.11/include/linux/debugfs.h linux-2.6.11/include/linux/debugfs.h
--- ../kernel-2.6.11.orig/linux-2.6.11/include/linux/debugfs.h	2005-03-02 02:38:33.000000000 -0500
+++ linux-2.6.11/include/linux/debugfs.h	2005-03-18 18:14:12.000000000 -0500
@@ -15,6 +15,8 @@
 #ifndef _DEBUGFS_H_
 #define _DEBUGFS_H_
 
+#include <linux/fs.h>
+
 #if defined(CONFIG_DEBUG_FS)
 struct dentry *debugfs_create_file(const char *name, mode_t mode,
 				   struct dentry *parent, void *data,
diff -ur ../kernel-2.6.11.orig/linux-2.6.11/drivers/atm/lanai.c linux-2.6.11/drivers/atm/lanai.c
--- ../kernel-2.6.11.orig/linux-2.6.11/drivers/atm/lanai.c	2005-03-18 20:06:31.000000000 -0500
+++ linux-2.6.11/drivers/atm/lanai.c	2005-03-18 20:36:19.000000000 -0500
@@ -61,6 +61,7 @@
 #include <asm/byteorder.h>
 #include <linux/spinlock.h>
 #include <linux/pci.h>
+#include <linux/dma-mapping.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
diff -ur ../kernel-2.6.11.orig/linux-2.6.11/drivers/char/tpm/tpm.h linux-2.6.11/drivers/char/tpm/tpm.h
--- ../kernel-2.6.11.orig/linux-2.6.11/drivers/char/tpm/tpm.h	2005-03-18 20:06:31.000000000 -0500
+++ linux-2.6.11/drivers/char/tpm/tpm.h	2005-03-18 20:50:31.000000000 -0500
@@ -22,6 +22,7 @@
 #include <linux/version.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
+#include <linux/fs.h>
 #include <linux/miscdevice.h>
 
 #define TPM_TIMEOUT msecs_to_jiffies(5)

             reply	other threads:[~2005-03-19  4:34 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-03-19  4:34 Jeff Garzik [this message]
2005-03-19 23:11 ` [PATCH] alpha build fixes Richard Henderson
2005-03-19 23:16   ` Jeff Garzik
2005-03-21  8:05     ` Bartlomiej Zolnierkiewicz
2005-03-21  9:16       ` Ivan Kokshaysky
2005-03-21  9:45         ` Bartlomiej Zolnierkiewicz
2005-03-21 12:27           ` Benjamin Herrenschmidt
2005-03-21 13:53             ` Ivan Kokshaysky
2005-03-21 23:27               ` Benjamin Herrenschmidt
2005-03-21 14:52   ` Alan Cox
2005-03-21 18:16     ` Richard Henderson
2005-03-21 18:22       ` Jeff Garzik
  -- strict thread matches above, loose matches on Subject: below --
2005-03-23 13:49 Matthew Wilcox
2007-12-13  9:21 [patch] alpha: " Ivan Kokshaysky

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=423BABBF.6030103@pobox.com \
    --to=jgarzik@pobox.com \
    --cc=akpm@osdl.org \
    --cc=chas@cmf.nrl.navy.mil \
    --cc=davej@redhat.com \
    --cc=greg@kroah.com \
    --cc=leendert@watson.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rth@twiddle.net \
    --cc=sailer@watson.ibm.com \
    /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