mirror of
https://github.com/torvalds/linux
synced 2024-10-06 19:34:19 +00:00
Merge branch 'akpm' (patches from Andrew)
Merge yet more updates from Andrew Morton: "This is everything else from -mm for this merge window. 90 patches. Subsystems affected by this patch series: mm (cleanups and slub), alpha, procfs, sysctl, misc, core-kernel, bitmap, lib, compat, checkpatch, epoll, isofs, nilfs2, hpfs, exit, fork, kexec, gcov, panic, delayacct, gdb, resource, selftests, async, initramfs, ipc, drivers/char, and spelling" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (90 commits) mm: fix typos in comments mm: fix typos in comments treewide: remove editor modelines and cruft ipc/sem.c: spelling fix fs: fat: fix spelling typo of values kernel/sys.c: fix typo kernel/up.c: fix typo kernel/user_namespace.c: fix typos kernel/umh.c: fix some spelling mistakes include/linux/pgtable.h: few spelling fixes mm/slab.c: fix spelling mistake "disired" -> "desired" scripts/spelling.txt: add "overflw" scripts/spelling.txt: Add "diabled" typo scripts/spelling.txt: add "overlfow" arm: print alloc free paths for address in registers mm/vmalloc: remove vwrite() mm: remove xlate_dev_kmem_ptr() drivers/char: remove /dev/kmem for good mm: fix some typos and code style problems ipc/sem.c: mundane typo fixes ...
This commit is contained in:
Linus Torvalds
commit
a48b0872e6
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
1 char Memory devices
|
||||
1 = /dev/mem Physical memory access
|
||||
2 = /dev/kmem Kernel virtual memory access
|
||||
2 = /dev/kmem OBSOLETE - replaced by /proc/kcore
|
||||
3 = /dev/null Null device
|
||||
4 = /dev/port I/O port access
|
||||
5 = /dev/zero Null byte source
|
||||
|
|
|
|||
|
|
@ -1835,6 +1835,18 @@
|
|||
initcall functions. Useful for debugging built-in
|
||||
modules and initcalls.
|
||||
|
||||
initramfs_async= [KNL]
|
||||
Format: <bool>
|
||||
Default: 1
|
||||
This parameter controls whether the initramfs
|
||||
image is unpacked asynchronously, concurrently
|
||||
with devices being probed and
|
||||
initialized. This should normally just work,
|
||||
but as a debugging aid, one can get the
|
||||
historical behaviour of the initramfs
|
||||
unpacking being completed before device_ and
|
||||
late_ initcalls.
|
||||
|
||||
initrd= [BOOT] Specify the location of the initial ramdisk
|
||||
|
||||
initrdmem= [KNL] Specify a physical address and size from which to
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ Examples of using the Linux-provided gdb helpers
|
|||
[ 0.000000] BIOS-e820: [mem 0x000000000009fc00-0x000000000009ffff] reserved
|
||||
....
|
||||
|
||||
- Examine fields of the current task struct::
|
||||
- Examine fields of the current task struct(supported by x86 and arm64 only)::
|
||||
|
||||
(gdb) p $lx_current().pid
|
||||
$1 = 4998
|
||||
|
|
|
|||
16
MAINTAINERS
16
MAINTAINERS
|
|
@ -3207,6 +3207,22 @@ F: Documentation/filesystems/bfs.rst
|
|||
F: fs/bfs/
|
||||
F: include/uapi/linux/bfs_fs.h
|
||||
|
||||
BITMAP API
|
||||
M: Yury Norov <yury.norov@gmail.com>
|
||||
R: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
|
||||
R: Rasmus Villemoes <linux@rasmusvillemoes.dk>
|
||||
S: Maintained
|
||||
F: include/asm-generic/bitops/find.h
|
||||
F: include/linux/bitmap.h
|
||||
F: lib/bitmap.c
|
||||
F: lib/find_bit.c
|
||||
F: lib/find_bit_benchmark.c
|
||||
F: lib/test_bitmap.c
|
||||
F: tools/include/asm-generic/bitops/find.h
|
||||
F: tools/include/linux/bitmap.h
|
||||
F: tools/lib/bitmap.c
|
||||
F: tools/lib/find_bit.c
|
||||
|
||||
BLINKM RGB LED DRIVER
|
||||
M: Jan-Simon Moeller <jansimon.moeller@gmx.de>
|
||||
S: Maintained
|
||||
|
|
|
|||
|
|
@ -602,11 +602,6 @@ extern void outsl (unsigned long port, const void *src, unsigned long count);
|
|||
*/
|
||||
#define xlate_dev_mem_ptr(p) __va(p)
|
||||
|
||||
/*
|
||||
* Convert a virtual cached pointer to an uncached pointer
|
||||
*/
|
||||
#define xlate_dev_kmem_ptr(p) p
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
#endif /* __ALPHA_IO_H */
|
||||
|
|
|
|||
|
|
@ -13,12 +13,12 @@ static char *pc873xx_names[] = {
|
|||
static unsigned int base, model;
|
||||
|
||||
|
||||
unsigned int __init pc873xx_get_base()
|
||||
unsigned int __init pc873xx_get_base(void)
|
||||
{
|
||||
return base;
|
||||
}
|
||||
|
||||
char *__init pc873xx_get_model()
|
||||
char *__init pc873xx_get_model(void)
|
||||
{
|
||||
return pc873xx_names[model];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
#include <linux/types.h>
|
||||
#include <linux/string.h>
|
||||
#include <linux/uaccess.h>
|
||||
#include <net/checksum.h>
|
||||
|
||||
|
||||
#define ldq_u(x,y) \
|
||||
|
|
|
|||
|
|
@ -63,7 +63,6 @@ CONFIG_INPUT_EVDEV=y
|
|||
# CONFIG_MOUSE_PS2 is not set
|
||||
# CONFIG_SERIO is not set
|
||||
CONFIG_LEGACY_PTY_COUNT=16
|
||||
# CONFIG_DEVKMEM is not set
|
||||
CONFIG_SERIAL_8250=y
|
||||
CONFIG_SERIAL_8250_CONSOLE=y
|
||||
CONFIG_SERIAL_8250_RUNTIME_UARTS=2
|
||||
|
|
|
|||
|
|
@ -72,7 +72,6 @@ CONFIG_INPUT_TOUCHSCREEN=y
|
|||
CONFIG_INPUT_MISC=y
|
||||
CONFIG_INPUT_UINPUT=m
|
||||
# CONFIG_SERIO is not set
|
||||
# CONFIG_DEVKMEM is not set
|
||||
CONFIG_SERIAL_PXA=y
|
||||
# CONFIG_LEGACY_PTYS is not set
|
||||
# CONFIG_HW_RANDOM is not set
|
||||
|
|
|
|||
|
|
@ -79,7 +79,6 @@ CONFIG_INPUT_EVBUG=y
|
|||
# CONFIG_SERIO is not set
|
||||
# CONFIG_VT is not set
|
||||
# CONFIG_LEGACY_PTYS is not set
|
||||
# CONFIG_DEVKMEM is not set
|
||||
CONFIG_SERIAL_8250=y
|
||||
CONFIG_SERIAL_8250_CONSOLE=y
|
||||
CONFIG_SERIAL_8250_NR_UARTS=1
|
||||
|
|
|
|||
|
|
@ -69,7 +69,6 @@ CONFIG_SMSC911X=y
|
|||
# CONFIG_VT is not set
|
||||
# CONFIG_LEGACY_PTYS is not set
|
||||
CONFIG_SERIAL_NONSTANDARD=y
|
||||
# CONFIG_DEVKMEM is not set
|
||||
CONFIG_SERIAL_MPS2_UART_CONSOLE=y
|
||||
CONFIG_SERIAL_MPS2_UART=y
|
||||
# CONFIG_HW_RANDOM is not set
|
||||
|
|
|
|||
|
|
@ -100,7 +100,6 @@ CONFIG_INPUT_EVDEV=y
|
|||
CONFIG_KEYBOARD_GPIO=y
|
||||
# CONFIG_INPUT_MOUSE is not set
|
||||
CONFIG_LEGACY_PTY_COUNT=16
|
||||
# CONFIG_DEVKMEM is not set
|
||||
CONFIG_SERIAL_8250=y
|
||||
CONFIG_SERIAL_8250_CONSOLE=y
|
||||
CONFIG_SERIAL_8250_RUNTIME_UARTS=2
|
||||
|
|
|
|||
|
|
@ -53,7 +53,6 @@ CONFIG_NET_ETHERNET=y
|
|||
# CONFIG_INPUT_KEYBOARD is not set
|
||||
# CONFIG_INPUT_MOUSE is not set
|
||||
# CONFIG_SERIO is not set
|
||||
# CONFIG_DEVKMEM is not set
|
||||
CONFIG_SERIAL_PXA=y
|
||||
CONFIG_SERIAL_PXA_CONSOLE=y
|
||||
# CONFIG_LEGACY_PTYS is not set
|
||||
|
|
|
|||
|
|
@ -88,5 +88,6 @@ extern asmlinkage void c_backtrace(unsigned long fp, int pmode,
|
|||
struct mm_struct;
|
||||
void show_pte(const char *lvl, struct mm_struct *mm, unsigned long addr);
|
||||
extern void __show_regs(struct pt_regs *);
|
||||
extern void __show_regs_alloc_free(struct pt_regs *regs);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -430,11 +430,6 @@ extern void pci_iounmap(struct pci_dev *dev, void __iomem *addr);
|
|||
*/
|
||||
#define xlate_dev_mem_ptr(p) __va(p)
|
||||
|
||||
/*
|
||||
* Convert a virtual cached pointer to an uncached pointer
|
||||
*/
|
||||
#define xlate_dev_kmem_ptr(p) p
|
||||
|
||||
#include <asm-generic/io.h>
|
||||
|
||||
#ifdef CONFIG_MMU
|
||||
|
|
|
|||
|
|
@ -92,6 +92,17 @@ void arch_cpu_idle_exit(void)
|
|||
ledtrig_cpu(CPU_LED_IDLE_END);
|
||||
}
|
||||
|
||||
void __show_regs_alloc_free(struct pt_regs *regs)
|
||||
{
|
||||
int i;
|
||||
|
||||
/* check for r0 - r12 only */
|
||||
for (i = 0; i < 13; i++) {
|
||||
pr_alert("Register r%d information:", i);
|
||||
mem_dump_obj((void *)regs->uregs[i]);
|
||||
}
|
||||
}
|
||||
|
||||
void __show_regs(struct pt_regs *regs)
|
||||
{
|
||||
unsigned long flags;
|
||||
|
|
|
|||
|
|
@ -287,6 +287,7 @@ static int __die(const char *str, int err, struct pt_regs *regs)
|
|||
|
||||
print_modules();
|
||||
__show_regs(regs);
|
||||
__show_regs_alloc_free(regs);
|
||||
pr_emerg("Process %.*s (pid: %d, stack limit = 0x%p)\n",
|
||||
TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), end_of_stack(tsk));
|
||||
|
||||
|
|
|
|||
|
|
@ -9,6 +9,10 @@
|
|||
|
||||
#include <linux/compiler.h>
|
||||
|
||||
#include <asm-generic/bitops/fls.h>
|
||||
#include <asm-generic/bitops/__fls.h>
|
||||
#include <asm-generic/bitops/fls64.h>
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#ifndef _LINUX_BITOPS_H
|
||||
|
|
@ -173,8 +177,4 @@ static inline unsigned long __ffs(unsigned long word)
|
|||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
#include <asm-generic/bitops/fls.h>
|
||||
#include <asm-generic/bitops/__fls.h>
|
||||
#include <asm-generic/bitops/fls64.h>
|
||||
|
||||
#endif /* _H8300_BITOPS_H */
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ CONFIG_NET_ETHERNET=y
|
|||
# CONFIG_SERIO is not set
|
||||
# CONFIG_CONSOLE_TRANSLATIONS is not set
|
||||
CONFIG_LEGACY_PTY_COUNT=64
|
||||
# CONFIG_DEVKMEM is not set
|
||||
# CONFIG_HW_RANDOM is not set
|
||||
CONFIG_SPI=y
|
||||
CONFIG_SPI_DEBUG=y
|
||||
|
|
|
|||
|
|
@ -64,7 +64,6 @@ static inline void *phys_to_virt(unsigned long address)
|
|||
* convert a physical pointer to a virtual kernel pointer for
|
||||
* /dev/mem access.
|
||||
*/
|
||||
#define xlate_dev_kmem_ptr(p) __va(p)
|
||||
#define xlate_dev_mem_ptr(p) __va(p)
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -277,7 +277,6 @@ extern void memset_io(volatile void __iomem *s, int c, long n);
|
|||
#define memcpy_fromio memcpy_fromio
|
||||
#define memcpy_toio memcpy_toio
|
||||
#define memset_io memset_io
|
||||
#define xlate_dev_kmem_ptr xlate_dev_kmem_ptr
|
||||
#define xlate_dev_mem_ptr xlate_dev_mem_ptr
|
||||
#include <asm-generic/io.h>
|
||||
#undef PCI_IOBASE
|
||||
|
|
|
|||
|
|
@ -272,22 +272,4 @@ xlate_dev_mem_ptr(phys_addr_t p)
|
|||
return ptr;
|
||||
}
|
||||
|
||||
/*
|
||||
* Convert a virtual cached kernel memory pointer to an uncached pointer
|
||||
*/
|
||||
static __inline__ void *
|
||||
xlate_dev_kmem_ptr(void *p)
|
||||
{
|
||||
struct page *page;
|
||||
void *ptr;
|
||||
|
||||
page = virt_to_page((unsigned long)p);
|
||||
if (PageUncached(page))
|
||||
ptr = (void *)__pa(p) + __IA64_UNCACHED_OFFSET;
|
||||
else
|
||||
ptr = p;
|
||||
|
||||
return ptr;
|
||||
}
|
||||
|
||||
#endif /* _ASM_IA64_UACCESS_H */
|
||||
|
|
|
|||
|
|
@ -317,10 +317,3 @@ int atari_tt_hwclk( int op, struct rtc_time *t )
|
|||
|
||||
return( 0 );
|
||||
}
|
||||
|
||||
/*
|
||||
* Local variables:
|
||||
* c-indent-level: 4
|
||||
* tab-width: 8
|
||||
* End:
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -60,7 +60,6 @@ CONFIG_DM9000=y
|
|||
# CONFIG_VT is not set
|
||||
# CONFIG_UNIX98_PTYS is not set
|
||||
# CONFIG_DEVMEM is not set
|
||||
# CONFIG_DEVKMEM is not set
|
||||
CONFIG_SERIAL_MCF=y
|
||||
CONFIG_SERIAL_MCF_BAUDRATE=115200
|
||||
CONFIG_SERIAL_MCF_CONSOLE=y
|
||||
|
|
|
|||
|
|
@ -440,8 +440,6 @@ static inline unsigned long ffz(unsigned long word)
|
|||
|
||||
#endif
|
||||
|
||||
#include <asm-generic/bitops/find.h>
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#if defined(CONFIG_CPU_HAS_NO_BITFIELDS)
|
||||
|
|
@ -525,10 +523,12 @@ static inline int __fls(int x)
|
|||
#define __clear_bit_unlock clear_bit_unlock
|
||||
|
||||
#include <asm-generic/bitops/ext2-atomic.h>
|
||||
#include <asm-generic/bitops/le.h>
|
||||
#include <asm-generic/bitops/fls64.h>
|
||||
#include <asm-generic/bitops/sched.h>
|
||||
#include <asm-generic/bitops/hweight.h>
|
||||
#include <asm-generic/bitops/le.h>
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
#include <asm-generic/bitops/find.h>
|
||||
|
||||
#endif /* _M68K_BITOPS_H */
|
||||
|
|
|
|||
|
|
@ -397,11 +397,6 @@ static inline void isa_delay(void)
|
|||
*/
|
||||
#define xlate_dev_mem_ptr(p) __va(p)
|
||||
|
||||
/*
|
||||
* Convert a virtual cached pointer to an uncached pointer
|
||||
*/
|
||||
#define xlate_dev_kmem_ptr(p) p
|
||||
|
||||
#define readb_relaxed(addr) readb(addr)
|
||||
#define readw_relaxed(addr) readw(addr)
|
||||
#define readl_relaxed(addr) readl(addr)
|
||||
|
|
|
|||
|
|
@ -564,11 +564,6 @@ extern void (*_dma_cache_inv)(unsigned long start, unsigned long size);
|
|||
*/
|
||||
#define xlate_dev_mem_ptr(p) __va(p)
|
||||
|
||||
/*
|
||||
* Convert a virtual cached pointer to an uncached pointer
|
||||
*/
|
||||
#define xlate_dev_kmem_ptr(p) p
|
||||
|
||||
void __ioread64_copy(void *to, const void __iomem *from, size_t count);
|
||||
|
||||
#endif /* _ASM_IO_H */
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ CONFIG_MICREL_PHY=y
|
|||
# CONFIG_SERIO is not set
|
||||
# CONFIG_VT is not set
|
||||
# CONFIG_LEGACY_PTYS is not set
|
||||
# CONFIG_DEVKMEM is not set
|
||||
CONFIG_SERIAL_8250=y
|
||||
CONFIG_SERIAL_8250_CONSOLE=y
|
||||
CONFIG_SERIAL_OF_PLATFORM=y
|
||||
|
|
|
|||
|
|
@ -316,11 +316,6 @@ extern void iowrite64be(u64 val, void __iomem *addr);
|
|||
*/
|
||||
#define xlate_dev_mem_ptr(p) __va(p)
|
||||
|
||||
/*
|
||||
* Convert a virtual cached pointer to an uncached pointer
|
||||
*/
|
||||
#define xlate_dev_kmem_ptr(p) p
|
||||
|
||||
extern int devmem_is_allowed(unsigned long pfn);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -365,4 +365,3 @@ void parisc_pdc_chassis_init(void);
|
|||
PDC_CHASSIS_EOM_SET )
|
||||
|
||||
#endif /* _PARISC_PDC_CHASSIS_H */
|
||||
/* vim: set ts=8 */
|
||||
|
|
|
|||
|
|
@ -662,11 +662,6 @@ static inline void name at \
|
|||
*/
|
||||
#define xlate_dev_mem_ptr(p) __va(p)
|
||||
|
||||
/*
|
||||
* Convert a virtual cached pointer to an uncached pointer
|
||||
*/
|
||||
#define xlate_dev_kmem_ptr(p) p
|
||||
|
||||
/*
|
||||
* We don't do relaxed operations yet, at least not with this semantic
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -20,11 +20,6 @@ void *xlate_dev_mem_ptr(phys_addr_t phys);
|
|||
#define unxlate_dev_mem_ptr unxlate_dev_mem_ptr
|
||||
void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr);
|
||||
|
||||
/*
|
||||
* Convert a virtual cached pointer to an uncached pointer
|
||||
*/
|
||||
#define xlate_dev_kmem_ptr(p) p
|
||||
|
||||
#define IO_SPACE_LIMIT 0
|
||||
|
||||
void __iomem *ioremap_prot(phys_addr_t addr, size_t size, unsigned long prot);
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ CONFIG_SH_PCLK_FREQ=31250000
|
|||
# CONFIG_INPUT is not set
|
||||
# CONFIG_SERIO is not set
|
||||
# CONFIG_VT is not set
|
||||
# CONFIG_DEVKMEM is not set
|
||||
# CONFIG_UNIX98_PTYS is not set
|
||||
# CONFIG_LEGACY_PTYS is not set
|
||||
# CONFIG_HW_RANDOM is not set
|
||||
|
|
|
|||
|
|
@ -71,7 +71,6 @@ CONFIG_SMC91X=y
|
|||
# CONFIG_INPUT is not set
|
||||
# CONFIG_SERIO is not set
|
||||
# CONFIG_VT is not set
|
||||
# CONFIG_DEVKMEM is not set
|
||||
CONFIG_SERIAL_SH_SCI=y
|
||||
CONFIG_SERIAL_SH_SCI_NR_UARTS=4
|
||||
CONFIG_SERIAL_SH_SCI_CONSOLE=y
|
||||
|
|
|
|||
|
|
@ -75,7 +75,6 @@ CONFIG_INPUT_FF_MEMLESS=y
|
|||
# CONFIG_INPUT_MOUSE is not set
|
||||
# CONFIG_SERIO is not set
|
||||
CONFIG_VT_HW_CONSOLE_BINDING=y
|
||||
# CONFIG_DEVKMEM is not set
|
||||
CONFIG_SERIAL_SH_SCI=y
|
||||
CONFIG_SERIAL_SH_SCI_CONSOLE=y
|
||||
# CONFIG_LEGACY_PTYS is not set
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ CONFIG_CPU_IDLE=y
|
|||
# CONFIG_INPUT is not set
|
||||
# CONFIG_SERIO is not set
|
||||
# CONFIG_VT is not set
|
||||
# CONFIG_DEVKMEM is not set
|
||||
CONFIG_SERIAL_SH_SCI=y
|
||||
CONFIG_SERIAL_SH_SCI_NR_UARTS=6
|
||||
CONFIG_SERIAL_SH_SCI_CONSOLE=y
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ CONFIG_CPU_IDLE=y
|
|||
# CONFIG_INPUT is not set
|
||||
# CONFIG_SERIO is not set
|
||||
# CONFIG_VT is not set
|
||||
# CONFIG_DEVKMEM is not set
|
||||
CONFIG_SERIAL_SH_SCI=y
|
||||
CONFIG_SERIAL_SH_SCI_NR_UARTS=6
|
||||
CONFIG_SERIAL_SH_SCI_CONSOLE=y
|
||||
|
|
|
|||
|
|
@ -66,7 +66,6 @@ CONFIG_INPUT_FF_MEMLESS=m
|
|||
CONFIG_INPUT_EVDEV=y
|
||||
CONFIG_INPUT_EVBUG=m
|
||||
CONFIG_VT_HW_CONSOLE_BINDING=y
|
||||
# CONFIG_DEVKMEM is not set
|
||||
CONFIG_SERIAL_SH_SCI=y
|
||||
CONFIG_SERIAL_SH_SCI_NR_UARTS=6
|
||||
CONFIG_SERIAL_SH_SCI_CONSOLE=y
|
||||
|
|
|
|||
|
|
@ -58,15 +58,16 @@ static inline unsigned long __ffs(unsigned long word)
|
|||
return result;
|
||||
}
|
||||
|
||||
#include <asm-generic/bitops/find.h>
|
||||
#include <asm-generic/bitops/ffs.h>
|
||||
#include <asm-generic/bitops/hweight.h>
|
||||
#include <asm-generic/bitops/lock.h>
|
||||
#include <asm-generic/bitops/sched.h>
|
||||
#include <asm-generic/bitops/le.h>
|
||||
#include <asm-generic/bitops/ext2-atomic.h>
|
||||
#include <asm-generic/bitops/fls.h>
|
||||
#include <asm-generic/bitops/__fls.h>
|
||||
#include <asm-generic/bitops/fls64.h>
|
||||
|
||||
#include <asm-generic/bitops/le.h>
|
||||
#include <asm-generic/bitops/find.h>
|
||||
|
||||
#endif /* __ASM_SH_BITOPS_H */
|
||||
|
|
|
|||
|
|
@ -283,11 +283,6 @@ static inline void __iomem *ioremap_prot(phys_addr_t offset, unsigned long size,
|
|||
*/
|
||||
#define xlate_dev_mem_ptr(p) __va(p)
|
||||
|
||||
/*
|
||||
* Convert a virtual cached pointer to an uncached pointer
|
||||
*/
|
||||
#define xlate_dev_kmem_ptr(p) p
|
||||
|
||||
#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
|
||||
int valid_phys_addr_range(phys_addr_t addr, size_t size);
|
||||
int valid_mmap_phys_addr_range(unsigned long pfn, size_t size);
|
||||
|
|
|
|||
|
|
@ -122,7 +122,6 @@ CONFIG_INPUT_SPARCSPKR=y
|
|||
# CONFIG_SERIO_SERPORT is not set
|
||||
CONFIG_SERIO_PCIPS2=m
|
||||
CONFIG_SERIO_RAW=m
|
||||
# CONFIG_DEVKMEM is not set
|
||||
CONFIG_SERIAL_SUNSU=y
|
||||
CONFIG_SERIAL_SUNSU_CONSOLE=y
|
||||
CONFIG_SERIAL_SUNSAB=y
|
||||
|
|
|
|||
|
|
@ -454,11 +454,6 @@ void sbus_set_sbus64(struct device *, int);
|
|||
*/
|
||||
#define xlate_dev_mem_ptr(p) __va(p)
|
||||
|
||||
/*
|
||||
* Convert a virtual cached pointer to an uncached pointer
|
||||
*/
|
||||
#define xlate_dev_kmem_ptr(p) p
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* !(__SPARC64_IO_H) */
|
||||
|
|
|
|||
|
|
@ -24,10 +24,3 @@ extern void cow_sizes(int version, __u64 size, int sectorsize, int align,
|
|||
int *data_offset_out);
|
||||
|
||||
#endif
|
||||
|
||||
/*
|
||||
* ---------------------------------------------------------------------------
|
||||
* Local variables:
|
||||
* c-file-style: "linux"
|
||||
* End:
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -72,7 +72,6 @@ CONFIG_MARVELL_PHY=y
|
|||
# CONFIG_INPUT_KEYBOARD is not set
|
||||
# CONFIG_INPUT_MOUSE is not set
|
||||
# CONFIG_SERIO is not set
|
||||
CONFIG_DEVKMEM=y
|
||||
CONFIG_SERIAL_8250=y
|
||||
# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
|
||||
CONFIG_SERIAL_8250_CONSOLE=y
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
#include <linux/init.h>
|
||||
#include <linux/bio.h>
|
||||
#include <linux/blkdev.h>
|
||||
#include <linux/pagemap.h>
|
||||
#include <linux/gcd.h>
|
||||
#include <linux/lcm.h>
|
||||
#include <linux/jiffies.h>
|
||||
|
|
|
|||
|
|
@ -1737,10 +1737,3 @@ module_init(panel_init_module);
|
|||
module_exit(panel_cleanup_module);
|
||||
MODULE_AUTHOR("Willy Tarreau");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
/*
|
||||
* Local variables:
|
||||
* c-indent-level: 4
|
||||
* tab-width: 8
|
||||
* End:
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
#include <linux/kernel_read_file.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/initrd.h>
|
||||
#include <linux/timer.h>
|
||||
#include <linux/vmalloc.h>
|
||||
#include <linux/interrupt.h>
|
||||
|
|
@ -504,6 +505,7 @@ fw_get_filesystem_firmware(struct device *device, struct fw_priv *fw_priv,
|
|||
if (!path)
|
||||
return -ENOMEM;
|
||||
|
||||
wait_for_initramfs();
|
||||
for (i = 0; i < ARRAY_SIZE(fw_path); i++) {
|
||||
size_t file_size = 0;
|
||||
size_t *file_size_ptr = NULL;
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
#include <linux/bio.h>
|
||||
#include <linux/highmem.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/pagemap.h>
|
||||
#include <linux/radix-tree.h>
|
||||
#include <linux/fs.h>
|
||||
#include <linux/slab.h>
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@
|
|||
#include <linux/moduleparam.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/fs.h>
|
||||
#include <linux/pagemap.h>
|
||||
#include <linux/file.h>
|
||||
#include <linux/stat.h>
|
||||
#include <linux/errno.h>
|
||||
|
|
|
|||
|
|
@ -334,16 +334,6 @@ config DEVMEM
|
|||
memory.
|
||||
When in doubt, say "Y".
|
||||
|
||||
config DEVKMEM
|
||||
bool "/dev/kmem virtual device support"
|
||||
# On arm64, VMALLOC_START < PAGE_OFFSET, which confuses kmem read/write
|
||||
depends on !ARM64
|
||||
help
|
||||
Say Y here if you want to support the /dev/kmem device. The
|
||||
/dev/kmem device is rarely used, but can be used for certain
|
||||
kind of kernel debugging operations.
|
||||
When in doubt, say "N".
|
||||
|
||||
config NVRAM
|
||||
tristate "/dev/nvram support"
|
||||
depends on X86 || HAVE_ARCH_NVRAM_OPS
|
||||
|
|
|
|||
|
|
@ -403,221 +403,6 @@ static int mmap_mem(struct file *file, struct vm_area_struct *vma)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int mmap_kmem(struct file *file, struct vm_area_struct *vma)
|
||||
{
|
||||
unsigned long pfn;
|
||||
|
||||
/* Turn a kernel-virtual address into a physical page frame */
|
||||
pfn = __pa((u64)vma->vm_pgoff << PAGE_SHIFT) >> PAGE_SHIFT;
|
||||
|
||||
/*
|
||||
* RED-PEN: on some architectures there is more mapped memory than
|
||||
* available in mem_map which pfn_valid checks for. Perhaps should add a
|
||||
* new macro here.
|
||||
*
|
||||
* RED-PEN: vmalloc is not supported right now.
|
||||
*/
|
||||
if (!pfn_valid(pfn))
|
||||
return -EIO;
|
||||
|
||||
vma->vm_pgoff = pfn;
|
||||
return mmap_mem(file, vma);
|
||||
}
|
||||
|
||||
/*
|
||||
* This function reads the *virtual* memory as seen by the kernel.
|
||||
*/
|
||||
static ssize_t read_kmem(struct file *file, char __user *buf,
|
||||
size_t count, loff_t *ppos)
|
||||
{
|
||||
unsigned long p = *ppos;
|
||||
ssize_t low_count, read, sz;
|
||||
char *kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
|
||||
int err = 0;
|
||||
|
||||
read = 0;
|
||||
if (p < (unsigned long) high_memory) {
|
||||
low_count = count;
|
||||
if (count > (unsigned long)high_memory - p)
|
||||
low_count = (unsigned long)high_memory - p;
|
||||
|
||||
#ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED
|
||||
/* we don't have page 0 mapped on sparc and m68k.. */
|
||||
if (p < PAGE_SIZE && low_count > 0) {
|
||||
sz = size_inside_page(p, low_count);
|
||||
if (clear_user(buf, sz))
|
||||
return -EFAULT;
|
||||
buf += sz;
|
||||
p += sz;
|
||||
read += sz;
|
||||
low_count -= sz;
|
||||
count -= sz;
|
||||
}
|
||||
#endif
|
||||
while (low_count > 0) {
|
||||
sz = size_inside_page(p, low_count);
|
||||
|
||||
/*
|
||||
* On ia64 if a page has been mapped somewhere as
|
||||
* uncached, then it must also be accessed uncached
|
||||
* by the kernel or data corruption may occur
|
||||
*/
|
||||
kbuf = xlate_dev_kmem_ptr((void *)p);
|
||||
if (!virt_addr_valid(kbuf))
|
||||
return -ENXIO;
|
||||
|
||||
if (copy_to_user(buf, kbuf, sz))
|
||||
return -EFAULT;
|
||||
buf += sz;
|
||||
p += sz;
|
||||
read += sz;
|
||||
low_count -= sz;
|
||||
count -= sz;
|
||||
if (should_stop_iteration()) {
|
||||
count = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (count > 0) {
|
||||
kbuf = (char *)__get_free_page(GFP_KERNEL);
|
||||
if (!kbuf)
|
||||
return -ENOMEM;
|
||||
while (count > 0) {
|
||||
sz = size_inside_page(p, count);
|
||||
if (!is_vmalloc_or_module_addr((void *)p)) {
|
||||
err = -ENXIO;
|
||||
break;
|
||||
}
|
||||
sz = vread(kbuf, (char *)p, sz);
|
||||
if (!sz)
|
||||
break;
|
||||
if (copy_to_user(buf, kbuf, sz)) {
|
||||
err = -EFAULT;
|
||||
break;
|
||||
}
|
||||
count -= sz;
|
||||
buf += sz;
|
||||
read += sz;
|
||||
p += sz;
|
||||
if (should_stop_iteration())
|
||||
break;
|
||||
}
|
||||
free_page((unsigned long)kbuf);
|
||||
}
|
||||
*ppos = p;
|
||||
return read ? read : err;
|
||||
}
|
||||
|
||||
|
||||
static ssize_t do_write_kmem(unsigned long p, const char __user *buf,
|
||||
size_t count, loff_t *ppos)
|
||||
{
|
||||
ssize_t written, sz;
|
||||
unsigned long copied;
|
||||
|
||||
written = 0;
|
||||
#ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED
|
||||
/* we don't have page 0 mapped on sparc and m68k.. */
|
||||
if (p < PAGE_SIZE) {
|
||||
sz = size_inside_page(p, count);
|
||||
/* Hmm. Do something? */
|
||||
buf += sz;
|
||||
p += sz;
|
||||
count -= sz;
|
||||
written += sz;
|
||||
}
|
||||
#endif
|
||||
|
||||
while (count > 0) {
|
||||
void *ptr;
|
||||
|
||||
sz = size_inside_page(p, count);
|
||||
|
||||
/*
|
||||
* On ia64 if a page has been mapped somewhere as uncached, then
|
||||
* it must also be accessed uncached by the kernel or data
|
||||
* corruption may occur.
|
||||
*/
|
||||
ptr = xlate_dev_kmem_ptr((void *)p);
|
||||
if (!virt_addr_valid(ptr))
|
||||
return -ENXIO;
|
||||
|
||||
copied = copy_from_user(ptr, buf, sz);
|
||||
if (copied) {
|
||||
written += sz - copied;
|
||||
if (written)
|
||||
break;
|
||||
return -EFAULT;
|
||||
}
|
||||
buf += sz;
|
||||
p += sz;
|
||||
count -= sz;
|
||||
written += sz;
|
||||
if (should_stop_iteration())
|
||||
break;
|
||||
}
|
||||
|
||||
*ppos += written;
|
||||
return written;
|
||||
}
|
||||
|
||||
/*
|
||||
* This function writes to the *virtual* memory as seen by the kernel.
|
||||
*/
|
||||
static ssize_t write_kmem(struct file *file, const char __user *buf,
|
||||
size_t count, loff_t *ppos)
|
||||
{
|
||||
unsigned long p = *ppos;
|
||||
ssize_t wrote = 0;
|
||||
ssize_t virtr = 0;
|
||||
char *kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */
|
||||
int err = 0;
|
||||
|
||||
if (p < (unsigned long) high_memory) {
|
||||
unsigned long to_write = min_t(unsigned long, count,
|
||||
(unsigned long)high_memory - p);
|
||||
wrote = do_write_kmem(p, buf, to_write, ppos);
|
||||
if (wrote != to_write)
|
||||
return wrote;
|
||||
p += wrote;
|
||||
buf += wrote;
|
||||
count -= wrote;
|
||||
}
|
||||
|
||||
if (count > 0) {
|
||||
kbuf = (char *)__get_free_page(GFP_KERNEL);
|
||||
if (!kbuf)
|
||||
return wrote ? wrote : -ENOMEM;
|
||||
while (count > 0) {
|
||||
unsigned long sz = size_inside_page(p, count);
|
||||
unsigned long n;
|
||||
|
||||
if (!is_vmalloc_or_module_addr((void *)p)) {
|
||||
err = -ENXIO;
|
||||
break;
|
||||
}
|
||||
n = copy_from_user(kbuf, buf, sz);
|
||||
if (n) {
|
||||
err = -EFAULT;
|
||||
break;
|
||||
}
|
||||
vwrite(kbuf, (char *)p, sz);
|
||||
count -= sz;
|
||||
buf += sz;
|
||||
virtr += sz;
|
||||
p += sz;
|
||||
if (should_stop_iteration())
|
||||
break;
|
||||
}
|
||||
free_page((unsigned long)kbuf);
|
||||
}
|
||||
|
||||
*ppos = p;
|
||||
return virtr + wrote ? : err;
|
||||
}
|
||||
|
||||
static ssize_t read_port(struct file *file, char __user *buf,
|
||||
size_t count, loff_t *ppos)
|
||||
{
|
||||
|
|
@ -855,7 +640,6 @@ static int open_port(struct inode *inode, struct file *filp)
|
|||
#define write_zero write_null
|
||||
#define write_iter_zero write_iter_null
|
||||
#define open_mem open_port
|
||||
#define open_kmem open_mem
|
||||
|
||||
static const struct file_operations __maybe_unused mem_fops = {
|
||||
.llseek = memory_lseek,
|
||||
|
|
@ -869,18 +653,6 @@ static const struct file_operations __maybe_unused mem_fops = {
|
|||
#endif
|
||||
};
|
||||
|
||||
static const struct file_operations __maybe_unused kmem_fops = {
|
||||
.llseek = memory_lseek,
|
||||
.read = read_kmem,
|
||||
.write = write_kmem,
|
||||
.mmap = mmap_kmem,
|
||||
.open = open_kmem,
|
||||
#ifndef CONFIG_MMU
|
||||
.get_unmapped_area = get_unmapped_area_mem,
|
||||
.mmap_capabilities = memory_mmap_capabilities,
|
||||
#endif
|
||||
};
|
||||
|
||||
static const struct file_operations null_fops = {
|
||||
.llseek = null_lseek,
|
||||
.read = read_null,
|
||||
|
|
@ -924,9 +696,6 @@ static const struct memdev {
|
|||
} devlist[] = {
|
||||
#ifdef CONFIG_DEVMEM
|
||||
[DEVMEM_MINOR] = { "mem", 0, &mem_fops, FMODE_UNSIGNED_OFFSET },
|
||||
#endif
|
||||
#ifdef CONFIG_DEVKMEM
|
||||
[2] = { "kmem", 0, &kmem_fops, FMODE_UNSIGNED_OFFSET },
|
||||
#endif
|
||||
[3] = { "null", 0666, &null_fops, 0 },
|
||||
#ifdef CONFIG_DEVPORT
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
/* vim: set ts=8 sw=8 tw=78 ai noexpandtab */
|
||||
/* qxl_drv.c -- QXL driver -*- linux-c -*-
|
||||
*
|
||||
* Copyright 2011 Red Hat, Inc.
|
||||
|
|
|
|||
|
|
@ -201,6 +201,7 @@ static ssize_t empty_read(struct file *file, char __user *buf,
|
|||
|
||||
static const struct proc_ops empty_proc_ops = {
|
||||
.proc_read = empty_read,
|
||||
.proc_lseek = default_llseek,
|
||||
};
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
#include "features.h"
|
||||
|
||||
#include <linux/blkdev.h>
|
||||
#include <linux/pagemap.h>
|
||||
#include <linux/debugfs.h>
|
||||
#include <linux/genhd.h>
|
||||
#include <linux/idr.h>
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@
|
|||
Please send bug reports and support requests to <luc@saillard.org>.
|
||||
The decompression routines have been implemented by reverse-engineering the
|
||||
Nemosoft binary pwcx module. Caveat emptor.
|
||||
|
||||
|
||||
vim: set ts=8:
|
||||
*/
|
||||
|
||||
#include <asm/current.h>
|
||||
|
|
|
|||
|
|
@ -2070,11 +2070,3 @@ static void __exit starfire_cleanup (void)
|
|||
|
||||
module_init(starfire_init);
|
||||
module_exit(starfire_cleanup);
|
||||
|
||||
|
||||
/*
|
||||
* Local variables:
|
||||
* c-basic-offset: 8
|
||||
* tab-width: 8
|
||||
* End:
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1156,11 +1156,3 @@ static void __exit atarilance_module_exit(void)
|
|||
module_init(atarilance_module_init);
|
||||
module_exit(atarilance_module_exit);
|
||||
#endif /* MODULE */
|
||||
|
||||
|
||||
/*
|
||||
* Local variables:
|
||||
* c-indent-level: 4
|
||||
* tab-width: 4
|
||||
* End:
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -3029,10 +3029,3 @@ static void __exit pcnet32_cleanup_module(void)
|
|||
|
||||
module_init(pcnet32_init_module);
|
||||
module_exit(pcnet32_cleanup_module);
|
||||
|
||||
/*
|
||||
* Local variables:
|
||||
* c-indent-level: 4
|
||||
* tab-width: 8
|
||||
* End:
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -227,6 +227,7 @@ static ssize_t prism2_aux_dump_proc_no_read(struct file *file, char __user *buf,
|
|||
|
||||
static const struct proc_ops prism2_aux_dump_proc_ops = {
|
||||
.proc_read = prism2_aux_dump_proc_no_read,
|
||||
.proc_lseek = default_llseek,
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -312,11 +312,3 @@ static void __exit orinoco_nortel_exit(void)
|
|||
|
||||
module_init(orinoco_nortel_init);
|
||||
module_exit(orinoco_nortel_exit);
|
||||
|
||||
/*
|
||||
* Local variables:
|
||||
* c-indent-level: 8
|
||||
* c-basic-offset: 8
|
||||
* tab-width: 8
|
||||
* End:
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -255,11 +255,3 @@ static void __exit orinoco_pci_exit(void)
|
|||
|
||||
module_init(orinoco_pci_init);
|
||||
module_exit(orinoco_pci_exit);
|
||||
|
||||
/*
|
||||
* Local variables:
|
||||
* c-indent-level: 8
|
||||
* c-basic-offset: 8
|
||||
* tab-width: 8
|
||||
* End:
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -360,11 +360,3 @@ static void __exit orinoco_plx_exit(void)
|
|||
|
||||
module_init(orinoco_plx_init);
|
||||
module_exit(orinoco_plx_exit);
|
||||
|
||||
/*
|
||||
* Local variables:
|
||||
* c-indent-level: 8
|
||||
* c-basic-offset: 8
|
||||
* tab-width: 8
|
||||
* End:
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -235,11 +235,3 @@ static void __exit orinoco_tmd_exit(void)
|
|||
|
||||
module_init(orinoco_tmd_init);
|
||||
module_exit(orinoco_tmd_exit);
|
||||
|
||||
/*
|
||||
* Local variables:
|
||||
* c-indent-level: 8
|
||||
* c-basic-offset: 8
|
||||
* tab-width: 8
|
||||
* End:
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
#include <linux/highmem.h>
|
||||
#include <linux/debugfs.h>
|
||||
#include <linux/blkdev.h>
|
||||
#include <linux/pagemap.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/mutex.h>
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
*/
|
||||
|
||||
#include <linux/blkdev.h>
|
||||
#include <linux/pagemap.h>
|
||||
#include <linux/hdreg.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/platform_device.h>
|
||||
|
|
|
|||
|
|
@ -2224,15 +2224,3 @@ MODULE_PARM_DESC(features,
|
|||
", bit 2: hardware SPP mode"
|
||||
", bit 3: hardware EPP mode"
|
||||
", bit 4: hardware ECP mode");
|
||||
|
||||
/*--- Inform (X)Emacs about preferred coding style ---------------------*/
|
||||
/*
|
||||
* Local Variables:
|
||||
* mode: c
|
||||
* c-file-style: "linux"
|
||||
* indent-tabs-mode: t
|
||||
* tab-width: 8
|
||||
* fill-column: 78
|
||||
* ispell-local-dictionary: "american"
|
||||
* End:
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -675,6 +675,3 @@ static __exit void dcdrbu_exit(void)
|
|||
|
||||
module_exit(dcdrbu_exit);
|
||||
module_init(dcdrbu_init);
|
||||
|
||||
/* vim:noet:ts=8:sw=8
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
/* -*- mode: c; c-basic-offset: 8 -*- */
|
||||
|
||||
/* NCR (or Symbios) 53c700 and 53c700-66 Driver
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
/* -*- mode: c; c-basic-offset: 8 -*- */
|
||||
|
||||
/* Driver for 53c700 and 53c700-66 chips from NCR and Symbios
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1058,9 +1058,3 @@ static void __exit exit_ch_module(void)
|
|||
|
||||
module_init(init_ch_module);
|
||||
module_exit(exit_ch_module);
|
||||
|
||||
/*
|
||||
* Local variables:
|
||||
* c-basic-offset: 8
|
||||
* End:
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -616,6 +616,7 @@ static const struct file_operations esas2r_proc_fops = {
|
|||
};
|
||||
|
||||
static const struct proc_ops esas2r_proc_ops = {
|
||||
.proc_lseek = default_llseek,
|
||||
.proc_ioctl = esas2r_proc_ioctl,
|
||||
#ifdef CONFIG_COMPAT
|
||||
.proc_compat_ioctl = compat_ptr_ioctl,
|
||||
|
|
|
|||
|
|
@ -7099,23 +7099,3 @@ ips_init_phase2(int index)
|
|||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("IBM ServeRAID Adapter Driver " IPS_VER_STRING);
|
||||
MODULE_VERSION(IPS_VER_STRING);
|
||||
|
||||
|
||||
/*
|
||||
* Overrides for Emacs so that we almost follow Linus's tabbing style.
|
||||
* Emacs will notice this stuff at the end of the file and automatically
|
||||
* adjust the settings for this buffer only. This must remain at the end
|
||||
* of the file.
|
||||
* ---------------------------------------------------------------------------
|
||||
* Local variables:
|
||||
* c-indent-level: 2
|
||||
* c-brace-imaginary-offset: 0
|
||||
* c-brace-offset: -2
|
||||
* c-argdecl-indent: 2
|
||||
* c-label-offset: -2
|
||||
* c-continued-statement-offset: 2
|
||||
* c-continued-brace-offset: 0
|
||||
* indent-tabs-mode: nil
|
||||
* tab-width: 8
|
||||
* End:
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1211,23 +1211,3 @@ typedef struct {
|
|||
IPS_COMPAT_TAMPA, \
|
||||
IPS_COMPAT_KEYWEST \
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Overrides for Emacs so that we almost follow Linus's tabbing style.
|
||||
* Emacs will notice this stuff at the end of the file and automatically
|
||||
* adjust the settings for this buffer only. This must remain at the end
|
||||
* of the file.
|
||||
* ---------------------------------------------------------------------------
|
||||
* Local variables:
|
||||
* c-indent-level: 2
|
||||
* c-brace-imaginary-offset: 0
|
||||
* c-brace-offset: -2
|
||||
* c-argdecl-indent: 2
|
||||
* c-label-offset: -2
|
||||
* c-continued-statement-offset: 2
|
||||
* c-continued-brace-offset: 0
|
||||
* indent-tabs-mode: nil
|
||||
* tab-width: 8
|
||||
* End:
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
/* -*- mode: c; c-basic-offset: 8 -*- */
|
||||
|
||||
/* PARISC LASI driver for the 53c700 chip
|
||||
*
|
||||
|
|
|
|||
|
|
@ -781,5 +781,3 @@ typedef struct {
|
|||
} __attribute__ ((packed)) mbox_sgl32;
|
||||
|
||||
#endif // _MRAID_MBOX_DEFS_H_
|
||||
|
||||
/* vim: set ts=8 sw=8 tw=78: */
|
||||
|
|
|
|||
|
|
@ -282,5 +282,3 @@ struct mraid_pci_blk {
|
|||
};
|
||||
|
||||
#endif // _MEGA_COMMON_H_
|
||||
|
||||
// vim: set ts=8 sw=8 tw=78:
|
||||
|
|
|
|||
|
|
@ -4068,5 +4068,3 @@ megaraid_sysfs_show_ldnum(struct device *dev, struct device_attribute *attr, cha
|
|||
*/
|
||||
module_init(megaraid_init);
|
||||
module_exit(megaraid_exit);
|
||||
|
||||
/* vim: set ts=8 sw=8 tw=78 ai si: */
|
||||
|
|
|
|||
|
|
@ -230,5 +230,3 @@ typedef struct {
|
|||
#define WROUTDOOR(rdev, value) writel(value, (rdev)->baseaddr + 0x2C)
|
||||
|
||||
#endif // _MEGARAID_H_
|
||||
|
||||
// vim: set ts=8 sw=8 tw=78:
|
||||
|
|
|
|||
|
|
@ -4403,15 +4403,3 @@ MODULE_FIRMWARE("qlogic/1040.bin");
|
|||
MODULE_FIRMWARE("qlogic/1280.bin");
|
||||
MODULE_FIRMWARE("qlogic/12160.bin");
|
||||
MODULE_VERSION(QLA1280_VERSION);
|
||||
|
||||
/*
|
||||
* Overrides for Emacs so that we almost follow Linus's tabbing style.
|
||||
* Emacs will notice this stuff at the end of the file and automatically
|
||||
* adjust the settings for this buffer only. This must remain at the end
|
||||
* of the file.
|
||||
* ---------------------------------------------------------------------------
|
||||
* Local variables:
|
||||
* c-basic-offset: 8
|
||||
* tab-width: 8
|
||||
* End:
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
#include <linux/genhd.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/blkdev.h>
|
||||
#include <linux/pagemap.h>
|
||||
#include <linux/msdos_partition.h>
|
||||
#include <asm/unaligned.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
/* -*- mode: c; c-basic-offset: 8 -*- */
|
||||
|
||||
/* SNI RM driver
|
||||
*
|
||||
|
|
|
|||
|
|
@ -2608,12 +2608,3 @@ EXPORT_SYMBOL(matroxfb_register_driver);
|
|||
EXPORT_SYMBOL(matroxfb_unregister_driver);
|
||||
EXPORT_SYMBOL(matroxfb_wait_for_sync);
|
||||
EXPORT_SYMBOL(matroxfb_enable_irq);
|
||||
|
||||
/*
|
||||
* Overrides for Emacs so that we follow Linus's tabbing style.
|
||||
* ---------------------------------------------------------------------------
|
||||
* Local variables:
|
||||
* c-basic-offset: 8
|
||||
* End:
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -1451,13 +1451,3 @@ MODULE_DESCRIPTION("Legacy VGA framebuffer device driver");
|
|||
MODULE_LICENSE("GPL");
|
||||
module_init(vga16fb_init);
|
||||
module_exit(vga16fb_exit);
|
||||
|
||||
|
||||
/*
|
||||
* Overrides for Emacs so that we follow Linus's tabbing style.
|
||||
* ---------------------------------------------------------------------------
|
||||
* Local variables:
|
||||
* c-basic-offset: 8
|
||||
* End:
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
||||
/* -*- mode: c; c-basic-offset:8; -*-
|
||||
* vim: noexpandtab sw=8 ts=8 sts=0:
|
||||
*
|
||||
/*
|
||||
* configfs_internal.h - Internal stuff for configfs
|
||||
*
|
||||
* Based on sysfs:
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
/* -*- mode: c; c-basic-offset: 8; -*-
|
||||
* vim: noexpandtab sw=8 ts=8 sts=0:
|
||||
*
|
||||
/*
|
||||
* dir.c - Operations for configfs directories.
|
||||
*
|
||||
* Based on sysfs:
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
/* -*- mode: c; c-basic-offset: 8; -*-
|
||||
* vim: noexpandtab sw=8 ts=8 sts=0:
|
||||
*
|
||||
/*
|
||||
* file.c - operations for regular (text) files.
|
||||
*
|
||||
* Based on sysfs:
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
/* -*- mode: c; c-basic-offset: 8; -*-
|
||||
* vim: noexpandtab sw=8 ts=8 sts=0:
|
||||
*
|
||||
/*
|
||||
* inode.c - basic inode and dentry operations.
|
||||
*
|
||||
* Based on sysfs:
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
/* -*- mode: c; c-basic-offset: 8; -*-
|
||||
* vim: noexpandtab sw=8 ts=8 sts=0:
|
||||
*
|
||||
/*
|
||||
* item.c - library routines for handling generic config items
|
||||
*
|
||||
* Based on kobject:
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
/* -*- mode: c; c-basic-offset: 8; -*-
|
||||
* vim: noexpandtab sw=8 ts=8 sts=0:
|
||||
*
|
||||
/*
|
||||
* mount.c - operations for initializing and mounting configfs.
|
||||
*
|
||||
* Based on sysfs:
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
/* -*- mode: c; c-basic-offset: 8; -*-
|
||||
* vim: noexpandtab sw=8 ts=8 sts=0:
|
||||
*
|
||||
/*
|
||||
* symlink.c - operations for configfs symlinks.
|
||||
*
|
||||
* Based on sysfs:
|
||||
|
|
|
|||
|
|
@ -657,6 +657,12 @@ static void ep_done_scan(struct eventpoll *ep,
|
|||
*/
|
||||
list_splice(txlist, &ep->rdllist);
|
||||
__pm_relax(ep->ws);
|
||||
|
||||
if (!list_empty(&ep->rdllist)) {
|
||||
if (waitqueue_active(&ep->wq))
|
||||
wake_up(&ep->wq);
|
||||
}
|
||||
|
||||
write_unlock_irq(&ep->lock);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -771,7 +771,7 @@ int fat_trim_fs(struct inode *inode, struct fstrim_range *range)
|
|||
/*
|
||||
* FAT data is organized as clusters, trim at the granulary of cluster.
|
||||
*
|
||||
* fstrim_range is in byte, convert vaules to cluster index.
|
||||
* fstrim_range is in byte, convert values to cluster index.
|
||||
* Treat sectors before data region as all used, not to trim them.
|
||||
*/
|
||||
ent_start = max_t(u64, range->start>>sbi->cluster_bits, FAT_START_ENT);
|
||||
|
|
|
|||
|
|
@ -356,7 +356,8 @@ struct hpfs_dirent {
|
|||
u8 no_of_acls; /* number of ACL's (low 3 bits) */
|
||||
u8 ix; /* code page index (of filename), see
|
||||
struct code_page_data */
|
||||
u8 namelen, name[1]; /* file name */
|
||||
u8 namelen; /* file name length */
|
||||
u8 name[]; /* file name */
|
||||
/* dnode_secno down; btree down pointer, if present,
|
||||
follows name on next word boundary, or maybe it
|
||||
precedes next dirent, which is on a word boundary. */
|
||||
|
|
|
|||
|
|
@ -767,6 +767,7 @@ static int rock_ridge_symlink_readpage(struct file *file, struct page *page)
|
|||
rs.cont_extent = isonum_733(rr->u.CE.extent);
|
||||
rs.cont_offset = isonum_733(rr->u.CE.offset);
|
||||
rs.cont_size = isonum_733(rr->u.CE.size);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3004,10 +3004,3 @@ int nfs_permission(struct user_namespace *mnt_userns,
|
|||
goto out;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(nfs_permission);
|
||||
|
||||
/*
|
||||
* Local variables:
|
||||
* version-control: t
|
||||
* kept-new-versions: 5
|
||||
* End:
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -10427,9 +10427,3 @@ const struct xattr_handler *nfs4_xattr_handlers[] = {
|
|||
#endif
|
||||
NULL
|
||||
};
|
||||
|
||||
/*
|
||||
* Local variables:
|
||||
* c-basic-offset: 8
|
||||
* End:
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -149,9 +149,3 @@ void nfs4_set_lease_period(struct nfs_client *clp,
|
|||
/* Cap maximum reconnect timeout at 1/2 lease period */
|
||||
rpc_set_connect_timeout(clp->cl_rpcclient, lease, lease >> 1);
|
||||
}
|
||||
|
||||
/*
|
||||
* Local variables:
|
||||
* c-basic-offset: 8
|
||||
* End:
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -2695,9 +2695,3 @@ static int nfs4_run_state_manager(void *ptr)
|
|||
module_put_and_exit(0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Local variables:
|
||||
* c-basic-offset: 8
|
||||
* End:
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -7629,9 +7629,3 @@ const struct rpc_version nfs_version4 = {
|
|||
.procs = nfs4_procedures,
|
||||
.counts = nfs_version4_counts,
|
||||
};
|
||||
|
||||
/*
|
||||
* Local variables:
|
||||
* c-basic-offset: 8
|
||||
* End:
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -3317,9 +3317,3 @@ const struct svc_version nfsd_version4 = {
|
|||
.vs_rpcb_optnl = true,
|
||||
.vs_need_cong_ctrl = true,
|
||||
};
|
||||
|
||||
/*
|
||||
* Local variables:
|
||||
* c-basic-offset: 8
|
||||
* End:
|
||||
*/
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue