Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (74 commits) fix do_sys_open() prototype sysfs: trivial: fix sysfs_create_file kerneldoc spelling mistake Documentation: Fix typo in SubmitChecklist. Typo: depricated -> deprecated Add missing profile=kvm option to Documentation/kernel-parameters.txt fix typo about TBI in e1000 comment proc.txt: Add /proc/stat field small documentation fixes Fix compiler warning in smount example program from sharedsubtree.txt docs/sysfs: add missing word to sysfs attribute explanation documentation/ext3: grammar fixes Documentation/java.txt: typo and grammar fixes Documentation/filesystems/vfs.txt: typo fix include/asm-*/system.h: remove unused set_rmb(), set_wmb() macros trivial copy_data_pages() tidy up Fix typo in arch/x86/kernel/tsc_32.c file link fix for Pegasus USB net driver help remove unused return within void return function Typo fixes retrun -> return x86 hpet.h: remove broken links ...
此提交包含在：
Linus Torvalds
@@ -73,7 +73,7 @@
|
||||
|
||||
Jean-Jacques Michel - bug fix
|
||||
|
||||
Tobias Ringstr<EFBFBD>m - Rx interrupt status checking suggestion
|
||||
Tobias Ringström - Rx interrupt status checking suggestion
|
||||
|
||||
Andrew Morton - Clear blocked signals, avoid
|
||||
buffer overrun setting current->comm.
|
||||
|
||||
@@ -855,7 +855,7 @@ config BFIN_MAC_USE_L1
|
||||
depends on BFIN_MAC && BF537
|
||||
default y
|
||||
help
|
||||
To get maximum network performace, you should use L1 memory as rx/tx buffers.
|
||||
To get maximum network performance, you should use L1 memory as rx/tx buffers.
|
||||
Say N here if you want to reserve L1 memory for other uses.
|
||||
|
||||
config BFIN_TX_DESC_NUM
|
||||
|
||||
@@ -1111,7 +1111,7 @@ static struct net_device_stats *amd8111e_get_stats(struct net_device * dev)
|
||||
|
||||
return new_stats;
|
||||
}
|
||||
/* This function recalculate the interupt coalescing mode on every interrupt
|
||||
/* This function recalculate the interrupt coalescing mode on every interrupt
|
||||
according to the datarate and the packet rate.
|
||||
*/
|
||||
static int amd8111e_calc_coalesce(struct net_device *dev)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* Amiga Linux/m68k Ariadne Ethernet Driver
|
||||
*
|
||||
* <EFBFBD> Copyright 1995-2003 by Geert Uytterhoeven (geert@linux-m68k.org)
|
||||
* © Copyright 1995-2003 by Geert Uytterhoeven (geert@linux-m68k.org)
|
||||
* Peter De Schrijver (p2@mind.be)
|
||||
*
|
||||
* ---------------------------------------------------------------------------
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* Amiga Linux/m68k Ariadne Ethernet Driver
|
||||
*
|
||||
* <EFBFBD> Copyright 1995 by Geert Uytterhoeven (geert@linux-m68k.org)
|
||||
* © Copyright 1995 by Geert Uytterhoeven (geert@linux-m68k.org)
|
||||
* Peter De Schrijver
|
||||
* (Peter.DeSchrijver@linux.cc.kuleuven.ac.be)
|
||||
*
|
||||
|
||||
@@ -542,7 +542,7 @@ static struct {
|
||||
static int num_ifs;
|
||||
|
||||
/*
|
||||
* Setup the base address and interupt of the Au1xxx ethernet macs
|
||||
* Setup the base address and interrupt of the Au1xxx ethernet macs
|
||||
* based on cpu type and whether the interface is enabled in sys_pinfunc
|
||||
* register. The last interface is enabled if SYS_PF_NI2 (bit 4) is 0.
|
||||
*/
|
||||
|
||||
@@ -55,7 +55,7 @@ static int expected_refcount = -1;
|
||||
static struct class *netdev_class;
|
||||
/*--------------------------- Data Structures -----------------------------*/
|
||||
|
||||
/* Bonding sysfs lock. Why can't we just use the subsytem lock?
|
||||
/* Bonding sysfs lock. Why can't we just use the subsystem lock?
|
||||
* Because kobject_register tries to acquire the subsystem lock. If
|
||||
* we already hold the lock (which we would if the user was creating
|
||||
* a new bond through the sysfs interface), we deadlock.
|
||||
|
||||
@@ -1324,7 +1324,7 @@ static inline int e100_exec_cb_wait(struct nic *nic, struct sk_buff *skb,
|
||||
if (!--counter) break;
|
||||
}
|
||||
|
||||
/* ack any interupts, something could have been set */
|
||||
/* ack any interrupts, something could have been set */
|
||||
iowrite8(~0, &nic->csr->scb.stat_ack);
|
||||
|
||||
/* if the command failed, or is not OK, notify and return */
|
||||
|
||||
@@ -3590,7 +3590,7 @@ e1000_update_stats(struct e1000_adapter *adapter)
|
||||
|
||||
spin_lock_irqsave(&adapter->stats_lock, flags);
|
||||
|
||||
/* these counters are modified from e1000_adjust_tbi_stats,
|
||||
/* these counters are modified from e1000_tbi_adjust_stats,
|
||||
* called from the interrupt context, so they must only
|
||||
* be written while holding adapter->stats_lock
|
||||
*/
|
||||
|
||||
@@ -111,7 +111,6 @@ MODULE_AUTHOR("Myson or whoever");
|
||||
MODULE_DESCRIPTION("Myson MTD-8xx 100/10M Ethernet PCI Adapter Driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
module_param(max_interrupt_work, int, 0);
|
||||
//MODULE_PARM(min_pci_latency, "i");
|
||||
module_param(debug, int, 0);
|
||||
module_param(rx_copybreak, int, 0);
|
||||
module_param(multicast_filter_limit, int, 0);
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* devices like TTY. It interfaces between a raw TTY and the
|
||||
* kernel's AX.25 protocol layers.
|
||||
*
|
||||
* Authors: Andreas K<EFBFBD>nsgen <ajk@iehk.rwth-aachen.de>
|
||||
* Authors: Andreas Könsgen <ajk@iehk.rwth-aachen.de>
|
||||
* Ralf Baechle DL5RB <ralf@linux-mips.org>
|
||||
*
|
||||
* Quite a lot of stuff "stolen" by Joerg Reuter from slip.c, written by
|
||||
|
||||
@@ -64,7 +64,7 @@ config DMASCC
|
||||
dmascc. If you don't pass any parameter to the driver, all
|
||||
possible I/O addresses are probed. This could irritate other devices
|
||||
that are currently not in use. You may specify the list of addresses
|
||||
to be probed by "dmascc=addr1,addr2,..." (when compiled into the
|
||||
to be probed by "dmascc.io=addr1,addr2,..." (when compiled into the
|
||||
kernel image) or "io=addr1,addr2,..." (when loaded as a module). The
|
||||
network interfaces will be called dmascc0 and dmascc1 for the board
|
||||
detected first, dmascc2 and dmascc3 for the second one, and so on.
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
* published by the Free Software Foundation; either version 2 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* Neither Dag Brattli nor University of Troms<EFBFBD> admit liability nor
|
||||
* Neither Dag Brattli nor University of Tromsø admit liability nor
|
||||
* provide warranty for any of this software. This material is
|
||||
* provided "AS-IS" and at no charge.
|
||||
*
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
* published by the Free Software Foundation; either version 2 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* Neither Dag Brattli nor University of Troms<EFBFBD> admit liability nor
|
||||
* Neither Dag Brattli nor University of Tromsø admit liability nor
|
||||
* provide warranty for any of this software. This material is
|
||||
* provided "AS-IS" and at no charge.
|
||||
*
|
||||
|
||||
@@ -595,7 +595,7 @@ toshoboe_startchip (struct toshoboe_cb *self)
|
||||
OUTB ((physaddr >> 18) & 0xff, OBOE_RING_BASE1);
|
||||
OUTB ((physaddr >> 26) & 0x3f, OBOE_RING_BASE2);
|
||||
|
||||
/*Enable DMA controler in byte mode and RX */
|
||||
/*Enable DMA controller in byte mode and RX */
|
||||
OUTB (CONFIG0H_DMA_ON, OBOE_CONFIG0H);
|
||||
|
||||
/* Start up the clocks */
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
* published by the Free Software Foundation; either version 2 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* Neither Dag Brattli nor University of Troms<EFBFBD> admit liability nor
|
||||
* Neither Dag Brattli nor University of Tromsø admit liability nor
|
||||
* provide warranty for any of this software. This material is
|
||||
* provided "AS-IS" and at no charge.
|
||||
*
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
* published by the Free Software Foundation; either version 2 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* Neither Dag Brattli nor University of Troms<EFBFBD> admit liability nor
|
||||
* Neither Dag Brattli nor University of Tromsø admit liability nor
|
||||
* provide warranty for any of this software. This material is
|
||||
* provided "AS-IS" and at no charge.
|
||||
*
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
* published by the Free Software Foundation; either version 2 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* Neither Dag Brattli nor University of Troms<EFBFBD> admit liability nor
|
||||
* Neither Dag Brattli nor University of Tromsø admit liability nor
|
||||
* provide warranty for any of this software. This material is
|
||||
* provided "AS-IS" and at no charge.
|
||||
*
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
* published by the Free Software Foundation; either version 2 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* Neither Dag Brattli nor University of Troms<EFBFBD> admit liability nor
|
||||
* Neither Dag Brattli nor University of Tromsø admit liability nor
|
||||
* provide warranty for any of this software. This material is
|
||||
* provided "AS-IS" and at no charge.
|
||||
*
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
* published by the Free Software Foundation; either version 2 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* Neither Dag Brattli nor University of Troms<EFBFBD> admit liability nor
|
||||
* Neither Dag Brattli nor University of Tromsø admit liability nor
|
||||
* provide warranty for any of this software. This material is
|
||||
* provided "AS-IS" and at no charge.
|
||||
*
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
* published by the Free Software Foundation; either version 2 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* Neither Dag Brattli nor University of Troms<EFBFBD> admit liability nor
|
||||
* Neither Dag Brattli nor University of Tromsø admit liability nor
|
||||
* provide warranty for any of this software. This material is
|
||||
* provided "AS-IS" and at no charge.
|
||||
*
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
* published by the Free Software Foundation; either version 2 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* Neither Dag Brattli nor University of Troms<EFBFBD> admit liability nor
|
||||
* Neither Dag Brattli nor University of Tromsø admit liability nor
|
||||
* provide warranty for any of this software. This material is
|
||||
* provided "AS-IS" and at no charge.
|
||||
*
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
* published by the Free Software Foundation; either version 2 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* Neither Dag Brattli nor University of Troms<EFBFBD> admit liability nor
|
||||
* Neither Dag Brattli nor University of Tromsø admit liability nor
|
||||
* provide warranty for any of this software. This material is
|
||||
* provided "AS-IS" and at no charge.
|
||||
*
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
* published by the Free Software Foundation; either version 2 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* Neither Dag Brattli nor University of Troms<EFBFBD> admit liability nor
|
||||
* Neither Dag Brattli nor University of Tromsø admit liability nor
|
||||
* provide warranty for any of this software. This material is
|
||||
* provided "AS-IS" and at no charge.
|
||||
*
|
||||
|
||||
@@ -996,7 +996,7 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,
|
||||
a delay. Note that pre-2.0.34 kernels had a cache-alignment bug that
|
||||
made udelay() unreliable.
|
||||
The old method of using an ISA access as a delay, __SLOW_DOWN_IO__, is
|
||||
depricated.
|
||||
deprecated.
|
||||
*/
|
||||
#define eeprom_delay(ee_addr) readl(ee_addr)
|
||||
|
||||
|
||||
@@ -1223,7 +1223,7 @@ static irqreturn_t smc911x_interrupt(int irq, void *dev_id)
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Handle PHY interupt condition */
|
||||
/* Handle PHY interrupt condition */
|
||||
if (status & INT_STS_PHY_INT_) {
|
||||
DBG(SMC_DEBUG_MISC, "%s: PHY irq\n", dev->name);
|
||||
smc911x_phy_interrupt(dev);
|
||||
|
||||
@@ -1639,7 +1639,7 @@ spider_net_handle_error_irq(struct spider_net_card *card, u32 status_reg)
|
||||
|
||||
/**
|
||||
* spider_net_interrupt - interrupt handler for spider_net
|
||||
* @irq: interupt number
|
||||
* @irq: interrupt number
|
||||
* @ptr: pointer to net_device
|
||||
* @regs: PU registers
|
||||
*
|
||||
|
||||
@@ -1654,7 +1654,7 @@ tc35815_rx(struct net_device *dev)
|
||||
panic_queues(dev);
|
||||
}
|
||||
#endif
|
||||
/* pass BD to controler */
|
||||
/* pass BD to controller */
|
||||
#ifndef TC35815_USE_PACKEDBUFFER
|
||||
if (!lp->rx_skbs[curid].skb) {
|
||||
lp->rx_skbs[curid].skb =
|
||||
@@ -1694,7 +1694,7 @@ tc35815_rx(struct net_device *dev)
|
||||
}
|
||||
#endif
|
||||
for (i = 0; i < (bd_count + 1) / 2 + 1; i++) {
|
||||
/* pass FD to controler */
|
||||
/* pass FD to controller */
|
||||
#ifdef DEBUG
|
||||
lp->rfd_cur->fd.FDNext = cpu_to_le32(0xdeaddead);
|
||||
#else
|
||||
|
||||
@@ -483,7 +483,7 @@ err_out_netdev:
|
||||
a delay. Note that pre-2.0.34 kernels had a cache-alignment bug that
|
||||
made udelay() unreliable.
|
||||
The old method of using an ISA access as a delay, __SLOW_DOWN_IO__, is
|
||||
depricated.
|
||||
deprecated.
|
||||
*/
|
||||
#define eeprom_delay(ee_addr) ioread32(ee_addr)
|
||||
|
||||
|
||||
@@ -71,7 +71,7 @@ config USB_PEGASUS
|
||||
select MII
|
||||
---help---
|
||||
Say Y here if you know you have Pegasus or Pegasus-II based adapter.
|
||||
If in doubt then look at <file:drivers/usb/net/pegasus.h> for the
|
||||
If in doubt then look at <file:drivers/net/usb/pegasus.h> for the
|
||||
complete list of supported devices.
|
||||
|
||||
If your particular adapter is not in the list and you are _sure_ it
|
||||
|
||||
@@ -1648,7 +1648,7 @@ static int velocity_alloc_rx_buf(struct velocity_info *vptr, int idx)
|
||||
*
|
||||
* Scan the queues looking for transmitted packets that
|
||||
* we can complete and clean up. Update any statistics as
|
||||
* neccessary/
|
||||
* necessary/
|
||||
*/
|
||||
|
||||
static int velocity_tx_srv(struct velocity_info *vptr, u32 status)
|
||||
|
||||
@@ -87,7 +87,7 @@ void bcm43xx_generate_txhdr(struct bcm43xx_private *bcm,
|
||||
|
||||
/* RX header as received from the hardware. */
|
||||
struct bcm43xx_rxhdr {
|
||||
/* Frame Length. Must be generated explicitely in PIO mode. */
|
||||
/* Frame Length. Must be generated explicitly in PIO mode. */
|
||||
__le16 frame_length;
|
||||
PAD_BYTES(2);
|
||||
/* Flags field 1 */
|
||||
|
||||
@@ -6047,7 +6047,7 @@ static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev,
|
||||
* ends up causing problems. So, we just handle
|
||||
* the WX extensions through the ipw2100_ioctl interface */
|
||||
|
||||
/* memset() puts everything to 0, so we only have explicitely set
|
||||
/* memset() puts everything to 0, so we only have explicitly set
|
||||
* those values that need to be something else */
|
||||
|
||||
/* If power management is turned on, default to AUTO mode */
|
||||
@@ -7509,7 +7509,7 @@ static int ipw2100_wx_set_power(struct net_device *dev,
|
||||
switch (wrqu->power.flags & IW_POWER_MODE) {
|
||||
case IW_POWER_ON: /* If not specified */
|
||||
case IW_POWER_MODE: /* If set all mask */
|
||||
case IW_POWER_ALL_R: /* If explicitely state all */
|
||||
case IW_POWER_ALL_R: /* If explicitly state all */
|
||||
break;
|
||||
default: /* Otherwise we don't support it */
|
||||
IPW_DEBUG_WX("SET PM Mode: %X not supported.\n",
|
||||
|
||||
@@ -9603,7 +9603,7 @@ static int ipw_wx_set_power(struct net_device *dev,
|
||||
switch (wrqu->power.flags & IW_POWER_MODE) {
|
||||
case IW_POWER_ON: /* If not specified */
|
||||
case IW_POWER_MODE: /* If set all mask */
|
||||
case IW_POWER_ALL_R: /* If explicitely state all */
|
||||
case IW_POWER_ALL_R: /* If explicitly state all */
|
||||
break;
|
||||
default: /* Otherwise we don't support it */
|
||||
IPW_DEBUG_WX("SET PM Mode: %X not supported.\n",
|
||||
|
||||
@@ -4,18 +4,18 @@
|
||||
* Version: 0.4.1
|
||||
* Description: Netwave AirSurfer Wireless LAN PC Card driver
|
||||
* Status: Experimental.
|
||||
* Authors: John Markus Bj<EFBFBD>rndalen <johnm@cs.uit.no>
|
||||
* Authors: John Markus Bjørndalen <johnm@cs.uit.no>
|
||||
* Dag Brattli <dagb@cs.uit.no>
|
||||
* David Hinds <dahinds@users.sourceforge.net>
|
||||
* Created at: A long time ago!
|
||||
* Modified at: Mon Nov 10 11:54:37 1997
|
||||
* Modified by: Dag Brattli <dagb@cs.uit.no>
|
||||
*
|
||||
* Copyright (c) 1997 University of Troms<EFBFBD>, Norway
|
||||
* Copyright (c) 1997 University of Tromsø, Norway
|
||||
*
|
||||
* Revision History:
|
||||
*
|
||||
* 08-Nov-97 15:14:47 John Markus Bj<EFBFBD>rndalen <johnm@cs.uit.no>
|
||||
* 08-Nov-97 15:14:47 John Markus Bjørndalen <johnm@cs.uit.no>
|
||||
* - Fixed some bugs in netwave_rx and cleaned it up a bit.
|
||||
* (One of the bugs would have destroyed packets when receiving
|
||||
* multiple packets per interrupt).
|
||||
@@ -158,7 +158,7 @@ static int pc_debug = PCMCIA_DEBUG;
|
||||
module_param(pc_debug, int, 0);
|
||||
#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
|
||||
static char *version =
|
||||
"netwave_cs.c 0.3.0 Thu Jul 17 14:36:02 1997 (John Markus Bj<EFBFBD>rndalen)\n";
|
||||
"netwave_cs.c 0.3.0 Thu Jul 17 14:36:02 1997 (John Markus Bjørndalen)\n";
|
||||
#else
|
||||
#define DEBUG(n, args...)
|
||||
#endif
|
||||
|
||||
新增問題並參考
封鎖使用者