Skip to content

Commit b5dd0c6

Browse files
committed
Merge branch 'akpm' (patches from Andrew)
Merge more updates from Andrew Morton: - some of the rest of MM - various misc things - dynamic-debug updates - checkpatch - some epoll speedups - autofs - rapidio - lib/, lib/lzo/ updates * emailed patches from Andrew Morton <[email protected]>: (83 commits) samples/mic/mpssd/mpssd.h: remove duplicate header kernel/fork.c: remove duplicated include include/linux/relay.h: fix percpu annotation in struct rchan arch/nios2/mm/fault.c: remove duplicate include unicore32: stop printing the virtual memory layout MAINTAINERS: fix GTA02 entry and mark as orphan mm: create the new vm_fault_t type arm, s390, unicore32: remove oneliner wrappers for memblock_alloc() arch: simplify several early memory allocations openrisc: simplify pte_alloc_one_kernel() sh: prefer memblock APIs returning virtual address microblaze: prefer memblock API returning virtual address powerpc: prefer memblock APIs returning virtual address lib/lzo: separate lzo-rle from lzo lib/lzo: implement run-length encoding lib/lzo: fast 8-byte copy on arm64 lib/lzo: 64-bit CTZ on arm64 lib/lzo: tidy-up ifdefs ipc/sem.c: replace kvmalloc/memset with kvzalloc and use struct_size ipc: annotate implicit fall through ...
2 parents 610cd4e + fe0436e commit b5dd0c6

File tree

148 files changed

+1100
-658
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+1100
-658
lines changed

Documentation/dontdiff

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ compile.h*
106106
conf
107107
config
108108
config-*
109-
config_data.h*
110109
config.mak
111110
config.mak.autogen
112111
conmakehash

Documentation/lzo.txt

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,34 @@ Description
7878
is an implementation design choice independent on the algorithm or
7979
encoding.
8080

81+
Versions
82+
83+
0: Original version
84+
1: LZO-RLE
85+
86+
Version 1 of LZO implements an extension to encode runs of zeros using run
87+
length encoding. This improves speed for data with many zeros, which is a
88+
common case for zram. This modifies the bitstream in a backwards compatible way
89+
(v1 can correctly decompress v0 compressed data, but v0 cannot read v1 data).
90+
91+
For maximum compatibility, both versions are available under different names
92+
(lzo and lzo-rle). Differences in the encoding are noted in this document with
93+
e.g.: version 1 only.
94+
8195
Byte sequences
8296
==============
8397

8498
First byte encoding::
8599

86-
0..17 : follow regular instruction encoding, see below. It is worth
87-
noting that codes 16 and 17 will represent a block copy from
88-
the dictionary which is empty, and that they will always be
100+
0..16 : follow regular instruction encoding, see below. It is worth
101+
noting that code 16 will represent a block copy from the
102+
dictionary which is empty, and that it will always be
89103
invalid at this place.
90104

105+
17 : bitstream version. If the first byte is 17, the next byte
106+
gives the bitstream version (version 1 only). If the first byte
107+
is not 17, the bitstream version is 0.
108+
91109
18..21 : copy 0..3 literals
92110
state = (byte - 17) = 0..3 [ copy <state> literals ]
93111
skip byte
@@ -140,6 +158,11 @@ Byte sequences
140158
state = S (copy S literals after this block)
141159
End of stream is reached if distance == 16384
142160

161+
In version 1 only, this instruction is also used to encode a run of
162+
zeros if distance = 0xbfff, i.e. H = 1 and the D bits are all 1.
163+
In this case, it is followed by a fourth byte, X.
164+
run length = ((X << 3) | (0 0 0 0 0 L L L)) + 4.
165+
143166
0 0 1 L L L L L (32..63)
144167
Copy of small block within 16kB distance (preferably less than 34B)
145168
length = 2 + (L ?: 31 + (zero_bytes * 255) + non_zero_byte)
@@ -165,7 +188,9 @@ Authors
165188
=======
166189

167190
This document was written by Willy Tarreau <[email protected]> on 2014/07/19 during an
168-
analysis of the decompression code available in Linux 3.16-rc5. The code is
169-
tricky, it is possible that this document contains mistakes or that a few
170-
corner cases were overlooked. In any case, please report any doubt, fix, or
171-
proposed updates to the author(s) so that the document can be updated.
191+
analysis of the decompression code available in Linux 3.16-rc5, and updated
192+
by Dave Rodgman <[email protected]> on 2018/10/30 to introduce run-length
193+
encoding. The code is tricky, it is possible that this document contains
194+
mistakes or that a few corner cases were overlooked. In any case, please
195+
report any doubt, fix, or proposed updates to the author(s) so that the
196+
document can be updated.

