summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/asm-sparc/termios.h4
-rw-r--r--include/asm-sparc64/termios.h4
-rw-r--r--include/linux/fs.h4
-rw-r--r--include/linux/hiddev.h2
-rw-r--r--include/linux/ide.h1
-rw-r--r--include/linux/if_frad.h4
-rw-r--r--include/linux/initrd.h2
-rw-r--r--include/linux/netdevice.h4
-rw-r--r--include/linux/sysctl.h8
-rw-r--r--include/net/profile.h312
-rw-r--r--include/scsi/scsi_device.h2
-rw-r--r--include/scsi/scsi_request.h2
12 files changed, 23 insertions, 326 deletions
diff --git a/include/asm-sparc/termios.h b/include/asm-sparc/termios.h
index 11f174e6b3c3..48ba080c0794 100644
--- a/include/asm-sparc/termios.h
+++ b/include/asm-sparc/termios.h
@@ -73,6 +73,7 @@ struct winsize {
#define N_HCI 15 /* Bluetooth HCI UART */
#ifdef __KERNEL__
+#include <linux/module.h>
/*
* c_cc characters in the termio structure. Oh, how I love being
@@ -168,6 +169,9 @@ struct winsize {
0; \
})
+#define MODULE_ALIAS_LDISC(ldisc) \
+ MODULE_ALIAS("tty-ldisc-" __stringify(ldisc))
+
#endif /* __KERNEL__ */
#endif /* _SPARC_TERMIOS_H */
diff --git a/include/asm-sparc64/termios.h b/include/asm-sparc64/termios.h
index d29aa87ad90b..4e7fef518a25 100644
--- a/include/asm-sparc64/termios.h
+++ b/include/asm-sparc64/termios.h
@@ -73,6 +73,7 @@ struct winsize {
#define N_HCI 15 /* Bluetooth HCI UART */
#ifdef __KERNEL__
+#include <linux/module.h>
/*
* c_cc characters in the termio structure. Oh, how I love being
@@ -167,6 +168,9 @@ struct winsize {
0; \
})
+#define MODULE_ALIAS_LDISC(ldisc) \
+ MODULE_ALIAS("tty-ldisc-" __stringify(ldisc))
+
#endif /* __KERNEL__ */
#endif /* _SPARC64_TERMIOS_H */
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 936f34c469dd..87ae270bf96c 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1391,10 +1391,6 @@ extern int simple_fill_super(struct super_block *, int, struct tree_descr *);
extern int simple_pin_fs(char *name, struct vfsmount **mount, int *count);
extern void simple_release_fs(struct vfsmount **mount, int *count);
-#ifdef CONFIG_BLK_DEV_INITRD
-extern unsigned int real_root_dev;
-#endif
-
extern int inode_change_ok(struct inode *, struct iattr *);
extern int inode_setattr(struct inode *, struct iattr *);
diff --git a/include/linux/hiddev.h b/include/linux/hiddev.h
index dc6d8dd843b5..9e6d27476a74 100644
--- a/include/linux/hiddev.h
+++ b/include/linux/hiddev.h
@@ -207,7 +207,7 @@ void hiddev_hid_event(struct hid_device *hid, struct hid_field *field,
struct hid_usage *usage, __s32 value, struct pt_regs *regs);
void hiddev_report_event(struct hid_device *hid, struct hid_report *report);
int __init hiddev_init(void);
-void __exit hiddev_exit(void);
+void hiddev_exit(void);
#else
static inline int hiddev_connect(struct hid_device *hid) { return -1; }
static inline void hiddev_disconnect(struct hid_device *hid) { }
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 4664fd44a986..e7c50528e10e 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1218,7 +1218,6 @@ typedef struct ide_driver_s {
const char *version;
u8 media;
unsigned busy : 1;
- unsigned supports_dma : 1;
unsigned supports_dsc_overlap : 1;
int (*cleanup)(ide_drive_t *);
int (*shutdown)(ide_drive_t *);
diff --git a/include/linux/if_frad.h b/include/linux/if_frad.h
index 975aad03d762..3d9fc5d43803 100644
--- a/include/linux/if_frad.h
+++ b/include/linux/if_frad.h
@@ -155,9 +155,11 @@ struct frhdr
struct dlci_local
{
struct net_device_stats stats;
- struct net_device *slave;
+ struct net_device *master;
+ struct net_device *slave;
struct dlci_conf config;
int configured;
+ struct list_head list;
/* callback function */
void (*receive)(struct sk_buff *skb, struct net_device *);
diff --git a/include/linux/initrd.h b/include/linux/initrd.h
index 32452d53dac3..55289d261b4f 100644
--- a/include/linux/initrd.h
+++ b/include/linux/initrd.h
@@ -16,3 +16,5 @@ extern int initrd_below_start_ok;
/* free_initrd_mem always gets called with the next two as arguments.. */
extern unsigned long initrd_start, initrd_end;
extern void free_initrd_mem(unsigned long, unsigned long);
+
+extern unsigned int real_root_dev;
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index dfc1aa47f35c..c99e53fed30e 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -37,9 +37,6 @@
#ifdef __KERNEL__
#include <linux/config.h>
-#ifdef CONFIG_NET_PROFILE
-#include <net/profile.h>
-#endif
struct divert_blk;
struct vlan_group;
@@ -498,6 +495,7 @@ extern struct net_device loopback_dev; /* The loopback */
extern struct net_device *dev_base; /* All devices */
extern rwlock_t dev_base_lock; /* Device list lock */
+extern void probe_old_netdevs(void);
extern int netdev_boot_setup_add(char *name, struct ifmap *map);
extern int netdev_boot_setup_check(struct net_device *dev);
extern struct net_device *dev_getbyhwaddr(unsigned short type, char *hwaddr);
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index c48edf4a551e..38c43d95a616 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -603,7 +603,8 @@ enum {
DEV_HWMON=2,
DEV_PARPORT=3,
DEV_RAID=4,
- DEV_MAC_HID=5
+ DEV_MAC_HID=5,
+ DEV_SCSI=6,
};
/* /proc/sys/dev/cdrom */
@@ -664,6 +665,11 @@ enum {
DEV_MAC_HID_ADB_MOUSE_SENDS_KEYCODES=6
};
+/* /proc/sys/dev/scsi */
+enum {
+ DEV_SCSI_LOGGING_LEVEL=1,
+};
+
/* /proc/sys/abi */
enum
{
diff --git a/include/net/profile.h b/include/net/profile.h
deleted file mode 100644
index fd6a3b346990..000000000000
--- a/include/net/profile.h
+++ /dev/null
@@ -1,312 +0,0 @@
-#include <linux/config.h> /* for CONFIG_NET_PROFILE */
-#ifndef _NET_PROFILE_H_
-#define _NET_PROFILE_H_ 1
-
-#ifdef CONFIG_NET_PROFILE
-
-#include <linux/types.h>
-#include <linux/time.h>
-#include <linux/kernel.h>
-#include <asm/system.h>
-
-#ifdef CONFIG_X86_TSC
-#include <asm/msr.h>
-#endif
-
-struct net_profile_slot
-{
- char id[16];
- struct net_profile_slot *next;
- struct timeval entered;
- struct timeval accumulator;
- struct timeval irq;
- int hits;
- int active;
- int underflow;
-};
-
-extern atomic_t net_profile_active;
-extern struct timeval net_profile_adjust;
-extern void net_profile_irq_adjust(struct timeval *entered, struct timeval* leaved);
-
-#ifdef CONFIG_X86_TSC
-
-static inline void net_profile_stamp(struct timeval *pstamp)
-{
- rdtsc(pstamp->tv_usec, pstamp->tv_sec);
-}
-
-static inline void net_profile_accumulate(struct timeval *entered,
- struct timeval *leaved,
- struct timeval *acc)
-{
- __asm__ __volatile__ ("subl %2,%0\n\t"
- "sbbl %3,%1\n\t"
- "addl %4,%0\n\t"
- "adcl %5,%1\n\t"
- "subl net_profile_adjust+4,%0\n\t"
- "sbbl $0,%1\n\t"
- : "=r" (acc->tv_usec), "=r" (acc->tv_sec)
- : "g" (entered->tv_usec), "g" (entered->tv_sec),
- "g" (leaved->tv_usec), "g" (leaved->tv_sec),
- "0" (acc->tv_usec), "1" (acc->tv_sec));
-}
-
-static inline void net_profile_sub(struct timeval *sub,
- struct timeval *acc)
-{
- __asm__ __volatile__ ("subl %2,%0\n\t"
- "sbbl %3,%1\n\t"
- : "=r" (acc->tv_usec), "=r" (acc->tv_sec)
- : "g" (sub->tv_usec), "g" (sub->tv_sec),
- "0" (acc->tv_usec), "1" (acc->tv_sec));
-}
-
-static inline void net_profile_add(struct timeval *add,
- struct timeval *acc)
-{
- __asm__ __volatile__ ("addl %2,%0\n\t"
- "adcl %3,%1\n\t"
- : "=r" (acc->tv_usec), "=r" (acc->tv_sec)
- : "g" (add->tv_usec), "g" (add->tv_sec),
- "0" (acc->tv_usec), "1" (acc->tv_sec));
-}
-
-
-#elif defined (__alpha__)
-
-extern __u32 alpha_lo;
-extern long alpha_hi;
-
-/* On alpha cycle counter has only 32 bits :-( :-( */
-
-static inline void net_profile_stamp(struct timeval *pstamp)
-{
- __u32 result;
- __asm__ __volatile__ ("rpcc %0" : "r="(result));
- if (result <= alpha_lo)
- alpha_hi++;
- alpha_lo = result;
- pstamp->tv_sec = alpha_hi;
- pstamp->tv_usec = alpha_lo;
-}
-
-static inline void net_profile_accumulate(struct timeval *entered,
- struct timeval *leaved,
- struct timeval *acc)
-{
- time_t usecs = acc->tv_usec + leaved->tv_usec - entered->tv_usec
- - net_profile_adjust.tv_usec;
- time_t secs = acc->tv_sec + leaved->tv_sec - entered->tv_sec;
-
- if (usecs >= 0x100000000L) {
- usecs -= 0x100000000L;
- secs++;
- } else if (usecs < -0x100000000L) {
- usecs += 0x200000000L;
- secs -= 2;
- } else if (usecs < 0) {
- usecs += 0x100000000L;
- secs--;
- }
- acc->tv_sec = secs;
- acc->tv_usec = usecs;
-}
-
-static inline void net_profile_sub(struct timeval *entered,
- struct timeval *leaved)
-{
- time_t usecs = leaved->tv_usec - entered->tv_usec;
- time_t secs = leaved->tv_sec - entered->tv_sec;
-
- if (usecs < 0) {
- usecs += 0x100000000L;
- secs--;
- }
- leaved->tv_sec = secs;
- leaved->tv_usec = usecs;
-}
-
-static inline void net_profile_add(struct timeval *entered, struct timeval *leaved)
-{
- time_t usecs = leaved->tv_usec + entered->tv_usec;
- time_t secs = leaved->tv_sec + entered->tv_sec;
-
- if (usecs >= 0x100000000L) {
- usecs -= 0x100000000L;
- secs++;
- }
- leaved->tv_sec = secs;
- leaved->tv_usec = usecs;
-}
-
-
-#else
-
-static inline void net_profile_stamp(struct timeval *pstamp)
-{
- /* Not "fast" counterpart! On architectures without
- cpu clock "fast" routine is absolutely useless in this
- situation. do_gettimeofday still says something on slow-slow-slow
- boxes, though it eats more cpu time than the subject of
- investigation :-) :-)
- */
- do_gettimeofday(pstamp);
-}
-
-static inline void net_profile_accumulate(struct timeval *entered,
- struct timeval *leaved,
- struct timeval *acc)
-{
- time_t usecs = acc->tv_usec + leaved->tv_usec - entered->tv_usec
- - net_profile_adjust.tv_usec;
- time_t secs = acc->tv_sec + leaved->tv_sec - entered->tv_sec;
-
- if (usecs >= 1000000) {
- usecs -= 1000000;
- secs++;
- } else if (usecs < -1000000) {
- usecs += 2000000;
- secs -= 2;
- } else if (usecs < 0) {
- usecs += 1000000;
- secs--;
- }
- acc->tv_sec = secs;
- acc->tv_usec = usecs;
-}
-
-static inline void net_profile_sub(struct timeval *entered,
- struct timeval *leaved)
-{
- time_t usecs = leaved->tv_usec - entered->tv_usec;
- time_t secs = leaved->tv_sec - entered->tv_sec;
-
- if (usecs < 0) {
- usecs += 1000000;
- secs--;
- }
- leaved->tv_sec = secs;
- leaved->tv_usec = usecs;
-}
-
-static inline void net_profile_add(struct timeval *entered, struct timeval *leaved)
-{
- time_t usecs = leaved->tv_usec + entered->tv_usec;
- time_t secs = leaved->tv_sec + entered->tv_sec;
-
- if (usecs >= 1000000) {
- usecs -= 1000000;
- secs++;
- }
- leaved->tv_sec = secs;
- leaved->tv_usec = usecs;
-}
-
-
-
-#endif
-
-static inline void net_profile_enter(struct net_profile_slot *s)
-{
- unsigned long flags;
-
- save_flags(flags);
- cli();
- if (s->active++ == 0) {
- net_profile_stamp(&s->entered);
- atomic_inc(&net_profile_active);
- }
- restore_flags(flags);
-}
-
-static inline void net_profile_leave_irq(struct net_profile_slot *s)
-{
- unsigned long flags;
-
- save_flags(flags);
- cli();
- if (--s->active <= 0) {
- if (s->active == 0) {
- struct timeval curr_pstamp;
- net_profile_stamp(&curr_pstamp);
- net_profile_accumulate(&s->entered, &curr_pstamp, &s->accumulator);
- if (!atomic_dec_and_test(&net_profile_active))
- net_profile_irq_adjust(&s->entered, &curr_pstamp);
- } else {
- s->underflow++;
- }
- }
- s->hits++;
- restore_flags(flags);
-}
-
-static inline void net_profile_leave(struct net_profile_slot *s)
-{
- unsigned long flags;
- save_flags(flags);
- cli();
- if (--s->active <= 0) {
- if (s->active == 0) {
- struct timeval curr_pstamp;
- net_profile_stamp(&curr_pstamp);
- net_profile_accumulate(&s->entered, &curr_pstamp, &s->accumulator);
- atomic_dec(&net_profile_active);
- } else {
- s->underflow++;
- }
- }
- s->hits++;
- restore_flags(flags);
-}
-
-
-#define NET_PROFILE_ENTER(slot) net_profile_enter(&net_prof_##slot)
-#define NET_PROFILE_LEAVE(slot) net_profile_leave(&net_prof_##slot)
-#define NET_PROFILE_LEAVE_IRQ(slot) net_profile_leave_irq(&net_prof_##slot)
-
-#define NET_PROFILE_SKB_CLEAR(skb) ({ \
- skb->pstamp.tv_usec = 0; \
-})
-
-#define NET_PROFILE_SKB_INIT(skb) ({ \
- net_profile_stamp(&skb->pstamp); \
-})
-
-#define NET_PROFILE_SKB_PASSED(skb, slot) ({ \
- if (skb->pstamp.tv_usec) { \
- struct timeval cur_pstamp = skb->pstamp; \
- net_profile_stamp(&skb->pstamp); \
- net_profile_accumulate(&cur_pstamp, &skb->pstamp, &net_prof_##slot.accumulator); \
- net_prof_##slot.hits++; \
- }})
-
-#define NET_PROFILE_DECL(slot) \
- extern struct net_profile_slot net_prof_##slot;
-
-#define NET_PROFILE_DEFINE(slot) \
- struct net_profile_slot net_prof_##slot = { #slot, };
-
-#define NET_PROFILE_REGISTER(slot) net_profile_register(&net_prof_##slot)
-#define NET_PROFILE_UNREGISTER(slot) net_profile_unregister(&net_prof_##slot)
-
-extern int net_profile_init(void);
-extern int net_profile_register(struct net_profile_slot *);
-extern int net_profile_unregister(struct net_profile_slot *);
-
-#else
-
-#define NET_PROFILE_ENTER(slot) do { /* nothing */ } while(0)
-#define NET_PROFILE_LEAVE(slot) do { /* nothing */ } while(0)
-#define NET_PROFILE_LEAVE_IRQ(slot) do { /* nothing */ } while(0)
-#define NET_PROFILE_SKB_CLEAR(skb) do { /* nothing */ } while(0)
-#define NET_PROFILE_SKB_INIT(skb) do { /* nothing */ } while(0)
-#define NET_PROFILE_SKB_PASSED(skb, slot) do { /* nothing */ } while(0)
-#define NET_PROFILE_DECL(slot)
-#define NET_PROFILE_DEFINE(slot)
-#define NET_PROFILE_REGISTER(slot) do { /* nothing */ } while(0)
-#define NET_PROFILE_UNREGISTER(slot) do { /* nothing */ } while(0)
-
-#endif
-
-#endif
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 04b8f47837a9..17cac6fdaa34 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -74,8 +74,6 @@ struct scsi_device {
unsigned wdtr:1; /* Device supports WDTR messages */
unsigned ppr:1; /* Device supports PPR messages */
unsigned tagged_supported:1; /* Supports SCSI-II tagged queuing */
- unsigned tagged_queue:1;/* This is going away!!!! Look at simple_tags
- instead!!! Please fix your driver now!! */
unsigned simple_tags:1; /* simple queue tag messages are enabled */
unsigned ordered_tags:1;/* ordered queue tag messages are enabled */
unsigned single_lun:1; /* Indicates we should only allow I/O to
diff --git a/include/scsi/scsi_request.h b/include/scsi/scsi_request.h
index d591d365c983..98719407d554 100644
--- a/include/scsi/scsi_request.h
+++ b/include/scsi/scsi_request.h
@@ -45,7 +45,7 @@ struct scsi_request {
level driver) of this request */
};
-extern struct scsi_request *scsi_allocate_request(struct scsi_device *);
+extern struct scsi_request *scsi_allocate_request(struct scsi_device *, int);
extern void scsi_release_request(struct scsi_request *);
extern void scsi_wait_req(struct scsi_request *, const void *cmnd,
void *buffer, unsigned bufflen,
generated by cgit v1.2.3 (git 2.46.0) at 2026-02-09 17:09:16 +0000