mirror of
https://github.com/torvalds/linux.git
synced 2024-12-24 11:51:27 +00:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial: (24 commits) DOC: A couple corrections and clarifications in USB doc. Generate a slightly more informative error msg for bad HZ fix typo "is" -> "if" in Makefile ext*: spelling fix prefered -> preferred DOCUMENTATION: Use newer DEFINE_SPINLOCK macro in docs. KEYS: Fix the comment to match the file name in rxrpc-type.h. RAID: remove trailing space from printk line DMA engine: typo fixes Remove unused MAX_NODES_SHIFT MAINTAINERS: Clarify access to OCFS2 development mailing list. V4L: Storage class should be before const qualifier (sn9c102) V4L: Storage class should be before const qualifier sonypi: Storage class should be before const qualifier intel_menlow: Storage class should be before const qualifier DVB: Storage class should be before const qualifier arm: Storage class should be before const qualifier ALSA: Storage class should be before const qualifier acpi: Storage class should be before const qualifier firmware_sample_driver.c: fix coding style MAINTAINERS: Add ati_remote2 driver ... Fixed up trivial conflicts in firmware_sample_driver.c
This commit is contained in:
Linus Torvalds
commit
e9b62693ae
@ -854,7 +854,7 @@ The change is shown below, in standard patch format: the
|
||||
};
|
||||
|
||||
-static DEFINE_MUTEX(cache_lock);
|
||||
+static spinlock_t cache_lock = SPIN_LOCK_UNLOCKED;
|
||||
+static DEFINE_SPINLOCK(cache_lock);
|
||||
static LIST_HEAD(cache);
|
||||
static unsigned int cache_num = 0;
|
||||
#define MAX_CACHE_SIZE 10
|
||||
@ -1238,7 +1238,7 @@ Here is the "lock-per-object" implementation:
|
||||
- int popularity;
|
||||
};
|
||||
|
||||
static spinlock_t cache_lock = SPIN_LOCK_UNLOCKED;
|
||||
static DEFINE_SPINLOCK(cache_lock);
|
||||
@@ -77,6 +84,7 @@
|
||||
obj->id = id;
|
||||
obj->popularity = 0;
|
||||
|
||||
@ -100,8 +100,8 @@
|
||||
useful documents, at the USB home page (see Resources). An excellent
|
||||
introduction to the Linux USB subsystem can be found at the USB Working
|
||||
Devices List (see Resources). It explains how the Linux USB subsystem is
|
||||
structured and introduces the reader to the concept of USB urbs, which
|
||||
are essential to USB drivers.
|
||||
structured and introduces the reader to the concept of USB urbs
|
||||
(USB Request Blocks), which are essential to USB drivers.
|
||||
</para>
|
||||
<para>
|
||||
The first thing a Linux USB driver needs to do is register itself with
|
||||
@ -162,8 +162,8 @@ static int __init usb_skel_init(void)
|
||||
module_init(usb_skel_init);
|
||||
</programlisting>
|
||||
<para>
|
||||
When the driver is unloaded from the system, it needs to unregister
|
||||
itself with the USB subsystem. This is done with the usb_unregister
|
||||
When the driver is unloaded from the system, it needs to deregister
|
||||
itself with the USB subsystem. This is done with the usb_deregister
|
||||
function:
|
||||
</para>
|
||||
<programlisting>
|
||||
@ -232,7 +232,7 @@ static int skel_probe(struct usb_interface *interface,
|
||||
were passed to the USB subsystem will be called from a user program trying
|
||||
to talk to the device. The first function called will be open, as the
|
||||
program tries to open the device for I/O. We increment our private usage
|
||||
count and save off a pointer to our internal structure in the file
|
||||
count and save a pointer to our internal structure in the file
|
||||
structure. This is done so that future calls to file operations will
|
||||
enable the driver to determine which device the user is addressing. All
|
||||
of this is done with the following code:
|
||||
@ -252,8 +252,8 @@ file->private_data = dev;
|
||||
send to the device based on the size of the write urb it has created (this
|
||||
size depends on the size of the bulk out end point that the device has).
|
||||
Then it copies the data from user space to kernel space, points the urb to
|
||||
the data and submits the urb to the USB subsystem. This can be shown in
|
||||
he following code:
|
||||
the data and submits the urb to the USB subsystem. This can be seen in
|
||||
the following code:
|
||||
</para>
|
||||
<programlisting>
|
||||
/* we can only write as much as 1 urb will hold */
|
||||
|
||||
@ -183,7 +183,7 @@ Even if the maintainer did not respond in step #4, make sure to ALWAYS
|
||||
copy the maintainer when you change their code.
|
||||
|
||||
For small patches you may want to CC the Trivial Patch Monkey
|
||||
trivial@kernel.org managed by Adrian Bunk; which collects "trivial"
|
||||
trivial@kernel.org managed by Jesper Juhl; which collects "trivial"
|
||||
patches. Trivial patches must qualify for one of the following rules:
|
||||
Spelling fixes in documentation
|
||||
Spelling fixes which could break grep(1)
|
||||
@ -196,7 +196,7 @@ patches. Trivial patches must qualify for one of the following rules:
|
||||
since people copy, as long as it's trivial)
|
||||
Any fix by the author/maintainer of the file (ie. patch monkey
|
||||
in re-transmission mode)
|
||||
URL: <http://www.kernel.org/pub/linux/kernel/people/bunk/trivial/>
|
||||
URL: <http://www.kernel.org/pub/linux/kernel/people/juhl/trivial/>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1097,7 +1097,7 @@ lock themselves, if required. Drivers that explicitly used the
|
||||
io_request_lock for serialization need to be modified accordingly.
|
||||
Usually it's as easy as adding a global lock:
|
||||
|
||||
static spinlock_t my_driver_lock = SPIN_LOCK_UNLOCKED;
|
||||
static DEFINE_SPINLOCK(my_driver_lock);
|
||||
|
||||
and passing the address to that lock to blk_init_queue().
|
||||
|
||||
|
||||
@ -43,7 +43,7 @@ would execute while the cli()-ed section is executing.
|
||||
|
||||
but from now on a more direct method of locking has to be used:
|
||||
|
||||
spinlock_t driver_lock = SPIN_LOCK_UNLOCKED;
|
||||
DEFINE_SPINLOCK(driver_lock);
|
||||
struct driver_data;
|
||||
|
||||
irq_handler (...)
|
||||
|
||||
@ -47,7 +47,6 @@
|
||||
.mm
|
||||
53c700_d.h
|
||||
53c8xx_d.h*
|
||||
BitKeeper
|
||||
COPYING
|
||||
CREDITS
|
||||
CVS
|
||||
|
||||
@ -89,8 +89,8 @@ the 2.7 era (it missed the boat for 2.5).
|
||||
You can obtain somewhat infrequent snapshots of klibc from
|
||||
ftp://ftp.kernel.org/pub/linux/libs/klibc/
|
||||
|
||||
For active users, you are better off using the klibc BitKeeper
|
||||
repositories, at http://klibc.bkbits.net/
|
||||
For active users, you are better off using the klibc git
|
||||
repository, at http://git.kernel.org/?p=libs/klibc/klibc.git
|
||||
|
||||
The standalone klibc distribution currently provides three components,
|
||||
in addition to the klibc library:
|
||||
|
||||
@ -684,6 +684,11 @@ L: linux-wireless@vger.kernel.org
|
||||
L: ath5k-devel@lists.ath5k.org
|
||||
S: Maintained
|
||||
|
||||
ATI_REMOTE2 DRIVER
|
||||
P: Ville Syrjala
|
||||
M: syrjala@sci.fi
|
||||
S: Maintained
|
||||
|
||||
ATL1 ETHERNET DRIVER
|
||||
P: Jay Cliburn
|
||||
M: jcliburn@gmail.com
|
||||
@ -2947,7 +2952,7 @@ P: Mark Fasheh
|
||||
M: mfasheh@suse.com
|
||||
P: Joel Becker
|
||||
M: joel.becker@oracle.com
|
||||
L: ocfs2-devel@oss.oracle.com
|
||||
L: ocfs2-devel@oss.oracle.com (moderated for non-subscribers)
|
||||
W: http://oss.oracle.com/projects/ocfs2/
|
||||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git
|
||||
S: Supported
|
||||
|
||||
2
Makefile
2
Makefile
@ -1538,7 +1538,7 @@ quiet_cmd_rmdirs = $(if $(wildcard $(rm-dirs)),CLEAN $(wildcard $(rm-dirs)))
|
||||
quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN $(wildcard $(rm-files)))
|
||||
cmd_rmfiles = rm -f $(rm-files)
|
||||
|
||||
# Run depmod only is we have System.map and depmod is executable
|
||||
# Run depmod only if we have System.map and depmod is executable
|
||||
# and we build for the host arch
|
||||
quiet_cmd_depmod = DEPMOD $(KERNELRELEASE)
|
||||
cmd_depmod = \
|
||||
|
||||
@ -42,7 +42,7 @@ struct pxa3xx_mfp_pin {
|
||||
static struct pxa3xx_mfp_pin mfp_table[MFP_PIN_MAX];
|
||||
|
||||
/* mapping of MFP_LPM_* definitions to MFPR_LPM_* register bits */
|
||||
const static unsigned long mfpr_lpm[] = {
|
||||
static const unsigned long mfpr_lpm[] = {
|
||||
MFPR_LPM_INPUT,
|
||||
MFPR_LPM_DRIVE_LOW,
|
||||
MFPR_LPM_DRIVE_HIGH,
|
||||
@ -52,7 +52,7 @@ const static unsigned long mfpr_lpm[] = {
|
||||
};
|
||||
|
||||
/* mapping of MFP_PULL_* definitions to MFPR_PULL_* register bits */
|
||||
const static unsigned long mfpr_pull[] = {
|
||||
static const unsigned long mfpr_pull[] = {
|
||||
MFPR_PULL_NONE,
|
||||
MFPR_PULL_LOW,
|
||||
MFPR_PULL_HIGH,
|
||||
@ -60,7 +60,7 @@ const static unsigned long mfpr_pull[] = {
|
||||
};
|
||||
|
||||
/* mapping of MFP_LPM_EDGE_* definitions to MFPR_EDGE_* register bits */
|
||||
const static unsigned long mfpr_edge[] = {
|
||||
static const unsigned long mfpr_edge[] = {
|
||||
MFPR_EDGE_NONE,
|
||||
MFPR_EDGE_RISE,
|
||||
MFPR_EDGE_FALL,
|
||||
|
||||
@ -63,7 +63,7 @@ static int acpi_ac_add(struct acpi_device *device);
|
||||
static int acpi_ac_remove(struct acpi_device *device, int type);
|
||||
static int acpi_ac_resume(struct acpi_device *device);
|
||||
|
||||
const static struct acpi_device_id ac_device_ids[] = {
|
||||
static const struct acpi_device_id ac_device_ids[] = {
|
||||
{"ACPI0003", 0},
|
||||
{"", 0},
|
||||
};
|
||||
|
||||
@ -1147,7 +1147,7 @@ static int sonypi_acpi_remove(struct acpi_device *device, int type)
|
||||
return 0;
|
||||
}
|
||||
|
||||
const static struct acpi_device_id sonypi_device_ids[] = {
|
||||
static const struct acpi_device_id sonypi_device_ids[] = {
|
||||
{"SNY6001", 0},
|
||||
{"", 0},
|
||||
};
|
||||
|
||||
@ -42,9 +42,9 @@
|
||||
*
|
||||
* Each device has a kref, which is initialized to 1 when the device is
|
||||
* registered. A kref_get is done for each device registered. When the
|
||||
* device is released, the coresponding kref_put is done in the release
|
||||
* device is released, the corresponding kref_put is done in the release
|
||||
* method. Every time one of the device's channels is allocated to a client,
|
||||
* a kref_get occurs. When the channel is freed, the coresponding kref_put
|
||||
* a kref_get occurs. When the channel is freed, the corresponding kref_put
|
||||
* happens. The device's release function does a completion, so
|
||||
* unregister_device does a remove event, device_unregister, a kref_put
|
||||
* for the first reference, then waits on the completion for all other
|
||||
@ -53,7 +53,7 @@
|
||||
* Each channel has an open-coded implementation of Rusty Russell's "bigref,"
|
||||
* with a kref and a per_cpu local_t. A dma_chan_get is called when a client
|
||||
* signals that it wants to use a channel, and dma_chan_put is called when
|
||||
* a channel is removed or a client using it is unregesitered. A client can
|
||||
* a channel is removed or a client using it is unregistered. A client can
|
||||
* take extra references per outstanding transaction, as is the case with
|
||||
* the NET DMA client. The release function does a kref_put on the device.
|
||||
* -ChrisL, DanW
|
||||
|
||||
@ -4152,7 +4152,7 @@ static int hot_remove_disk(mddev_t * mddev, dev_t dev)
|
||||
|
||||
return 0;
|
||||
busy:
|
||||
printk(KERN_WARNING "md: cannot remove active disk %s from %s ... \n",
|
||||
printk(KERN_WARNING "md: cannot remove active disk %s from %s ...\n",
|
||||
bdevname(rdev->bdev,b), mdname(mddev));
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
@ -91,7 +91,7 @@ static int or51132_writebuf(struct or51132_state *state, const u8 *buf, int len)
|
||||
Less code and more efficient that loading a buffer on the stack with
|
||||
the bytes to send and then calling or51132_writebuf() on that. */
|
||||
#define or51132_writebytes(state, data...) \
|
||||
({ const static u8 _data[] = {data}; \
|
||||
({ static const u8 _data[] = {data}; \
|
||||
or51132_writebuf(state, _data, sizeof(_data)); })
|
||||
|
||||
/* Read data from demod into buffer. Returns 0 on success. */
|
||||
@ -132,7 +132,7 @@ static int or51132_readreg(struct or51132_state *state, u8 reg)
|
||||
static int or51132_load_firmware (struct dvb_frontend* fe, const struct firmware *fw)
|
||||
{
|
||||
struct or51132_state* state = fe->demodulator_priv;
|
||||
const static u8 run_buf[] = {0x7F,0x01};
|
||||
static const u8 run_buf[] = {0x7F,0x01};
|
||||
u8 rec_buf[8];
|
||||
u32 firmwareAsize, firmwareBsize;
|
||||
int i,ret;
|
||||
|
||||
@ -126,7 +126,7 @@ extern int sn9c102_write_regs(struct sn9c102_device*, const u8 valreg[][2],
|
||||
Register adresses must be < 256.
|
||||
*/
|
||||
#define sn9c102_write_const_regs(sn9c102_device, data...) \
|
||||
({ const static u8 _valreg[][2] = {data}; \
|
||||
({ static const u8 _valreg[][2] = {data}; \
|
||||
sn9c102_write_regs(sn9c102_device, _valreg, ARRAY_SIZE(_valreg)); })
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
@ -126,7 +126,7 @@ set_v4l_control(struct inode *inode,
|
||||
|
||||
/* ----------------------------------------------------------------- */
|
||||
|
||||
const static unsigned int palette2pixelformat[] = {
|
||||
static const unsigned int palette2pixelformat[] = {
|
||||
[VIDEO_PALETTE_GREY] = V4L2_PIX_FMT_GREY,
|
||||
[VIDEO_PALETTE_RGB555] = V4L2_PIX_FMT_RGB555,
|
||||
[VIDEO_PALETTE_RGB565] = V4L2_PIX_FMT_RGB565,
|
||||
|
||||
@ -213,7 +213,7 @@ static int intel_menlow_memory_remove(struct acpi_device *device, int type)
|
||||
return 0;
|
||||
}
|
||||
|
||||
const static struct acpi_device_id intel_menlow_memory_ids[] = {
|
||||
static const struct acpi_device_id intel_menlow_memory_ids[] = {
|
||||
{"INT0002", 0},
|
||||
{"", 0},
|
||||
};
|
||||
|
||||
@ -253,7 +253,7 @@ static int find_group_dir(struct super_block *sb, struct inode *parent)
|
||||
* it has too few free inodes left (min_inodes) or
|
||||
* it has too few free blocks left (min_blocks) or
|
||||
* it's already running too large debt (max_debt).
|
||||
* Parent's group is prefered, if it doesn't satisfy these
|
||||
* Parent's group is preferred, if it doesn't satisfy these
|
||||
* conditions we search cyclically through the rest. If none
|
||||
* of the groups look good we just look for a group with more
|
||||
* free inodes than average (starting at parent's group).
|
||||
|
||||
@ -239,7 +239,7 @@ no_block:
|
||||
* @inode: owner
|
||||
* @ind: descriptor of indirect block.
|
||||
*
|
||||
* This function returns the prefered place for block allocation.
|
||||
* This function returns the preferred place for block allocation.
|
||||
* It is used when heuristic for sequential allocation fails.
|
||||
* Rules are:
|
||||
* + if there is a block to the left of our position - allocate near it.
|
||||
@ -283,7 +283,7 @@ static unsigned long ext2_find_near(struct inode *inode, Indirect *ind)
|
||||
}
|
||||
|
||||
/**
|
||||
* ext2_find_goal - find a prefered place for allocation.
|
||||
* ext2_find_goal - find a preferred place for allocation.
|
||||
* @inode: owner
|
||||
* @block: block we want
|
||||
* @partial: pointer to the last triple within a chain
|
||||
|
||||
@ -239,7 +239,7 @@ static int find_group_dir(struct super_block *sb, struct inode *parent)
|
||||
* it has too few free inodes left (min_inodes) or
|
||||
* it has too few free blocks left (min_blocks) or
|
||||
* it's already running too large debt (max_debt).
|
||||
* Parent's group is prefered, if it doesn't satisfy these
|
||||
* Parent's group is preferred, if it doesn't satisfy these
|
||||
* conditions we search cyclically through the rest. If none
|
||||
* of the groups look good we just look for a group with more
|
||||
* free inodes than average (starting at parent's group).
|
||||
|
||||
@ -392,7 +392,7 @@ no_block:
|
||||
* @inode: owner
|
||||
* @ind: descriptor of indirect block.
|
||||
*
|
||||
* This function returns the prefered place for block allocation.
|
||||
* This function returns the preferred place for block allocation.
|
||||
* It is used when heuristic for sequential allocation fails.
|
||||
* Rules are:
|
||||
* + if there is a block to the left of our position - allocate near it.
|
||||
@ -436,12 +436,12 @@ static ext3_fsblk_t ext3_find_near(struct inode *inode, Indirect *ind)
|
||||
}
|
||||
|
||||
/**
|
||||
* ext3_find_goal - find a prefered place for allocation.
|
||||
* ext3_find_goal - find a preferred place for allocation.
|
||||
* @inode: owner
|
||||
* @block: block we want
|
||||
* @partial: pointer to the last triple within a chain
|
||||
*
|
||||
* Normally this function find the prefered place for block allocation,
|
||||
* Normally this function find the preferred place for block allocation,
|
||||
* returns it.
|
||||
*/
|
||||
|
||||
|
||||
@ -305,7 +305,7 @@ static int find_group_dir(struct super_block *sb, struct inode *parent,
|
||||
* it has too few free inodes left (min_inodes) or
|
||||
* it has too few free blocks left (min_blocks) or
|
||||
* it's already running too large debt (max_debt).
|
||||
* Parent's group is prefered, if it doesn't satisfy these
|
||||
* Parent's group is preferred, if it doesn't satisfy these
|
||||
* conditions we search cyclically through the rest. If none
|
||||
* of the groups look good we just look for a group with more
|
||||
* free inodes than average (starting at parent's group).
|
||||
|
||||
@ -382,7 +382,7 @@ no_block:
|
||||
* @inode: owner
|
||||
* @ind: descriptor of indirect block.
|
||||
*
|
||||
* This function returns the prefered place for block allocation.
|
||||
* This function returns the preferred place for block allocation.
|
||||
* It is used when heuristic for sequential allocation fails.
|
||||
* Rules are:
|
||||
* + if there is a block to the left of our position - allocate near it.
|
||||
@ -432,12 +432,12 @@ static ext4_fsblk_t ext4_find_near(struct inode *inode, Indirect *ind)
|
||||
}
|
||||
|
||||
/**
|
||||
* ext4_find_goal - find a prefered place for allocation.
|
||||
* ext4_find_goal - find a preferred place for allocation.
|
||||
* @inode: owner
|
||||
* @block: block we want
|
||||
* @partial: pointer to the last triple within a chain
|
||||
*
|
||||
* Normally this function find the prefered place for block allocation,
|
||||
* Normally this function find the preferred place for block allocation,
|
||||
* returns it.
|
||||
*/
|
||||
static ext4_fsblk_t ext4_find_goal(struct inode *inode, ext4_lblk_t block,
|
||||
|
||||
@ -260,7 +260,7 @@ int do_select(int n, fd_set_bits *fds, s64 *timeout)
|
||||
wait = NULL;
|
||||
if (retval || !*timeout || signal_pending(current))
|
||||
break;
|
||||
if(table.error) {
|
||||
if (table.error) {
|
||||
retval = table.error;
|
||||
break;
|
||||
}
|
||||
|
||||
@ -260,7 +260,7 @@ static inline int iop_chan_memset_slot_count(size_t len, int *slots_per_op)
|
||||
static inline int iop3xx_aau_xor_slot_count(size_t len, int src_cnt,
|
||||
int *slots_per_op)
|
||||
{
|
||||
const static int slot_count_table[] = { 0,
|
||||
static const int slot_count_table[] = { 0,
|
||||
1, 1, 1, 1, /* 01 - 04 */
|
||||
2, 2, 2, 2, /* 05 - 08 */
|
||||
4, 4, 4, 4, /* 09 - 12 */
|
||||
@ -369,7 +369,7 @@ static inline u32 iop_desc_get_byte_count(struct iop_adma_desc_slot *desc,
|
||||
/* translate the src_idx to a descriptor word index */
|
||||
static inline int __desc_idx(int src_idx)
|
||||
{
|
||||
const static int desc_idx_table[] = { 0, 0, 0, 0,
|
||||
static const int desc_idx_table[] = { 0, 0, 0, 0,
|
||||
0, 1, 2, 3,
|
||||
5, 6, 7, 8,
|
||||
9, 10, 11, 12,
|
||||
|
||||
@ -21,4 +21,4 @@ extern struct key_type key_type_rxrpc;
|
||||
|
||||
extern struct key *rxrpc_get_null_key(const char *);
|
||||
|
||||
#endif /* _KEYS_USER_TYPE_H */
|
||||
#endif /* _KEYS_RXRPC_TYPE_H */
|
||||
|
||||
@ -404,7 +404,7 @@ static inline enum dma_status dma_async_is_tx_complete(struct dma_chan *chan,
|
||||
* @last_used: last cookie value handed out
|
||||
*
|
||||
* dma_async_is_complete() is used in dma_async_memcpy_complete()
|
||||
* the test logic is seperated for lightweight testing of multiple cookies
|
||||
* the test logic is separated for lightweight testing of multiple cookies
|
||||
*/
|
||||
static inline enum dma_status dma_async_is_complete(dma_cookie_t cookie,
|
||||
dma_cookie_t last_complete, dma_cookie_t last_used)
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
#elif HZ >= 6144 && HZ < 12288
|
||||
# define SHIFT_HZ 13
|
||||
#else
|
||||
# error You lose.
|
||||
# error Invalid value of HZ.
|
||||
#endif
|
||||
|
||||
/* LATCH is used in the interval timer and ftape setup. */
|
||||
|
||||
@ -699,7 +699,6 @@ extern char numa_zonelist_order[];
|
||||
extern struct pglist_data contig_page_data;
|
||||
#define NODE_DATA(nid) (&contig_page_data)
|
||||
#define NODE_MEM_MAP(nid) mem_map
|
||||
#define MAX_NODES_SHIFT 1
|
||||
|
||||
#else /* CONFIG_NEED_MULTIPLE_NODES */
|
||||
|
||||
|
||||
@ -220,7 +220,7 @@ void flush_signals(struct task_struct *t)
|
||||
unsigned long flags;
|
||||
|
||||
spin_lock_irqsave(&t->sighand->siglock, flags);
|
||||
clear_tsk_thread_flag(t,TIF_SIGPENDING);
|
||||
clear_tsk_thread_flag(t, TIF_SIGPENDING);
|
||||
flush_sigqueue(&t->pending);
|
||||
flush_sigqueue(&t->signal->shared_pending);
|
||||
spin_unlock_irqrestore(&t->sighand->siglock, flags);
|
||||
@ -424,7 +424,7 @@ int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info)
|
||||
}
|
||||
if (signr &&
|
||||
((info->si_code & __SI_MASK) == __SI_TIMER) &&
|
||||
info->si_sys_private){
|
||||
info->si_sys_private) {
|
||||
/*
|
||||
* Release the siglock to ensure proper locking order
|
||||
* of timer locks outside of siglocks. Note, we leave
|
||||
|
||||
@ -134,8 +134,7 @@ static void restart_machine(void)
|
||||
preempt_enable_no_resched();
|
||||
}
|
||||
|
||||
struct stop_machine_data
|
||||
{
|
||||
struct stop_machine_data {
|
||||
int (*fn)(void *);
|
||||
void *data;
|
||||
struct completion done;
|
||||
|
||||
@ -17,8 +17,8 @@
|
||||
#include <linux/gfp.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/fs.h> // Needed by writeback.h
|
||||
#include <linux/writeback.h> // Prototypes pdflush_operation()
|
||||
#include <linux/fs.h> /* Needed by writeback.h */
|
||||
#include <linux/writeback.h> /* Prototypes pdflush_operation() */
|
||||
#include <linux/kthread.h>
|
||||
#include <linux/cpuset.h>
|
||||
#include <linux/freezer.h>
|
||||
|
||||
@ -942,7 +942,6 @@ static void sk_prot_free(struct proto *prot, struct sock *sk)
|
||||
* @family: protocol family
|
||||
* @priority: for allocation (%GFP_KERNEL, %GFP_ATOMIC, etc)
|
||||
* @prot: struct proto associated with this new sock instance
|
||||
* @zero_it: if we should zero the newly allocated sock
|
||||
*/
|
||||
struct sock *sk_alloc(struct net *net, int family, gfp_t priority,
|
||||
struct proto *prot)
|
||||
|
||||
@ -73,6 +73,7 @@ static void sample_probe_specific(void)
|
||||
|
||||
/* finish setting up the device */
|
||||
}
|
||||
|
||||
static void sample_probe_async_cont(const struct firmware *fw, void *context)
|
||||
{
|
||||
if (!fw) {
|
||||
|
||||
@ -920,7 +920,7 @@ static unsigned short sis_ac97_rw(struct sis7019 *sis, int codec, u32 cmd)
|
||||
u16 status;
|
||||
u16 rdy;
|
||||
int count;
|
||||
const static u16 codec_ready[3] = {
|
||||
static const u16 codec_ready[3] = {
|
||||
SIS_AC97_STATUS_CODEC_READY,
|
||||
SIS_AC97_STATUS_CODEC2_READY,
|
||||
SIS_AC97_STATUS_CODEC3_READY,
|
||||
@ -984,7 +984,7 @@ timeout:
|
||||
static void sis_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
|
||||
unsigned short val)
|
||||
{
|
||||
const static u32 cmd[3] = {
|
||||
static const u32 cmd[3] = {
|
||||
SIS_AC97_CMD_CODEC_WRITE,
|
||||
SIS_AC97_CMD_CODEC2_WRITE,
|
||||
SIS_AC97_CMD_CODEC3_WRITE,
|
||||
@ -995,7 +995,7 @@ static void sis_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
|
||||
|
||||
static unsigned short sis_ac97_read(struct snd_ac97 *ac97, unsigned short reg)
|
||||
{
|
||||
const static u32 cmd[3] = {
|
||||
static const u32 cmd[3] = {
|
||||
SIS_AC97_CMD_CODEC_READ,
|
||||
SIS_AC97_CMD_CODEC2_READ,
|
||||
SIS_AC97_CMD_CODEC3_READ,
|
||||
|
||||
@ -137,7 +137,7 @@ static inline void update_mask_reg(unsigned int reg, u32 mask, u32 or_val)
|
||||
/*
|
||||
* ALSA defs
|
||||
*/
|
||||
const static struct snd_pcm_hardware snd_ps3_pcm_hw = {
|
||||
static const struct snd_pcm_hardware snd_ps3_pcm_hw = {
|
||||
.info = (SNDRV_PCM_INFO_MMAP |
|
||||
SNDRV_PCM_INFO_NONINTERLEAVED |
|
||||
SNDRV_PCM_INFO_MMAP_VALID),
|
||||
|
||||
Loading…
Reference in New Issue
Block a user