Documentation/process/4.Coding.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ features; most of these are found in the "kernel hacking" submenu. Several
249249
of these options should be turned on for any kernel used for development or
250250
testing purposes. In particular, you should turn on:
251251

252-
- ENABLE_WARN_DEPRECATED, ENABLE_MUST_CHECK, and FRAME_WARN to get an
252+
- ENABLE_MUST_CHECK and FRAME_WARN to get an
253253
extra set of warnings for problems like the use of deprecated interfaces
254254
or ignoring an important return value from a function. The output
255255
generated by these warnings can be verbose, but one need not worry about

Documentation/translations/it_IT/process/4.Coding.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ La maggior parte di queste opzioni possono essere attivate per qualsiasi
264264
kernel utilizzato per lo sviluppo o a scopo di test. In particolare dovreste
265265
attivare:
266266

267-
- ENABLE_WARN_DEPRECATED, ENABLE_MUST_CHECK, e FRAME_WARN per ottenere degli
267+
- ENABLE_MUST_CHECK e FRAME_WARN per ottenere degli
268268
avvertimenti dedicati a problemi come l'uso di interfacce deprecate o
269269
l'ignorare un importante valore di ritorno di una funzione. Il risultato
270270
generato da questi avvertimenti può risultare verboso, ma non bisogna

MAINTAINERS

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1899,10 +1899,11 @@ F: drivers/usb/host/ehci-w90x900.c
18991899
F: drivers/video/fbdev/nuc900fb.c
19001900

19011901
ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
1902-
M: Nelson Castillo <[email protected]>
19031902
L: [email protected] (subscribers-only)
19041903
W: http://wiki.openmoko.org/wiki/Neo_FreeRunner
1905-
S: Supported
1904+
S: Orphan
1905+
F: arch/arm/mach-s3c24xx/mach-gta02.c
1906+
F: arch/arm/mach-s3c24xx/gta02.h
19061907

19071908
ARM/Orion SoC/Technologic Systems TS-78xx platform support
19081909
M: Alexander Clouter <[email protected]>

arch/arc/configs/axs101_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ CONFIG_NFS_FS=y
9999
CONFIG_NFS_V3_ACL=y
100100
CONFIG_NLS_CODEPAGE_437=y
101101
CONFIG_NLS_ISO8859_1=y
102-
# CONFIG_ENABLE_WARN_DEPRECATED is not set
103102
# CONFIG_ENABLE_MUST_CHECK is not set
104103
CONFIG_STRIP_ASM_SYMS=y
105104
CONFIG_SOFTLOCKUP_DETECTOR=y

arch/arc/configs/axs103_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ CONFIG_NFS_FS=y
9797
CONFIG_NFS_V3_ACL=y
9898
CONFIG_NLS_CODEPAGE_437=y
9999
CONFIG_NLS_ISO8859_1=y
100-
# CONFIG_ENABLE_WARN_DEPRECATED is not set
101100
# CONFIG_ENABLE_MUST_CHECK is not set
102101
CONFIG_STRIP_ASM_SYMS=y
103102
CONFIG_SOFTLOCKUP_DETECTOR=y

arch/arc/configs/axs103_smp_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ CONFIG_NFS_FS=y
100100
CONFIG_NFS_V3_ACL=y
101101
CONFIG_NLS_CODEPAGE_437=y
102102
CONFIG_NLS_ISO8859_1=y
103-
# CONFIG_ENABLE_WARN_DEPRECATED is not set
104103
# CONFIG_ENABLE_MUST_CHECK is not set
105104
CONFIG_STRIP_ASM_SYMS=y
106105
CONFIG_SOFTLOCKUP_DETECTOR=y

arch/arc/configs/haps_hs_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ CONFIG_EXT2_FS_XATTR=y
7575
CONFIG_TMPFS=y
7676
# CONFIG_MISC_FILESYSTEMS is not set
7777
CONFIG_NFS_FS=y
78-
# CONFIG_ENABLE_WARN_DEPRECATED is not set
7978
# CONFIG_ENABLE_MUST_CHECK is not set
8079
CONFIG_DEBUG_MEMORY_INIT=y
8180
# CONFIG_DEBUG_PREEMPT is not set

arch/arc/configs/haps_hs_smp_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ CONFIG_EXT2_FS_XATTR=y
7878
CONFIG_TMPFS=y
7979
# CONFIG_MISC_FILESYSTEMS is not set
8080
CONFIG_NFS_FS=y
81-
# CONFIG_ENABLE_WARN_DEPRECATED is not set
8281
# CONFIG_ENABLE_MUST_CHECK is not set
8382
CONFIG_SOFTLOCKUP_DETECTOR=y
8483
# CONFIG_DEBUG_PREEMPT is not set

0 commit comments

Comments
 (0)