From: mikpe@csd.uu.se
To: ak@suse.de
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] fix x86_64 pte_user() and floppy.h for 2.5.69
Date: Tue, 6 May 2003 16:04:04 +0200 [thread overview]
Message-ID: <16055.49364.106094.795419@gargle.gargle.HOWL> (raw)
Andi,
2.5.69 failed to link on x86_64 due to a missing reference to pte_user().
I simply stole the one that i386 added in .68 -> .69.
There's also irqreturn_t warnings on floppy.h -- fixed also by syncing
with i386' floppy.h.
Boots fine on Simics.
/Mikael
--- linux-2.5.69/include/asm-x86_64/floppy.h.~1~ 2003-05-05 22:56:30.000000000 +0200
+++ linux-2.5.69/include/asm-x86_64/floppy.h 2003-05-06 15:19:34.000000000 +0200
@@ -22,7 +22,7 @@
* floppy accesses go through the track buffer.
*/
#define _CROSS_64KB(a,s,vdma) \
-(!vdma && ((unsigned long)(a)/K_64 != ((unsigned long)(a) + (s) - 1) / K_64))
+(!(vdma) && ((unsigned long)(a)/K_64 != ((unsigned long)(a) + (s) - 1) / K_64))
#define CROSS_64KB(a,s) _CROSS_64KB(a,s,use_virtual_dma & 1)
@@ -62,10 +62,8 @@
static int bytes=0;
static int dma_wait=0;
#endif
- if(!doing_pdma) {
- floppy_interrupt(irq, dev_id, regs);
- return;
- }
+ if (!doing_pdma)
+ return floppy_interrupt(irq, dev_id, regs);
#ifdef TRACE_FLPY_INT
if(!calls)
@@ -96,7 +94,7 @@
calls++;
#endif
if(st == 0x20)
- return;
+ return IRQ_HANDLED;
if(!(st & 0x20)) {
virtual_dma_residue += virtual_dma_count;
virtual_dma_count=0;
--- linux-2.5.69/include/asm-x86_64/pgtable.h.~1~ 2003-04-08 01:47:26.000000000 +0200
+++ linux-2.5.69/include/asm-x86_64/pgtable.h 2003-05-06 15:12:40.000000000 +0200
@@ -241,6 +241,7 @@
* The following only work if pte_present() is true.
* Undefined behaviour if not..
*/
+extern inline int pte_user(pte_t pte) { return pte_val(pte) & _PAGE_USER; }
extern inline int pte_read(pte_t pte) { return pte_val(pte) & _PAGE_USER; }
extern inline int pte_exec(pte_t pte) { return pte_val(pte) & _PAGE_USER; }
extern inline int pte_dirty(pte_t pte) { return pte_val(pte) & _PAGE_DIRTY; }
next reply other threads:[~2003-05-06 13:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-05-06 14:04 mikpe [this message]
2003-05-06 14:22 ` Andi Kleen
2003-05-06 14:26 ` mikpe
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=16055.49364.106094.795419@gargle.gargle.HOWL \
--to=mikpe@csd.uu.se \
--cc=ak@suse.de \
--cc=linux-kernel@vger.kernel.org \
/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®