Skip to contentSkip to conversation

libata fix

PATCH In review Jeff Garzik 2 participants 5 messages Sep 25, 2006 libata

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libata fix

[hey Linus, your git summary hint helped, thanks]

Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus

to receive the following updates:

 include/asm-alpha/libata-portmap.h   |    1 -
 include/asm-frv/libata-portmap.h     |    1 -
 include/asm-i386/libata-portmap.h    |    1 -
 include/asm-ia64/libata-portmap.h    |    1 -
 include/asm-powerpc/libata-portmap.h |    1 -
 include/asm-sparc/libata-portmap.h   |    1 -
 include/asm-sparc64/libata-portmap.h |    1 -
 include/asm-x86_64/libata-portmap.h  |    1 -
 include/linux/libata.h               |    8 ++++++++
 9 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 include/asm-alpha/libata-portmap.h
 delete mode 100644 include/asm-frv/libata-portmap.h
 delete mode 100644 include/asm-i386/libata-portmap.h
 delete mode 100644 include/asm-ia64/libata-portmap.h
 delete mode 100644 include/asm-powerpc/libata-portmap.h
 delete mode 100644 include/asm-sparc/libata-portmap.h
 delete mode 100644 include/asm-sparc64/libata-portmap.h
 delete mode 100644 include/asm-x86_64/libata-portmap.h

Jeff Garzik:
[libata] No need for all those arch libata-portmap.h headers

include/asm-alpha/libata-portmap.h deleted +0 -1
deleted file mode 100644
index 75484ef..0000000
@@ -1 +0,0 @@
-#include <asm-generic/libata-portmap.h>
include/asm-frv/libata-portmap.h deleted +0 -1
deleted file mode 100644
index 75484ef..0000000
@@ -1 +0,0 @@
-#include <asm-generic/libata-portmap.h>
include/asm-i386/libata-portmap.h deleted +0 -1
deleted file mode 100644
index 75484ef..0000000
@@ -1 +0,0 @@
-#include <asm-generic/libata-portmap.h>
include/asm-ia64/libata-portmap.h deleted +0 -1
deleted file mode 100644
index 75484ef..0000000
@@ -1 +0,0 @@
-#include <asm-generic/libata-portmap.h>
include/asm-powerpc/libata-portmap.h deleted +0 -1
deleted file mode 100644
index 75484ef..0000000
@@ -1 +0,0 @@
-#include <asm-generic/libata-portmap.h>
include/asm-sparc/libata-portmap.h deleted +0 -1
deleted file mode 100644
index 75484ef..0000000
@@ -1 +0,0 @@
-#include <asm-generic/libata-portmap.h>
include/asm-sparc64/libata-portmap.h deleted +0 -1
deleted file mode 100644
index 75484ef..0000000
@@ -1 +0,0 @@
-#include <asm-generic/libata-portmap.h>
include/asm-x86_64/libata-portmap.h deleted +0 -1
deleted file mode 100644
index 75484ef..0000000
@@ -1 +0,0 @@
-#include <asm-generic/libata-portmap.h>
include/linux/libata.h +8 -0
index 1ef3d39..d6a3d4b 100644
@@ -36,7 +36,15 @@ #include <linux/ata.h>
 #include <linux/workqueue.h>
 #include <scsi/scsi_host.h>
 
+/*
+ * Define if arch has non-standard setup.  This is a _PCI_ standard
+ * not a legacy or ISA standard.
+ */
+#ifdef CONFIG_ATA_NONSTANDARD
 #include <asm/libata-portmap.h>
+#else
+#include <asm-generic/libata-portmap.h>
+#endif
 
 /*
  * compile-time options: to be removed as soon as all the drivers are
#1 lore raw

Ar Llu, 2006-09-25 am 15:35 -0400, ysgrifennodd Jeff Garzik:

Quoted 2 lines

+ * Define if arch has non-standard setup. This is a _PCI_ standard
+ * not a legacy or ISA standard.

The IRQs bit isn't.

I've got some better changes I'm testing here but they touch the PCI core code so want to shake through -mm first I think so fine by me.

Alan

#2 lore raw
In reply to Jeff Garzik

Ar Llu, 2006-09-25 am 15:35 -0400, ysgrifennodd Jeff Garzik:

Quoted 4 lines

[hey Linus, your git summary hint helped, thanks]

Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus

Btw this one doesn't actually solve the FRV case. That's going to need some more work and thinking. Look for patches tomorrow.

Alan

#3 lore raw
Quoted 8 lines · Alan Cox

Ar Llu, 2006-09-25 am 15:35 -0400, ysgrifennodd Jeff Garzik:

Quoted 4 lines

[hey Linus, your git summary hint helped, thanks]

Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus

Btw this one doesn't actually solve the FRV case. That's going to need some more work and thinking. Look for patches tomorrow.

It gets FRV to where it was at the point of 2.6.18 release. Whether it worked on FRV at the time of 2.6.18 is quite a different question...

This recent push merely exposed _existing_ arch dependencies. They aren't new by any stretch of the imagination.

As we see, the push has spurred relevant people into taking the correct action ;-)

Jeff

#4 lore raw
In reply to Jeff Garzik
Quoted 4 lines · Jeff Garzik

[hey Linus, your git summary hint helped, thanks]

Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus

Argh. I forgot to run the push script. It's there now.

Jeff