[uClinux-dev] [PATCH 5/9] nios2: Updates for kernel 2.6.23
Atle Nissestad
atle at nissestad.no
Wed Nov 21 05:51:13 EST 2007
Make the kernel compilable ...
Signed-off-by: Atle Nissestad <atle at nissestad.no>
diff --git a/linux-2.6.x/arch/nios2nommu/kernel/process.c b/linux-2.6.x/arch/nios2nommu/kernel/process.c
index a40621d..4cd353c 100644
--- a/linux-2.6.x/arch/nios2nommu/kernel/process.c
+++ b/linux-2.6.x/arch/nios2nommu/kernel/process.c
@@ -50,11 +50,12 @@
#include <linux/a.out.h>
#include <linux/interrupt.h>
#include <linux/reboot.h>
+#include <linux/uaccess.h>
+#include <linux/fs.h>
+#include <linux/err.h>
-#include <asm/uaccess.h>
#include <asm/system.h>
#include <asm/traps.h>
-//;dgt2;#include <asm/machdep.h>
#include <asm/setup.h>
#include <asm/pgtable.h>
#include <asm/cacheflush.h>
diff --git a/linux-2.6.x/arch/nios2nommu/kernel/sys_nios2.c b/linux-2.6.x/arch/nios2nommu/kernel/sys_nios2.c
index 7b08c6c..8018fb0 100644
--- a/linux-2.6.x/arch/nios2nommu/kernel/sys_nios2.c
+++ b/linux-2.6.x/arch/nios2nommu/kernel/sys_nios2.c
@@ -39,14 +39,16 @@
#include <linux/mman.h>
#include <linux/file.h>
#include <linux/utsname.h>
+#include <linux/fs.h>
+#include <linux/uaccess.h>
+#include <linux/ipc.h>
+#include <linux/unistd.h>
#include <asm/setup.h>
-#include <asm/uaccess.h>
#include <asm/cachectl.h>
#include <asm/traps.h>
#include <asm/ipc.h>
#include <asm/cacheflush.h>
-#include <asm/unistd.h>
/*
* sys_pipe() is the normal C calling standard for creating
diff --git a/linux-2.6.x/drivers/ide/ide.c b/linux-2.6.x/drivers/ide/ide.c
index 1383432..c1048e8 100644
--- a/linux-2.6.x/drivers/ide/ide.c
+++ b/linux-2.6.x/drivers/ide/ide.c
@@ -1223,6 +1223,9 @@ extern int ht6560b_init(void);
extern int probe_qd65xx;
extern int qd65xx_init(void);
#endif
+#ifdef CONFIG_BLK_DEV_ALTCF
+extern int altcf_init(void);
+#endif /* CONFIG_BLK_DEV_ALTCF */
static int __initdata is_chipset_set[MAX_HWIFS];
diff --git a/linux-2.6.x/include/asm-nios2nommu/fcntl.h b/linux-2.6.x/include/asm-nios2nommu/fcntl.h
index 8b21044..9d98af2 100644
--- a/linux-2.6.x/include/asm-nios2nommu/fcntl.h
+++ b/linux-2.6.x/include/asm-nios2nommu/fcntl.h
@@ -1,110 +1,11 @@
-/*
- * This file came from the m68k port.
- *
- * Copyright (C) 2004 Microtronix Datacom Ltd.
- *
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
- * NON INFRINGEMENT. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
#ifndef _NIOS2_FCNTL_H
#define _NIOS2_FCNTL_H
-/* open/fcntl - O_SYNC is only implemented on blocks devices and on files
- located on an ext2 file system */
-#define O_ACCMODE 0003
-#define O_RDONLY 00
-#define O_WRONLY 01
-#define O_RDWR 02
-#define O_CREAT 0100 /* not fcntl */
-#define O_EXCL 0200 /* not fcntl */
-#define O_NOCTTY 0400 /* not fcntl */
-#define O_TRUNC 01000 /* not fcntl */
-#define O_APPEND 02000
-#define O_NONBLOCK 04000
-#define O_NDELAY O_NONBLOCK
-#define O_SYNC 010000
-#define FASYNC 020000 /* fcntl, for BSD compatibility */
#define O_DIRECTORY 040000 /* must be a directory */
#define O_NOFOLLOW 0100000 /* don't follow links */
#define O_DIRECT 0200000 /* direct disk access hint - currently ignored */
#define O_LARGEFILE 0400000
-#define O_NOATIME 01000000
-#define F_DUPFD 0 /* dup */
-#define F_GETFD 1 /* get close_on_exec */
-#define F_SETFD 2 /* set/clear close_on_exec */
-#define F_GETFL 3 /* get file->f_flags */
-#define F_SETFL 4 /* set file->f_flags */
-#define F_GETLK 5
-#define F_SETLK 6
-#define F_SETLKW 7
+#include <asm-generic/fcntl.h>
-#define F_SETOWN 8 /* for sockets. */
-#define F_GETOWN 9 /* for sockets. */
-#define F_SETSIG 10 /* for sockets. */
-#define F_GETSIG 11 /* for sockets. */
-
-#define F_GETLK64 12 /* using 'struct flock64' */
-#define F_SETLK64 13
-#define F_SETLKW64 14
-
-/* for F_[GET|SET]FL */
-#define FD_CLOEXEC 1 /* actually anything with low bit set goes */
-
-/* for posix fcntl() and lockf() */
-#define F_RDLCK 0
-#define F_WRLCK 1
-#define F_UNLCK 2
-
-/* for old implementation of bsd flock () */
-#define F_EXLCK 4 /* or 3 */
-#define F_SHLCK 8 /* or 4 */
-
-/* for leases */
-#define F_INPROGRESS 16
-
-/* operations for bsd flock(), also used by the kernel implementation */
-#define LOCK_SH 1 /* shared lock */
-#define LOCK_EX 2 /* exclusive lock */
-#define LOCK_NB 4 /* or'd with one of the above to prevent
- blocking */
-#define LOCK_UN 8 /* remove lock */
-
-#define LOCK_MAND 32 /* This is a mandatory flock */
-#define LOCK_READ 64 /* ... Which allows concurrent read operations */
-#define LOCK_WRITE 128 /* ... Which allows concurrent write operations */
-#define LOCK_RW 192 /* ... Which allows concurrent read & write ops */
-
-struct flock {
- short l_type;
- short l_whence;
- off_t l_start;
- off_t l_len;
- pid_t l_pid;
-};
-
-struct flock64 {
- short l_type;
- short l_whence;
- loff_t l_start;
- loff_t l_len;
- pid_t l_pid;
-};
-
-#define F_LINUX_SPECIFIC_BASE 1024
#endif /* _NIOS2_FCNTL_H */
diff --git a/linux-2.6.x/include/asm-nios2nommu/flat.h b/linux-2.6.x/include/asm-nios2nommu/flat.h
index 15050db..681329a 100644
--- a/linux-2.6.x/include/asm-nios2nommu/flat.h
+++ b/linux-2.6.x/include/asm-nios2nommu/flat.h
@@ -41,13 +41,16 @@ flat_get_relocate_addr (unsigned long relval)
#define FLAT_NIOS2_R_HIADJ_LO 2 /* High 16-bits adjust + low 16-bits field */
#define FLAT_NIOS2_R_CALL26 4 /* Call imm26 */
+#define flat_set_persistent(relval, p) 0
+
/* Extract the address to be relocated from the symbol reference at rp;
* relval is the raw relocation-table entry from which RP is derived.
* rp shall always be 32-bit aligned
*/
static inline unsigned long flat_get_addr_from_rp (unsigned long *rp,
unsigned long relval,
- unsigned long flags)
+ unsigned long flags,
+ unsigned long *persistent)
{
switch (FLAT_NIOS2_RELOC_TYPE(relval))
{
diff --git a/linux-2.6.x/include/asm-nios2nommu/pci.h b/linux-2.6.x/include/asm-nios2nommu/pci.h
index 0a523c8..be3b3b2 100644
--- a/linux-2.6.x/include/asm-nios2nommu/pci.h
+++ b/linux-2.6.x/include/asm-nios2nommu/pci.h
@@ -114,10 +114,6 @@ extern void pcibios_fixup_irqs(void);
extern int pciauto_assign_resources(int busno, struct pci_channel *hose);
#endif
-static inline void pcibios_add_platform_entries(struct pci_dev *dev)
-{
-}
-
#endif /* __KERNEL__ */
/* generic pci stuff */
--
1.5.3.2
More information about the uClinux-dev
mailing list