Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina: "Usual rocket science stuff from trivial.git" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits) neighbour.h: fix comment sched: Fix warning on make htmldocs caused by wait.h slab: struct kmem_cache is protected by slab_mutex doc: Fix typo in USB Gadget Documentation of/Kconfig: Spelling s/one/once/ mkregtable: Fix sscanf handling lp5523, lp8501: comment improvements thermal: rcar: comment spelling treewide: fix comments and printk msgs IXP4xx: remove '1 &&' from a condition check in ixp4xx_restart() Documentation: update /proc/uptime field description Documentation: Fix size parameter for snprintf arm: fix comment header and macro name asm-generic: uaccess: Spelling s/a ny/any/ mtd: onenand: fix comment header doc: driver-model/platform.txt: fix a typo drivers: fix typo in DEVTMPFS_MOUNT Kconfig help text doc: Fix typo (acces_process_vm -> access_process_vm) treewide: Fix typos in printk drivers/gpu/drm/qxl/Kconfig: reformat the help text ...
This commit is contained in:
Коммит
bb1281f2aa
|
@ -10,5 +10,6 @@
|
|||
*.out
|
||||
*.png
|
||||
*.gif
|
||||
*.svg
|
||||
media-indices.tmpl
|
||||
media-entities.tmpl
|
||||
|
|
|
@ -54,6 +54,7 @@ htmldocs: $(HTML)
|
|||
|
||||
MAN := $(patsubst %.xml, %.9, $(BOOKS))
|
||||
mandocs: $(MAN)
|
||||
$(if $(wildcard $(obj)/man/*.9),gzip -f $(obj)/man/*.9)
|
||||
|
||||
installmandocs: mandocs
|
||||
mkdir -p /usr/local/man/man9/
|
||||
|
@ -145,7 +146,7 @@ build_main_index = rm -rf $(main_idx); \
|
|||
cat $(HTML) >> $(main_idx)
|
||||
|
||||
quiet_cmd_db2html = HTML $@
|
||||
cmd_db2html = xmlto xhtml $(XMLTOFLAGS) -o $(patsubst %.html,%,$@) $< && \
|
||||
cmd_db2html = xmlto html $(XMLTOFLAGS) -o $(patsubst %.html,%,$@) $< && \
|
||||
echo '<a HREF="$(patsubst %.html,%,$(notdir $@))/index.html"> \
|
||||
$(patsubst %.html,%,$(notdir $@))</a><p>' > $@
|
||||
|
||||
|
@ -159,7 +160,7 @@ quiet_cmd_db2html = HTML $@
|
|||
cp $(PNG-$(basename $(notdir $@))) $(patsubst %.html,%,$@); fi
|
||||
|
||||
quiet_cmd_db2man = MAN $@
|
||||
cmd_db2man = if grep -q refentry $<; then xmlto man $(XMLTOFLAGS) -o $(obj)/man $< ; gzip -f $(obj)/man/*.9; fi
|
||||
cmd_db2man = if grep -q refentry $<; then xmlto man $(XMLTOFLAGS) -o $(obj)/man $< ; fi
|
||||
%.9 : %.xml
|
||||
@(which xmlto > /dev/null 2>&1) || \
|
||||
(echo "*** You need to install xmlto ***"; \
|
||||
|
|
|
@ -109,6 +109,7 @@ X!Ilib/string.c
|
|||
<sect1><title>The Slab Cache</title>
|
||||
!Iinclude/linux/slab.h
|
||||
!Emm/slab.c
|
||||
!Emm/util.c
|
||||
</sect1>
|
||||
<sect1><title>User Space Memory Access</title>
|
||||
!Iarch/x86/include/asm/uaccess_32.h
|
||||
|
|
|
@ -141,7 +141,7 @@ will use a legacy domain only if an IRQ range is supplied by the
|
|||
system and will otherwise use a linear domain mapping. The semantics
|
||||
of this call are such that if an IRQ range is specified then
|
||||
descriptors will be allocated on-the-fly for it, and if no range is
|
||||
specified it will fall through to irq_domain_add_linear() which meand
|
||||
specified it will fall through to irq_domain_add_linear() which means
|
||||
*no* irq descriptors will be allocated.
|
||||
|
||||
A typical use case for simple domains is where an irqchip provider
|
||||
|
|
|
@ -48,7 +48,7 @@ struct platform_driver {
|
|||
struct device_driver driver;
|
||||
};
|
||||
|
||||
Note that probe() should general verify that the specified device hardware
|
||||
Note that probe() should in general verify that the specified device hardware
|
||||
actually exists; sometimes platform setup code can't be sure. The probing
|
||||
can use device resources, including clocks, and device platform_data.
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ The EFI boot stub is enabled with the CONFIG_EFI_STUB kernel option.
|
|||
**** How to install bzImage.efi
|
||||
|
||||
The bzImage located in arch/x86/boot/bzImage must be copied to the EFI
|
||||
System Partiion (ESP) and renamed with the extension ".efi". Without
|
||||
System Partition (ESP) and renamed with the extension ".efi". Without
|
||||
the extension the EFI firmware loader will refuse to execute it. It's
|
||||
not possible to execute bzImage.efi from the usual Linux file systems
|
||||
because EFI firmware doesn't have support for them.
|
||||
|
|
|
@ -104,7 +104,7 @@ Then from the "Message" menu item, select insert file and choose your patch.
|
|||
As an added bonus you can customise the message creation toolbar menu
|
||||
and put the "insert file" icon there.
|
||||
|
||||
Make the the composer window wide enough so that no lines wrap. As of
|
||||
Make the composer window wide enough so that no lines wrap. As of
|
||||
KMail 1.13.5 (KDE 4.5.4), KMail will apply word wrapping when sending
|
||||
the email if the lines wrap in the composer window. Having word wrapping
|
||||
disabled in the Options menu isn't enough. Thus, if your patch has very
|
||||
|
|
|
@ -544,7 +544,7 @@ like the ->fault() handler, but simply return with VM_FAULT_NOPAGE, which
|
|||
will cause the VM to retry the fault.
|
||||
|
||||
->access() is called when get_user_pages() fails in
|
||||
acces_process_vm(), typically used to debug a process through
|
||||
access_process_vm(), typically used to debug a process through
|
||||
/proc/pid/mem or ptrace. This function is needed only for
|
||||
VM_IO | VM_PFNMAP VMAs.
|
||||
|
||||
|
|
|
@ -547,7 +547,7 @@ Table 1-5: Kernel info in /proc
|
|||
sys See chapter 2
|
||||
sysvipc Info of SysVIPC Resources (msg, sem, shm) (2.4)
|
||||
tty Info of tty drivers
|
||||
uptime System uptime
|
||||
uptime Wall clock since boot, combined idle time of all cpus
|
||||
version Kernel version
|
||||
video bttv info of video resources (2.4)
|
||||
vmallocinfo Show vmalloced areas
|
||||
|
|
|
@ -38,7 +38,7 @@ maps are more efficient:
|
|||
|
||||
void io_mapping_unmap_atomic(void *vaddr)
|
||||
|
||||
'vaddr' must be the the value returned by the last
|
||||
'vaddr' must be the value returned by the last
|
||||
io_mapping_map_atomic_wc call. This unmaps the specified
|
||||
page and allows the task to sleep once again.
|
||||
|
||||
|
|
|
@ -515,7 +515,14 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
|
|||
|
||||
cgroup_disable= [KNL] Disable a particular controller
|
||||
Format: {name of the controller(s) to disable}
|
||||
{Currently supported controllers - "memory"}
|
||||
The effects of cgroup_disable=foo are:
|
||||
- foo isn't auto-mounted if you mount all cgroups in
|
||||
a single hierarchy
|
||||
- foo isn't visible as an individually mountable
|
||||
subsystem
|
||||
{Currently only "memory" controller deal with this and
|
||||
cut the overhead, others just disable the usage. So
|
||||
only cgroup_disable=memory is actually worthy}
|
||||
|
||||
checkreqprot [SELINUX] Set initial checkreqprot flag value.
|
||||
Format: { "0" | "1" }
|
||||
|
|
|
@ -29,7 +29,7 @@ int set_unload_heads_path(char *device)
|
|||
return -EINVAL;
|
||||
strncpy(devname, device + 5, sizeof(devname));
|
||||
|
||||
snprintf(unload_heads_path, sizeof(unload_heads_path),
|
||||
snprintf(unload_heads_path, sizeof(unload_heads_path) - 1,
|
||||
"/sys/block/%s/device/unload_heads", devname);
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -533,7 +533,7 @@ also have
|
|||
found. The count in 'mismatch_cnt' is the number of sectors
|
||||
that were re-written, or (for 'check') would have been
|
||||
re-written. As most raid levels work in units of pages rather
|
||||
than sectors, this my be larger than the number of actual errors
|
||||
than sectors, this may be larger than the number of actual errors
|
||||
by a factor of the number of sectors in a page.
|
||||
|
||||
bitmap_set_bits
|
||||
|
|
|
@ -71,7 +71,7 @@ To create an rfkill driver, driver's Kconfig needs to have
|
|||
depends on RFKILL || !RFKILL
|
||||
|
||||
to ensure the driver cannot be built-in when rfkill is modular. The !RFKILL
|
||||
case allows the driver to be built when rfkill is not configured, which which
|
||||
case allows the driver to be built when rfkill is not configured, which
|
||||
case all rfkill API can still be used but will be provided by static inlines
|
||||
which compile to almost nothing.
|
||||
|
||||
|
|
|
@ -30,7 +30,7 @@ is something called unbounded priority inversion. That is when the high
|
|||
priority process is prevented from running by a lower priority process for
|
||||
an undetermined amount of time.
|
||||
|
||||
The classic example of unbounded priority inversion is were you have three
|
||||
The classic example of unbounded priority inversion is where you have three
|
||||
processes, let's call them processes A, B, and C, where A is the highest
|
||||
priority process, C is the lowest, and B is in between. A tries to grab a lock
|
||||
that C owns and must wait and lets C run to release the lock. But in the
|
||||
|
|
|
@ -116,7 +116,7 @@ The branch(es) can then be switched via:
|
|||
static_key_slow_dec(&key);
|
||||
|
||||
Thus, 'static_key_slow_inc()' means 'make the branch true', and
|
||||
'static_key_slow_dec()' means 'make the the branch false' with appropriate
|
||||
'static_key_slow_dec()' means 'make the branch false' with appropriate
|
||||
reference counting. For example, if the key is initialized true, a
|
||||
static_key_slow_dec(), will switch the branch to false. And a subsequent
|
||||
static_key_slow_inc(), will change the branch back to true. Likewise, if the
|
||||
|
@ -236,7 +236,7 @@ label case adds:
|
|||
|
||||
If we then include the padding bytes, the jump label code saves, 16 total bytes
|
||||
of instruction memory for this small function. In this case the non-jump label
|
||||
function is 80 bytes long. Thus, we have have saved 20% of the instruction
|
||||
function is 80 bytes long. Thus, we have saved 20% of the instruction
|
||||
footprint. We can in fact improve this even further, since the 5-byte no-op
|
||||
really can be a 2-byte no-op since we can reach the branch with a 2-byte jmp.
|
||||
However, we have not yet implemented optimal no-op sizes (they are currently
|
||||
|
|
|
@ -14,7 +14,7 @@ A CDC ECM (Ethernet) function may be turned on via a Kconfig option
|
|||
and RNDIS can be turned off. If they are both enabled the gadget will
|
||||
have two configurations -- one with RNDIS and another with CDC ECM[3].
|
||||
|
||||
Please not that if you use non-standard configuration (that is enable
|
||||
Please note that if you use non-standard configuration (that is enable
|
||||
CDC ECM) you may need to change vendor and/or product ID.
|
||||
|
||||
* Host drivers
|
||||
|
|
|
@ -78,14 +78,6 @@ APICs
|
|||
|
||||
no_timer_check Don't check the IO-APIC timer. This can work around
|
||||
problems with incorrect timer initialization on some boards.
|
||||
|
||||
apicmaintimer Run time keeping from the local APIC timer instead
|
||||
of using the PIT/HPET interrupt for this. This is useful
|
||||
when the PIT/HPET interrupts are unreliable.
|
||||
|
||||
noapicmaintimer Don't do time keeping using the APIC timer.
|
||||
Useful when this option was auto selected, but doesn't work.
|
||||
|
||||
apicpmtimer
|
||||
Do APIC timer calibration using the pmtimer. Implies
|
||||
apicmaintimer. Useful when your PIT timer is totally
|
||||
|
@ -144,11 +136,6 @@ Non Executable Mappings
|
|||
on Enable(default)
|
||||
off Disable
|
||||
|
||||
SMP
|
||||
|
||||
additional_cpus=NUM Allow NUM more CPUs for hotplug
|
||||
(defaults are specified by the BIOS, see Documentation/x86/x86_64/cpu-hotplug-spec)
|
||||
|
||||
NUMA
|
||||
|
||||
numa=off Only set up a single NUMA node spanning all memory.
|
||||
|
@ -289,16 +276,6 @@ Debugging
|
|||
|
||||
kstack=N Print N words from the kernel stack in oops dumps.
|
||||
|
||||
pagefaulttrace Dump all page faults. Only useful for extreme debugging
|
||||
and will create a lot of output.
|
||||
|
||||
call_trace=[old|both|newfallback|new]
|
||||
old: use old inexact backtracer
|
||||
new: use new exact dwarf2 unwinder
|
||||
both: print entries from both
|
||||
newfallback: use new unwinder but fall back to old if it gets
|
||||
stuck (default)
|
||||
|
||||
Miscellaneous
|
||||
|
||||
nogbpages
|
||||
|
|
|
@ -241,7 +241,7 @@ config MACH_PCONTROL_G20
|
|||
bool "PControl G20 CPU module"
|
||||
help
|
||||
Select this if you are using taskit's Stamp9G20 CPU module on this
|
||||
carrier board, beeing the decentralized unit of a building automation
|
||||
carrier board, being the decentralized unit of a building automation
|
||||
system; featuring nvram, eth-switch, iso-rs485, display, io
|
||||
|
||||
config MACH_GSIA18S
|
||||
|
|
|
@ -249,7 +249,7 @@ static int pca100_sdhc2_init(struct device *dev, irq_handler_t detect_irq,
|
|||
"imx-mmc-detect", data);
|
||||
if (ret)
|
||||
printk(KERN_ERR
|
||||
"pca100: Failed to reuest irq for sd/mmc detection\n");
|
||||
"pca100: Failed to request irq for sd/mmc detection\n");
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
|
@ -560,7 +560,7 @@ static void __init ixp4xx_clockevent_init(void)
|
|||
|
||||
void ixp4xx_restart(enum reboot_mode mode, const char *cmd)
|
||||
{
|
||||
if ( 1 && mode == REBOOT_SOFT) {
|
||||
if (mode == REBOOT_SOFT) {
|
||||
/* Jump into ROM at address 0 */
|
||||
soft_restart(0);
|
||||
} else {
|
||||
|
|
|
@ -90,7 +90,7 @@ static exit_handle_fn kvm_get_exit_handler(struct kvm_vcpu *vcpu)
|
|||
|
||||
if (hsr_ec >= ARRAY_SIZE(arm_exit_handlers) ||
|
||||
!arm_exit_handlers[hsr_ec]) {
|
||||
kvm_err("Unkown exception class: hsr: %#08x\n",
|
||||
kvm_err("Unknown exception class: hsr: %#08x\n",
|
||||
(unsigned int)kvm_vcpu_get_hsr(vcpu));
|
||||
BUG();
|
||||
}
|
||||
|
|
|
@ -138,7 +138,7 @@ static void __init ralink_systick_init(struct device_node *np)
|
|||
|
||||
clockevents_register_device(&systick.dev);
|
||||
|
||||
pr_info("%s: runing - mult: %d, shift: %d\n",
|
||||
pr_info("%s: running - mult: %d, shift: %d\n",
|
||||
np->name, systick.dev.mult, systick.dev.shift);
|
||||
}
|
||||
|
||||
|
|
|
@ -147,7 +147,7 @@ static int rt_timer_probe(struct platform_device *pdev)
|
|||
rt_timer_config(rt, 2);
|
||||
rt_timer_enable(rt);
|
||||
|
||||
dev_info(&pdev->dev, "maximum frequncy is %luHz\n", rt->timer_freq);
|
||||
dev_info(&pdev->dev, "maximum frequency is %luHz\n", rt->timer_freq);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -245,7 +245,7 @@ static irqreturn_t mpc52xx_lpbfifo_irq(int irq, void *dev_id)
|
|||
|
||||
if (dma && !write) {
|
||||
spin_unlock_irqrestore(&lpbfifo.lock, flags);
|
||||
pr_err("bogus LPBFIFO IRQ (dma and not writting)\n");
|
||||
pr_err("bogus LPBFIFO IRQ (dma and not writing)\n");
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
|
|
|
@ -126,7 +126,7 @@ struct opal_sg_list {
|
|||
|
||||
struct validate_flash_t {
|
||||
int status; /* Return status */
|
||||
void *buf; /* Candiate image buffer */
|
||||
void *buf; /* Candidate image buffer */
|
||||
uint32_t buf_size; /* Image size */
|
||||
uint32_t result; /* Update results token */
|
||||
};
|
||||
|
@ -500,7 +500,7 @@ static int alloc_image_buf(char *buffer, size_t count)
|
|||
|
||||
memcpy(&image_header, (void *)buffer, sizeof(struct image_header_t));
|
||||
image_data.size = be32_to_cpu(image_header.size);
|
||||
pr_debug("FLASH: Candiate image size = %u\n", image_data.size);
|
||||
pr_debug("FLASH: Candidate image size = %u\n", image_data.size);
|
||||
|
||||
if (image_data.size > MAX_IMAGE_SIZE) {
|
||||
pr_warn("FLASH: Too large image\n");
|
||||
|
|
|
@ -938,7 +938,7 @@ config X86_ANCIENT_MCE
|
|||
depends on X86_32 && X86_MCE
|
||||
---help---
|
||||
Include support for machine check handling on old Pentium 5 or WinChip
|
||||
systems. These typically need to be enabled explicitely on the command
|
||||
systems. These typically need to be enabled explicitly on the command
|
||||
line.
|
||||
|
||||
config X86_MCE_THRESHOLD
|
||||
|
|
|
@ -49,7 +49,7 @@ config DEVTMPFS_MOUNT
|
|||
with the commandline parameter: devtmpfs.mount=0|1.
|
||||
This option does not affect initramfs based booting, here
|
||||
the devtmpfs filesystem always needs to be mounted manually
|
||||
after the roots is mounted.
|
||||
after the rootfs is mounted.
|
||||
With this option enabled, it allows to bring up a system in
|
||||
rescue mode with init=/bin/sh, even when the /dev directory
|
||||
on the rootfs is completely empty.
|
||||
|
|
|
@ -31,7 +31,6 @@ obj-$(CONFIG_BLK_DEV_NBD) += nbd.o
|
|||
obj-$(CONFIG_BLK_DEV_CRYPTOLOOP) += cryptoloop.o
|
||||
obj-$(CONFIG_VIRTIO_BLK) += virtio_blk.o
|
||||
|
||||
obj-$(CONFIG_VIODASD) += viodasd.o
|
||||
obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
|
||||
obj-$(CONFIG_BLK_DEV_HD) += hd.o
|
||||
|
||||
|
|
|
@ -10,5 +10,4 @@ obj-$(CONFIG_BLK_DEV_SR) += cdrom.o
|
|||
obj-$(CONFIG_PARIDE_PCD) += cdrom.o
|
||||
obj-$(CONFIG_CDROM_PKTCDVD) += cdrom.o
|
||||
|
||||
obj-$(CONFIG_VIOCD) += viocd.o cdrom.o
|
||||
obj-$(CONFIG_GDROM) += gdrom.o cdrom.o
|
||||
|
|
|
@ -13,7 +13,6 @@ obj-$(CONFIG_MSM_SMD_PKT) += msm_smd_pkt.o
|
|||
obj-$(CONFIG_MSPEC) += mspec.o
|
||||
obj-$(CONFIG_MMTIMER) += mmtimer.o
|
||||
obj-$(CONFIG_UV_MMTIMER) += uv_mmtimer.o
|
||||
obj-$(CONFIG_VIOTAPE) += viotape.o
|
||||
obj-$(CONFIG_IBM_BSR) += bsr.o
|
||||
obj-$(CONFIG_SGI_MBCS) += mbcs.o
|
||||
obj-$(CONFIG_BFIN_OTP) += bfin-otp.o
|
||||
|
|
|
@ -182,7 +182,7 @@ static int smd_pkt_write(struct file *file, const char __user *buf,
|
|||
if (count > MAX_BUF_SIZE)
|
||||
return -EINVAL;
|
||||
|
||||
DBG("writting %d bytes\n", count);
|
||||
DBG("writing %d bytes\n", count);
|
||||
|
||||
smd_pkt_devp = file->private_data;
|
||||
if (!smd_pkt_devp || !smd_pkt_devp->ch)
|
||||
|
|
|
@ -116,7 +116,7 @@ static struct bus_opp_table exynos4210_busclk_table[] = {
|
|||
};
|
||||
|
||||
/*
|
||||
* MIF is the main control knob clock for exynox4x12 MIF/INT
|
||||
* MIF is the main control knob clock for Exynos4x12 MIF/INT
|
||||
* clock and voltage of both mif/int are controlled.
|
||||
*/
|
||||
static struct bus_opp_table exynos4x12_mifclk_table[] = {
|
||||
|
|
|
@ -152,7 +152,7 @@ static int exynos5_busfreq_int_target(struct device *dev, unsigned long *_freq,
|
|||
if (old_freq == freq)
|
||||
return 0;
|
||||
|
||||
dev_dbg(dev, "targetting %lukHz %luuV\n", freq, volt);
|
||||
dev_dbg(dev, "targeting %lukHz %luuV\n", freq, volt);
|
||||
|
||||
mutex_lock(&data->lock);
|
||||
|
||||
|
|
|
@ -36,9 +36,9 @@ enum exynos_crtc_mode {
|
|||
* @pipe: a crtc index created at load() with a new crtc object creation
|
||||
* and the crtc object would be set to private->crtc array
|
||||
* to get a crtc object corresponding to this pipe from private->crtc
|
||||
* array when irq interrupt occured. the reason of using this pipe is that
|
||||
* array when irq interrupt occurred. the reason of using this pipe is that
|
||||
* drm framework doesn't support multiple irq yet.
|
||||
* we can refer to the crtc to current hardware interrupt occured through
|
||||
* we can refer to the crtc to current hardware interrupt occurred through
|
||||
* this pipe value.
|
||||
* @dpms: store the crtc dpms value
|
||||
* @mode: store the crtc mode value
|
||||
|
|
|
@ -345,7 +345,7 @@ static bool fimc_check_ovf(struct fimc_context *ctx)
|
|||
|
||||
fimc_write(cfg, EXYNOS_CIWDOFST);
|
||||
|
||||
dev_err(ippdrv->dev, "occured overflow at %d, status 0x%x.\n",
|
||||
dev_err(ippdrv->dev, "occurred overflow at %d, status 0x%x.\n",
|
||||
ctx->id, status);
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -1126,7 +1126,7 @@ int exynos_g2d_set_cmdlist_ioctl(struct drm_device *drm_dev, void *data,
|
|||
* G2D interrupt event once current command list execution is
|
||||
* finished.
|
||||
* Otherwise only ACF bit should be set to INTEN register so
|
||||
* that one interrupt is occured after all command lists
|
||||
* that one interrupt is occurred after all command lists
|
||||
* have been completed.
|
||||
*/
|
||||
if (node->event) {
|
||||
|
|
|
@ -652,7 +652,7 @@ int exynos_drm_gem_dumb_create(struct drm_file *file_priv,
|
|||
int ret;
|
||||
|
||||
/*
|
||||
* alocate memory to be used for framebuffer.
|
||||
* allocate memory to be used for framebuffer.
|
||||
* - this callback would be called by user application
|
||||
* with DRM_IOCTL_MODE_CREATE_DUMB command.
|
||||
*/
|
||||
|
|
|
@ -60,7 +60,7 @@ struct exynos_drm_gem_buf {
|
|||
* @vma: a pointer to vm_area.
|
||||
* @flags: indicate memory type to allocated buffer and cache attruibute.
|
||||
*
|
||||
* P.S. this object would be transfered to user as kms_bo.handle so
|
||||
* P.S. this object would be transferred to user as kms_bo.handle so
|
||||
* user can access the buffer through kms_bo.handle.
|
||||
*/
|
||||
struct exynos_drm_gem_obj {
|
||||
|
|
|
@ -1301,13 +1301,13 @@ static irqreturn_t gsc_irq_handler(int irq, void *dev_id)
|
|||
|
||||
status = gsc_read(GSC_IRQ);
|
||||
if (status & GSC_IRQ_STATUS_OR_IRQ) {
|
||||
dev_err(ippdrv->dev, "occured overflow at %d, status 0x%x.\n",
|
||||
dev_err(ippdrv->dev, "occurred overflow at %d, status 0x%x.\n",
|
||||
ctx->id, status);
|
||||
return IRQ_NONE;
|
||||
}
|
||||
|
||||
if (status & GSC_IRQ_STATUS_OR_FRM_DONE) {
|
||||
dev_dbg(ippdrv->dev, "occured frame done at %d, status 0x%x.\n",
|
||||
dev_dbg(ippdrv->dev, "occurred frame done at %d, status 0x%x.\n",
|
||||
ctx->id, status);
|
||||
|
||||
buf_id[EXYNOS_DRM_OPS_SRC] = gsc_get_src_buf_index(ctx);
|
||||
|
|
|
@ -335,7 +335,7 @@ int exynos_drm_ipp_get_property(struct drm_device *drm_dev, void *data,
|
|||
} else {
|
||||
/*
|
||||
* Getting ippdrv capability by ipp_id.
|
||||
* some deivce not supported wb, output interface.
|
||||
* some device not supported wb, output interface.
|
||||
* so, user application detect correct ipp driver
|
||||
* using this ioctl.
|
||||
*/
|
||||
|
|
|
@ -48,7 +48,7 @@ struct drm_exynos_ipp_cmd_work {
|
|||
/*
|
||||
* A structure of command node.
|
||||
*
|
||||
* @priv: IPP private infomation.
|
||||
* @priv: IPP private information.
|
||||
* @list: list head to command queue information.
|
||||
* @event_list: list head of event.
|
||||
* @mem_list: list head to source,destination memory queue information.
|
||||
|
@ -92,7 +92,7 @@ struct drm_exynos_ipp_buf_info {
|
|||
};
|
||||
|
||||
/*
|
||||
* A structure of wb setting infomation.
|
||||
* A structure of wb setting information.
|
||||
*
|
||||
* @enable: enable flag for wb.
|
||||
* @refresh: HZ of the refresh rate.
|
||||
|
|
|
@ -10,4 +10,6 @@ config DRM_QXL
|
|||
select DRM_TTM
|
||||
select CRC32
|
||||
help
|
||||
QXL virtual GPU for Spice virtualization desktop integration. Do not enable this driver unless your distro ships a corresponding X.org QXL driver that can handle kernel modesetting.
|
||||
QXL virtual GPU for Spice virtualization desktop integration.
|
||||
Do not enable this driver unless your distro ships a corresponding
|
||||
X.org QXL driver that can handle kernel modesetting.
|
||||
|
|
|
@ -655,7 +655,7 @@ static int parser_auth(struct table *t, const char *filename)
|
|||
|
||||
/* first line will contain the last register
|
||||
* and gpu name */
|
||||
sscanf(buf, "%s %s", gpu_name, last_reg_s);
|
||||
sscanf(buf, "%9s %9s", gpu_name, last_reg_s);
|
||||
t->gpu_prefix = gpu_name;
|
||||
last_reg = strtol(last_reg_s, NULL, 16);
|
||||
|
||||
|
|
|
@ -571,7 +571,7 @@ static int exynos5_i2c_xfer(struct i2c_adapter *adap,
|
|||
int i = 0, ret = 0, stop = 0;
|
||||
|
||||
if (i2c->suspended) {
|
||||
dev_err(i2c->dev, "HS-I2C is not initialzed.\n");
|
||||
dev_err(i2c->dev, "HS-I2C is not initialized.\n");
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
|
|
|
@ -801,7 +801,7 @@ static int stu300_xfer_msg(struct i2c_adapter *adap,
|
|||
/* Check that the bus is free, or wait until some timeout occurs */
|
||||
ret = stu300_wait_while_busy(dev);
|
||||
if (ret != 0) {
|
||||
dev_err(&dev->pdev->dev, "timout waiting for transfer "
|
||||
dev_err(&dev->pdev->dev, "timeout waiting for transfer "
|
||||
"to commence.\n");
|
||||
goto exit_disable;
|
||||
}
|
||||
|
|
|
@ -969,7 +969,7 @@ static int twl6030_gpadc_suspend(struct device *pdev)
|
|||
ret = twl_i2c_write_u8(TWL6030_MODULE_ID1, TWL6030_GPADCR,
|
||||
TWL6030_REG_TOGGLE1);
|
||||
if (ret)
|
||||
dev_err(pdev, "error reseting GPADC (%d)!\n", ret);
|
||||
dev_err(pdev, "error resetting GPADC (%d)!\n", ret);
|
||||
|
||||
return 0;
|
||||
};
|
||||
|
|
|
@ -1620,7 +1620,7 @@ hfc4s8s_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
#else
|
||||
if (!request_region(hw->iobase, 8, hw->card_name)) {
|
||||
printk(KERN_INFO
|
||||
"HFC-4S/8S: failed to rquest address space at 0x%04x\n",
|
||||
"HFC-4S/8S: failed to request address space at 0x%04x\n",
|
||||
hw->iobase);
|
||||
goto out;
|
||||
}
|
||||
|
|
|
@ -17,7 +17,7 @@ config MISDN_DSP
|
|||
|
||||
This module may be used for special applications that require
|
||||
cross connecting of bchannels, conferencing, dtmf decoding,
|
||||
echo cancelation, tone generation, and Blowfish encryption and
|
||||
echo cancellation, tone generation, and Blowfish encryption and
|
||||
decryption. It may use hardware features if available.
|
||||
|
||||
E.g. it is required for PBX4Linux. Go to http://isdn.eversberg.eu
|
||||
|
|
|
@ -35,7 +35,15 @@
|
|||
|
||||
#include "leds-lp55xx-common.h"
|
||||
|
||||
#define LP5523_PROGRAM_LENGTH 32
|
||||
#define LP5523_PROGRAM_LENGTH 32 /* bytes */
|
||||
/* Memory is used like this:
|
||||
0x00 engine 1 program
|
||||
0x10 engine 2 program
|
||||
0x20 engine 3 program
|
||||
0x30 engine 1 muxing info
|
||||
0x40 engine 2 muxing info
|
||||
0x50 engine 3 muxing info
|
||||
*/
|
||||
#define LP5523_MAX_LEDS 9
|
||||
|
||||
/* Registers */
|
||||
|
|
|
@ -263,7 +263,7 @@ static void lp8501_firmware_loaded(struct lp55xx_chip *chip)
|
|||
}
|
||||
|
||||
/*
|
||||
* Program momery sequence
|
||||
* Program memory sequence
|
||||
* 1) set engine mode to "LOAD"
|
||||
* 2) write firmware data into program memory
|
||||
*/
|
||||
|
|
|
@ -577,8 +577,8 @@ static void dump_dtd(struct vpdma_dtd *dtd)
|
|||
pr_debug("word5: max_width %d, max_height %d\n",
|
||||
dtd_get_max_width(dtd), dtd_get_max_height(dtd));
|
||||
|
||||
pr_debug("word6: client specfic attr0 = 0x%08x\n", dtd->client_attr0);
|
||||
pr_debug("word7: client specfic attr1 = 0x%08x\n", dtd->client_attr1);
|
||||
pr_debug("word6: client specific attr0 = 0x%08x\n", dtd->client_attr0);
|
||||
pr_debug("word7: client specific attr1 = 0x%08x\n", dtd->client_attr1);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -396,7 +396,7 @@ static int fsa9480_irq_init(struct fsa9480_usbsw *usbsw)
|
|||
IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
|
||||
"fsa9480 micro USB", usbsw);
|
||||
if (ret) {
|
||||
dev_err(&client->dev, "failed to reqeust IRQ\n");
|
||||
dev_err(&client->dev, "failed to request IRQ\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
/*
|
||||
* linux/arch/arm/plat-s3c/include/plat/regs-onenand.h
|
||||
*
|
||||
* Copyright (C) 2008-2010 Samsung Electronics
|
||||
* Kyungmin Park <kyungmin.park@samsung.com>
|
||||
*
|
||||
|
|
|
@ -2126,7 +2126,7 @@ bug_out:
|
|||
|
||||
spin_unlock_irqrestore(&sc->lmc_lock, flags);
|
||||
|
||||
lmc_trace(dev, "lmc_driver_timout out");
|
||||
lmc_trace(dev, "lmc_driver_timeout out");
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -248,7 +248,7 @@ int lbs_process_event(struct lbs_private *priv, u32 event)
|
|||
/* handle unexpected PS SLEEP event */
|
||||
if (priv->psstate == PS_STATE_FULL_POWER) {
|
||||
lbs_deb_cmd(
|
||||
"EVENT: in FULL POWER mode, ignoreing PS_SLEEP\n");
|
||||
"EVENT: in FULL POWER mode, ignoring PS_SLEEP\n");
|
||||
break;
|
||||
}
|
||||
priv->psstate = PS_STATE_PRE_SLEEP;
|
||||
|
|
|
@ -204,9 +204,9 @@ config SCSI_MULTI_LUN
|
|||
Some devices support more than one LUN (Logical Unit Number) in order
|
||||
to allow access to several media, e.g. CD jukebox, USB card reader,
|
||||
mobile phone in mass storage mode. This option forces the kernel to
|
||||
probe for all LUNs by default. This setting can be overriden by
|
||||
probe for all LUNs by default. This setting can be overridden by
|
||||
max_luns boot/module parameter. Note that this option does not affect
|
||||
devices conforming to SCSI-3 or higher as they can explicitely report
|
||||
devices conforming to SCSI-3 or higher as they can explicitly report
|
||||
their number of LUNs. It is safe to say Y here unless you have one of
|
||||
those rare devices which reacts in an unexpected way when probed for
|
||||
multiple LUNs.
|
||||
|
|
|
@ -2254,7 +2254,7 @@ qla8044_minidump_process_rdmem(struct scsi_qla_host *vha,
|
|||
|
||||
if (r_addr & 0xf) {
|
||||
ql_dbg(ql_dbg_p3p, vha, 0xb0f1,
|
||||
"[%s]: Read addr 0x%x not 16 bytes alligned\n",
|
||||
"[%s]: Read addr 0x%x not 16 bytes aligned\n",
|
||||
__func__, r_addr);
|
||||
return QLA_FUNCTION_FAILED;
|
||||
}
|
||||
|
|
|
@ -465,7 +465,7 @@ int qla4_83xx_drv_lock(struct scsi_qla_host *ha)
|
|||
}
|
||||
/* Recovery Failed, some other function
|
||||
* has the lock, wait for 2secs and retry */
|
||||
ql4_printk(KERN_INFO, ha, "%s: IDC lock Recovery by %d failed, Retrying timout\n",
|
||||
ql4_printk(KERN_INFO, ha, "%s: IDC lock Recovery by %d failed, Retrying timeout\n",
|
||||
__func__, ha->func_num);
|
||||
timeout = 0;
|
||||
}
|
||||
|
|
|
@ -367,7 +367,6 @@ int usbip_recv(struct socket *sock, void *buf, int size)
|
|||
msg.msg_namelen = 0;
|
||||
msg.msg_control = NULL;
|
||||
msg.msg_controllen = 0;
|
||||
msg.msg_namelen = 0;
|
||||
msg.msg_flags = MSG_NOSIGNAL;
|
||||
|
||||
result = kernel_recvmsg(sock, &msg, &iov, 1, size, MSG_WAITALL);
|
||||
|
|
|
@ -408,7 +408,7 @@ static int rcar_thermal_probe(struct platform_device *pdev)
|
|||
/* enable temperature comparation */
|
||||
rcar_thermal_common_write(common, ENR, 0x00030303);
|
||||
|
||||
idle = 0; /* polling delaye is not needed */
|
||||
idle = 0; /* polling delay is not needed */
|
||||
}
|
||||
|
||||
for (i = 0;; i++) {
|
||||
|
|
|
@ -2153,7 +2153,7 @@ static void flush_timeout_function(unsigned long data)
|
|||
|
||||
fast_timers[info->line].function = NULL;
|
||||
serial_fast_timer_expired++;
|
||||
TIMERD(DEBUG_LOG(info->line, "flush_timout %i ", info->line));
|
||||
TIMERD(DEBUG_LOG(info->line, "flush_timeout %i ", info->line));
|
||||
TIMERD(DEBUG_LOG(info->line, "num expired: %i\n", serial_fast_timer_expired));
|
||||
check_flush_timeout(info);
|
||||
}
|
||||
|
|
|
@ -193,7 +193,7 @@ static int kobil_open(struct tty_struct *tty, struct usb_serial_port *port)
|
|||
KOBIL_TIMEOUT
|
||||
);
|
||||
dev_dbg(dev, "%s - Send get_HW_version URB returns: %i\n", __func__, result);
|
||||
dev_dbg(dev, "Harware version: %i.%i.%i\n", transfer_buffer[0],
|
||||
dev_dbg(dev, "Hardware version: %i.%i.%i\n", transfer_buffer[0],
|
||||
transfer_buffer[1], transfer_buffer[2]);
|
||||
|
||||
/* get firmware version */
|
||||
|
|
|
@ -1624,7 +1624,7 @@ static int dlfb_usb_probe(struct usb_interface *interface,
|
|||
}
|
||||
|
||||
if (pixel_limit) {
|
||||
pr_warn("DL chip limit of %d overriden"
|
||||
pr_warn("DL chip limit of %d overridden"
|
||||
" by module param to %d\n",
|
||||
dev->sku_pixel_limit, pixel_limit);
|
||||
dev->sku_pixel_limit = pixel_limit;
|
||||
|
|
|
@ -222,7 +222,7 @@ config XEN_ACPI_PROCESSOR
|
|||
|
||||
To do that the driver parses the Power Management data and uploads
|
||||
said information to the Xen hypervisor. Then the Xen hypervisor can
|
||||
select the proper Cx and Pxx states. It also registers itslef as the
|
||||
select the proper Cx and Pxx states. It also registers itself as the
|
||||
SMM so that other drivers (such as ACPI cpufreq scaling driver) will
|
||||
not load.
|
||||
|
||||
|
|
|
@ -101,7 +101,7 @@ static int test_extents(struct btrfs_block_group_cache *cache)
|
|||
|
||||
ret = btrfs_remove_free_space(cache, 2 * 1024 * 1024, 4096);
|
||||
if (ret) {
|
||||
test_msg("Error removing middle peice %d\n", ret);
|
||||
test_msg("Error removing middle piece %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -266,7 +266,7 @@ static int test_bitmaps_and_extents(struct btrfs_block_group_cache *cache)
|
|||
}
|
||||
|
||||
if (test_check_exists(cache, 512 * 1024, 3 * 1024 * 1024)) {
|
||||
test_msg("Left over peices after removing overlapping\n");
|
||||
test_msg("Left over pieces after removing overlapping\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
/*
|
||||
* User space memory access functions, these should work
|
||||
* on a ny machine that has kernel and user data in the same
|
||||
* on any machine that has kernel and user data in the same
|
||||
* address space, e.g. all NOMMU machines.
|
||||
*/
|
||||
#include <linux/sched.h>
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
/*
|
||||
* arch/arm/include/asm/hardware/sp810.h
|
||||
*
|
||||
* ARM PrimeXsys System Controller SP810 header file
|
||||
*
|
||||
* Copyright (C) 2009 ST Microelectronics
|
||||
|
@ -11,8 +9,8 @@
|
|||
* warranty of any kind, whether express or implied.
|
||||
*/
|
||||
|
||||
#ifndef __ASM_ARM_SP810_H
|
||||
#define __ASM_ARM_SP810_H
|
||||
#ifndef __AMBA_SP810_H
|
||||
#define __AMBA_SP810_H
|
||||
|
||||
#include <linux/io.h>
|
||||
|
||||
|
@ -61,4 +59,4 @@ static inline void sysctl_soft_reset(void __iomem *base)
|
|||
writel(0, base + SCSYSSTAT);
|
||||
}
|
||||
|
||||
#endif /* __ASM_ARM_SP810_H */
|
||||
#endif /* __AMBA_SP810_H */
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
*/
|
||||
|
||||
struct kmem_cache {
|
||||
/* 1) Cache tunables. Protected by cache_chain_mutex */
|
||||
/* 1) Cache tunables. Protected by slab_mutex */
|
||||
unsigned int batchcount;
|
||||
unsigned int limit;
|
||||
unsigned int shared;
|
||||
|
|
|
@ -276,7 +276,7 @@ static inline void tracepoint_synchronize_unregister(void)
|
|||
* For use with the TRACE_EVENT macro:
|
||||
*
|
||||
* We define a tracepoint, its arguments, its printk format
|
||||
* and its 'fast binay record' layout.
|
||||
* and its 'fast binary record' layout.
|
||||
*
|
||||
* Firstly, name your tracepoint via TRACE_EVENT(name : the
|
||||
* 'subsystem_event' notation is fine.
|
||||
|
|
|
@ -286,8 +286,8 @@ do { \
|
|||
* wait_event_cmd - sleep until a condition gets true
|
||||
* @wq: the waitqueue to wait on
|
||||
* @condition: a C expression for the event to wait for
|
||||
* cmd1: the command will be executed before sleep
|
||||
* cmd2: the command will be executed after sleep
|
||||
* @cmd1: the command will be executed before sleep
|
||||
* @cmd2: the command will be executed after sleep
|
||||
*
|
||||
* The process is put to sleep (TASK_UNINTERRUPTIBLE) until the
|
||||
* @condition evaluates to true. The @condition is checked each time
|
||||
|
|
|
@ -58,7 +58,7 @@ enum {
|
|||
|
||||
/* NUD_NOARP & NUD_PERMANENT are pseudostates, they never change
|
||||
and make no address resolution or NUD.
|
||||
NUD_PERMANENT is also cannot be deleted by garbage collectors.
|
||||
NUD_PERMANENT also cannot be deleted by garbage collectors.
|
||||
*/
|
||||
|
||||
struct nda_cacheinfo {
|
||||
|
|
|
@ -6229,7 +6229,7 @@ void netdev_freemem(struct net_device *dev)
|
|||
* @rxqs: the number of RX subqueues to allocate
|
||||
*
|
||||
* Allocates a struct net_device with private data area for driver use
|
||||
* and performs basic initialization. Also allocates subquue structs
|
||||
* and performs basic initialization. Also allocates subqueue structs
|
||||
* for each queue on the device.
|
||||
*/
|
||||
struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name,
|
||||
|
|
|
@ -21,7 +21,7 @@ config IP_SET_MAX
|
|||
You can define here default value of the maximum number
|
||||
of IP sets for the kernel.
|
||||
|
||||
The value can be overriden by the 'max_sets' module
|
||||
The value can be overridden by the 'max_sets' module
|
||||
parameter of the 'ip_set' module.
|
||||
|
||||
config IP_SET_BITMAP_IP
|
||||
|
|
|
@ -563,7 +563,7 @@ static void digital_tg_recv_psl_req(struct nfc_digital_dev *ddev, void *arg,
|
|||
rf_tech = NFC_DIGITAL_RF_TECH_424F;
|
||||
break;
|
||||
default:
|
||||
pr_err("Unsuported dsi value %d\n", dsi);
|
||||
pr_err("Unsupported dsi value %d\n", dsi);
|
||||
goto exit;
|
||||
}
|
||||
|
||||
|
|
|
@ -300,7 +300,7 @@ static void llc_shdlc_rcv_rej(struct llc_shdlc *shdlc, int y_nr)
|
|||
{
|
||||
struct sk_buff *skb;
|
||||
|
||||
pr_debug("remote asks retransmition from frame %d\n", y_nr);
|
||||
pr_debug("remote asks retransmission from frame %d\n", y_nr);
|
||||
|
||||
if (llc_shdlc_x_lteq_y_lt_z(shdlc->dnr, y_nr, shdlc->ns)) {
|
||||
if (shdlc->t2_active) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче