Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for-5.16/parisc-6' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc fixes from Helge Deller:
"Some bug and warning fixes:
- Fix "make install" to use debians "installkernel" script which is
now in /usr/sbin
- Fix the bindeb-pkg make target by giving the correct KBUILD_IMAGE
file name
- Fix compiler warnings by annotating parisc agp init functions with
__init
- Fix timekeeping on SMP machines with dual-core CPUs
- Enable some more config options in the 64-bit defconfig"
* tag 'for-5.16/parisc-6' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Mark cr16 CPU clocksource unstable on all SMP machines
parisc: Fix "make install" on newer debian releases
parisc/agp: Annotate parisc agp init functions with __init
parisc: Enable sata sil, audit and usb support on 64-bit defconfig
parisc: Fix KBUILD_IMAGE for self-extracting kernel
+29
-25
+5
arch/parisc/Makefile
+5
arch/parisc/Makefile
···
15
15
# Mike Shaver, Helge Deller and Martin K. Petersen
16
16
#
17
17
18
+
ifdef CONFIG_PARISC_SELF_EXTRACT
19
+
boot := arch/parisc/boot
20
+
KBUILD_IMAGE := $(boot)/bzImage
21
+
else
18
22
KBUILD_IMAGE := vmlinuz
23
+
endif
19
24
20
25
NM = sh $(srctree)/arch/parisc/nm
21
26
CHECKFLAGS += -D__hppa__=1
+13
-1
arch/parisc/configs/generic-64bit_defconfig
+13
-1
arch/parisc/configs/generic-64bit_defconfig
···
1
1
CONFIG_LOCALVERSION="-64bit"
2
2
# CONFIG_LOCALVERSION_AUTO is not set
3
+
CONFIG_KERNEL_LZ4=y
3
4
CONFIG_SYSVIPC=y
4
5
CONFIG_POSIX_MQUEUE=y
6
+
CONFIG_AUDIT=y
5
7
CONFIG_BSD_PROCESS_ACCT=y
6
8
CONFIG_BSD_PROCESS_ACCT_V3=y
7
9
CONFIG_TASKSTATS=y
···
37
35
CONFIG_BLK_DEV_INTEGRITY=y
38
36
CONFIG_BINFMT_MISC=m
39
37
# CONFIG_COMPACTION is not set
38
+
CONFIG_MEMORY_FAILURE=y
40
39
CONFIG_NET=y
41
40
CONFIG_PACKET=y
42
41
CONFIG_UNIX=y
···
68
65
CONFIG_SCSI_SRP_ATTRS=y
69
66
CONFIG_ISCSI_BOOT_SYSFS=y
70
67
CONFIG_SCSI_MPT2SAS=y
71
-
CONFIG_SCSI_LASI700=m
68
+
CONFIG_SCSI_LASI700=y
72
69
CONFIG_SCSI_SYM53C8XX_2=y
73
70
CONFIG_SCSI_ZALON=y
74
71
CONFIG_SCSI_QLA_ISCSI=m
75
72
CONFIG_SCSI_DH=y
76
73
CONFIG_ATA=y
74
+
CONFIG_SATA_SIL=y
75
+
CONFIG_SATA_SIS=y
76
+
CONFIG_SATA_VIA=y
77
77
CONFIG_PATA_NS87415=y
78
78
CONFIG_PATA_SIL680=y
79
79
CONFIG_ATA_GENERIC=y
···
85
79
CONFIG_BLK_DEV_DM=m
86
80
CONFIG_DM_RAID=m
87
81
CONFIG_DM_UEVENT=y
82
+
CONFIG_DM_AUDIT=y
88
83
CONFIG_FUSION=y
89
84
CONFIG_FUSION_SPI=y
90
85
CONFIG_FUSION_SAS=y
···
203
196
CONFIG_FB_MATROX_I2C=y
204
197
CONFIG_FB_MATROX_MAVEN=y
205
198
CONFIG_FB_RADEON=y
199
+
CONFIG_LOGO=y
200
+
# CONFIG_LOGO_LINUX_CLUT224 is not set
206
201
CONFIG_HIDRAW=y
207
202
CONFIG_HID_PID=y
208
203
CONFIG_USB_HIDDEV=y
209
204
CONFIG_USB=y
205
+
CONFIG_USB_EHCI_HCD=y
206
+
CONFIG_USB_OHCI_HCD=y
207
+
CONFIG_USB_OHCI_HCD_PLATFORM=y
210
208
CONFIG_UIO=y
211
209
CONFIG_UIO_PDRV_GENIRQ=m
212
210
CONFIG_UIO_AEC=m
+1
arch/parisc/install.sh
+1
arch/parisc/install.sh
···
39
39
if [ -n "${INSTALLKERNEL}" ]; then
40
40
if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
41
41
if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
42
+
if [ -x /usr/sbin/${INSTALLKERNEL} ]; then exec /usr/sbin/${INSTALLKERNEL} "$@"; fi
42
43
fi
43
44
44
45
# Default install
+7
-21
arch/parisc/kernel/time.c
+7
-21
arch/parisc/kernel/time.c
···
249
249
static int __init init_cr16_clocksource(void)
250
250
{
251
251
/*
252
-
* The cr16 interval timers are not syncronized across CPUs on
253
-
* different sockets, so mark them unstable and lower rating on
254
-
* multi-socket SMP systems.
252
+
* The cr16 interval timers are not syncronized across CPUs, even if
253
+
* they share the same socket.
255
254
*/
256
255
if (num_online_cpus() > 1 && !running_on_qemu) {
257
-
int cpu;
258
-
unsigned long cpu0_loc;
259
-
cpu0_loc = per_cpu(cpu_data, 0).cpu_loc;
256
+
/* mark sched_clock unstable */
257
+
clear_sched_clock_stable();
260
258
261
-
for_each_online_cpu(cpu) {
262
-
if (cpu == 0)
263
-
continue;
264
-
if ((cpu0_loc != 0) &&
265
-
(cpu0_loc == per_cpu(cpu_data, cpu).cpu_loc))
266
-
continue;
267
-
268
-
/* mark sched_clock unstable */
269
-
clear_sched_clock_stable();
270
-
271
-
clocksource_cr16.name = "cr16_unstable";
272
-
clocksource_cr16.flags = CLOCK_SOURCE_UNSTABLE;
273
-
clocksource_cr16.rating = 0;
274
-
break;
275
-
}
259
+
clocksource_cr16.name = "cr16_unstable";
260
+
clocksource_cr16.flags = CLOCK_SOURCE_UNSTABLE;
261
+
clocksource_cr16.rating = 0;
276
262
}
277
263
278
264
/* register at clocksource framework */
+3
-3
drivers/char/agp/parisc-agp.c
+3
-3
drivers/char/agp/parisc-agp.c
···
281
281
return 0;
282
282
}
283
283
284
-
static int
284
+
static int __init
285
285
lba_find_capability(int cap)
286
286
{
287
287
struct _parisc_agp_info *info = &parisc_agp_info;
···
366
366
return error;
367
367
}
368
368
369
-
static int
369
+
static int __init
370
370
find_quicksilver(struct device *dev, void *data)
371
371
{
372
372
struct parisc_device **lba = data;
···
378
378
return 0;
379
379
}
380
380
381
-
static int
381
+
static int __init
382
382
parisc_agp_init(void)
383
383
{
384
384
extern struct sba_device *sba_list;