summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/bio.h6
-rw-r--r--include/linux/dio.h12
-rw-r--r--include/linux/generic_serial.h2
-rw-r--r--include/linux/intermezzo_fs.h1
-rw-r--r--include/linux/interrupt.h10
-rw-r--r--include/linux/nubus.h5
-rw-r--r--include/linux/pmu.h2
-rw-r--r--include/linux/serial167.h2
-rw-r--r--include/linux/smp.h5
-rw-r--r--include/linux/trdevice.h1
-rw-r--r--include/linux/writeback.h5
-rw-r--r--include/linux/zorro.h2
12 files changed, 38 insertions, 15 deletions
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 1b4004652cde..fee72762ad8d 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -215,7 +215,7 @@ extern inline char *bio_kmap_irq(struct bio *bio, unsigned long *flags)
{
unsigned long addr;
- __save_flags(*flags);
+ local_save_flags(*flags);
/*
* could be low
@@ -226,7 +226,7 @@ extern inline char *bio_kmap_irq(struct bio *bio, unsigned long *flags)
/*
* it's a highmem page
*/
- __cli();
+ local_irq_disable();
addr = (unsigned long) kmap_atomic(bio_page(bio), KM_BIO_SRC_IRQ);
if (addr & ~PAGE_MASK)
@@ -240,7 +240,7 @@ extern inline void bio_kunmap_irq(char *buffer, unsigned long *flags)
unsigned long ptr = (unsigned long) buffer & PAGE_MASK;
kunmap_atomic((void *) ptr, KM_BIO_SRC_IRQ);
- __restore_flags(*flags);
+ local_irq_restore(*flags);
}
#else
diff --git a/include/linux/dio.h b/include/linux/dio.h
index 087b06ec1011..75166393b982 100644
--- a/include/linux/dio.h
+++ b/include/linux/dio.h
@@ -72,16 +72,16 @@
#define DIO_SCINHOLE(scode) (((scode) >= 32) && ((scode) < DIOII_SCBASE))
/* macros to read device IDs, given base address */
-#define DIO_ID(baseaddr) readb((baseaddr) + DIO_IDOFF)
-#define DIO_SECID(baseaddr) readb((baseaddr) + DIO_SECIDOFF)
+#define DIO_ID(baseaddr) in_8((baseaddr) + DIO_IDOFF)
+#define DIO_SECID(baseaddr) in_8((baseaddr) + DIO_SECIDOFF)
/* extract the interrupt level */
-#define DIO_IPL(baseaddr) (((readb((baseaddr) + DIO_IPLOFF) >> 4) & 0x03) + 3)
+#define DIO_IPL(baseaddr) (((in_8((baseaddr) + DIO_IPLOFF) >> 4) & 0x03) + 3)
/* find the size of a DIO-II board's address space.
* DIO boards are all fixed length.
*/
-#define DIOII_SIZE(baseaddr) ((readb((baseaddr) + DIOII_SIZEOFF) + 1) * 0x100000)
+#define DIOII_SIZE(baseaddr) ((in_8((baseaddr) + DIOII_SIZEOFF) + 1) * 0x100000)
/* general purpose macro for both DIO and DIO-II */
#define DIO_SIZE(scode, base) (DIO_ISDIOII((scode)) ? DIOII_SIZE((base)) : DIO_DEVSIZE)
@@ -109,7 +109,7 @@
#define DIO_ID_DCMREM 0x85 /* 98642A serial MUX */
#define DIO_DESC_DCMREM "98642A DCMREM serial MUX"
#define DIO_ID_LAN 0x15 /* 98643A LAN */
-#define DIO_DESC_LAN "98643A LAN"
+#define DIO_DESC_LAN "98643A LANCE ethernet"
#define DIO_ID_FHPIB 0x08 /* 98625A/98625B fast HP-IB */
#define DIO_DESC_FHPIB "98625A/98625B fast HPIB"
#define DIO_ID_NHPIB 0x80 /* 98624A HP-IB (normal ie slow) */
@@ -192,10 +192,10 @@
* identify them...
*/
-extern void dio_init(void);
extern int dio_find(int deviceid);
extern void *dio_scodetoviraddr(int scode);
extern int dio_scodetoipl(int scode);
+extern const char *dio_scodetoname(int scode);
extern void dio_config_board(int scode);
extern void dio_unconfig_board(int scode);
diff --git a/include/linux/generic_serial.h b/include/linux/generic_serial.h
index 5c30fc929cab..cc5441324f3c 100644
--- a/include/linux/generic_serial.h
+++ b/include/linux/generic_serial.h
@@ -45,7 +45,7 @@ struct gs_port {
int count;
int blocked_open;
struct tty_struct *tty;
- int event;
+ unsigned long event;
unsigned short closing_wait;
int close_delay;
struct real_driver *rd;
diff --git a/include/linux/intermezzo_fs.h b/include/linux/intermezzo_fs.h
index a0fe6dbc4622..07e89b41d407 100644
--- a/include/linux/intermezzo_fs.h
+++ b/include/linux/intermezzo_fs.h
@@ -19,6 +19,7 @@
#ifdef __KERNEL__
#include <linux/smp.h>
#include <linux/fsfilter.h>
+#include <linux/namei.h>
/* fixups for fs.h */
#ifndef fs_down
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 3870d26066e9..09e6b86ee763 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -44,6 +44,16 @@ enum {
#include <asm/hardirq.h>
#include <asm/softirq.h>
+/*
+ * Temporary defines for UP kernels, until all code gets fixed.
+ */
+#if !CONFIG_SMP
+# define cli() local_irq_disable()
+# define sti() local_irq_enable()
+# define save_flags(x) local_irq_save(x)
+# define restore_flags(x) local_irq_restore(x)
+# define save_and_cli(x) local_irq_save_off(x)
+#endif
/* PLEASE, avoid to allocate new softirqs, if you need not _really_ high
diff --git a/include/linux/nubus.h b/include/linux/nubus.h
index 0e0ef4f73d6d..a3fd37b33fdd 100644
--- a/include/linux/nubus.h
+++ b/include/linux/nubus.h
@@ -12,6 +12,10 @@
#ifndef LINUX_NUBUS_H
#define LINUX_NUBUS_H
+#ifdef __KERNEL__
+#include <asm/nubus.h>
+#endif
+
enum nubus_category {
NUBUS_CAT_BOARD = 0x0001,
NUBUS_CAT_DISPLAY = 0x0003,
@@ -262,7 +266,6 @@ extern struct nubus_dev* nubus_devices;
extern struct nubus_board* nubus_boards;
/* Generic NuBus interface functions, modelled after the PCI interface */
-extern void nubus_init(void);
void nubus_scan_bus(void);
extern void nubus_proc_init(void);
int get_nubus_list(char *buf);
diff --git a/include/linux/pmu.h b/include/linux/pmu.h
index b8e09e891eb9..bf0ed74e9826 100644
--- a/include/linux/pmu.h
+++ b/include/linux/pmu.h
@@ -75,6 +75,8 @@ enum {
PMU_HEATHROW_BASED, /* PowerBook G3 series */
PMU_PADDINGTON_BASED, /* 1999 PowerBook G3 */
PMU_KEYLARGO_BASED, /* Core99 motherboard (PMU99) */
+ PMU_68K_V1, /* 68K PMU, version 1 */
+ PMU_68K_V2, /* 68K PMU, version 2 */
};
/* PMU PMU_POWER_EVENTS commands */
diff --git a/include/linux/serial167.h b/include/linux/serial167.h
index 8886c292fcc9..2c805a1791cf 100644
--- a/include/linux/serial167.h
+++ b/include/linux/serial167.h
@@ -37,7 +37,7 @@ struct cyclades_port {
int ignore_status_mask;
int close_delay;
int IER; /* Interrupt Enable Register */
- int event;
+ unsigned long event;
unsigned long last_active;
int count; /* # of fd on device */
int x_char; /* to be pushed out ASAP */
diff --git a/include/linux/smp.h b/include/linux/smp.h
index 6e89d1d34bd8..fff7c165ac2d 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -95,7 +95,8 @@ static inline void smp_send_reschedule_all(void) { }
#endif /* !SMP */
-#define get_cpu() ({ preempt_disable(); smp_processor_id(); })
-#define put_cpu() preempt_enable()
+#define get_cpu() ({ preempt_disable(); smp_processor_id(); })
+#define put_cpu() preempt_enable()
+#define put_cpu_no_resched() preempt_enable_no_resched()
#endif /* __LINUX_SMP_H */
diff --git a/include/linux/trdevice.h b/include/linux/trdevice.h
index f91119ab066d..4df6addff7c8 100644
--- a/include/linux/trdevice.h
+++ b/include/linux/trdevice.h
@@ -33,6 +33,7 @@ extern int tr_header(struct sk_buff *skb, struct net_device *dev,
void *saddr, unsigned len);
extern int tr_rebuild_header(struct sk_buff *skb);
extern unsigned short tr_type_trans(struct sk_buff *skb, struct net_device *dev);
+extern void tr_source_route(struct sk_buff *skb, struct trh_hdr *trh, struct net_device *dev);
extern struct net_device *init_trdev(struct net_device *dev, int sizeof_priv);
extern struct net_device *alloc_trdev(int sizeof_priv);
extern int register_trdev(struct net_device *dev);
diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index af3ec94cb2ad..7b1ae2718f3e 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -8,6 +8,8 @@
#ifndef WRITEBACK_H
#define WRITEBACK_H
+struct backing_dev_info;
+
extern spinlock_t inode_lock;
extern struct list_head inode_in_use;
extern struct list_head inode_unused;
@@ -38,6 +40,9 @@ void wake_up_inode(struct inode *inode);
void __wait_on_inode(struct inode * inode);
void sync_inodes_sb(struct super_block *, int wait);
void sync_inodes(int wait);
+void writeback_backing_dev(struct backing_dev_info *bdi, int *nr_to_write,
+ enum writeback_sync_modes sync_mode,
+ unsigned long *older_than_this);
/* writeback.h requires fs.h; it, too, is not included from here. */
static inline void wait_on_inode(struct inode *inode)
diff --git a/include/linux/zorro.h b/include/linux/zorro.h
index f2a191cc5b36..38d128833a76 100644
--- a/include/linux/zorro.h
+++ b/include/linux/zorro.h
@@ -199,7 +199,7 @@ extern struct zorro_dev *zorro_find_device(zorro_id id,
* the corresponding bits.
*/
-extern __u32 zorro_unused_z2ram[4];
+extern bitmap_member(zorro_unused_z2ram, 128);
#define Z2RAM_START (0x00200000)
#define Z2RAM_END (0x00a00000)
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-27 12:55:21 +0000