All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dimitri Torfs <dimitri@sonycom.com>
To: ralf@linux-mips.org
Cc: linux-mips@linux-mips.org
Subject: [PATCH][2.6] VR41xx pte fix and VR413x cpu-probe fix
Date: Tue, 30 Dec 2003 21:24:29 +0100	[thread overview]
Message-ID: <20031230202429.GA11117@sonycom.com> (raw)

Hi,

  here are two patches related to the VR41xx series. The first patch
  fixes the pte calculation (pte_pfn and pfn_pte) for VR41xx. Second
  patch fixes the cpu detection for the VR413x cpu's (missing break).


--- linux-mips-2.6.orig/include/asm-mips/pgtable-32.h	2003-10-19 02:50:11.000000000 +0200
+++ linux.work/include/asm-mips/pgtable-32.h	2003-12-30 20:36:19.000000000 +0100
@@ -131,8 +131,15 @@
 static inline void pgd_clear(pgd_t *pgdp)	{ }
 
 #define pte_page(x)		pfn_to_page(pte_pfn(x))
+
+
+#ifdef CONFIG_CPU_VR41XX
+#define pte_pfn(x)		((unsigned long)((x).pte >> (PAGE_SHIFT + 2)))
+#define pfn_pte(pfn, prot)	__pte(((pfn) << (PAGE_SHIFT + 2)) | pgprot_val(prot))
+#else
 #define pte_pfn(x)		((unsigned long)((x).pte >> PAGE_SHIFT))
 #define pfn_pte(pfn, prot)	__pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
+#endif
 
 #if defined(CONFIG_CPU_R3000) || defined(CONFIG_CPU_TX39XX)
 

  
--- linux-mips-2.6.orig/arch/mips/kernel/cpu-probe.c	2003-12-11 03:05:21.000000000 +0100
+++ linux.work/arch/mips/kernel/cpu-probe.c	2003-12-29 13:12:35.000000000 +0100
@@ -228,6 +228,7 @@
 				c->cputype = CPU_VR4131;
 			else
 				c->cputype = CPU_VR4133;
+			break;
 		default:
 			printk(KERN_INFO "Unexpected CPU of NEC VR4100 series\n");
 				c->cputype = CPU_VR41XX;


  

  Dimitri


-- 
Dimitri Torfs             |  NSCE 
dimitri.torfs@sonycom.com |  Sint Stevens Woluwestraat 55
tel: +32 2 2908451        |  1130 Brussel
fax: +32 2 7262686        |  Belgium

                 reply	other threads:[~2003-12-30 20:24 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20031230202429.GA11117@sonycom.com \
    --to=dimitri@sonycom.com \
    --cc=linux-mips@linux-mips.org \
    --cc=ralf@linux-mips.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.