diff --git a/Kernel/FileSystem/FIFO.cpp b/Kernel/FileSystem/FIFO.cpp index 140820ed00..9881b6916b 100644 --- a/Kernel/FileSystem/FIFO.cpp +++ b/Kernel/FileSystem/FIFO.cpp @@ -37,7 +37,7 @@ namespace Kernel { -Lockable>& all_fifos() +static Lockable>& all_fifos() { static Lockable>* s_table; if (!s_table) diff --git a/Kernel/FileSystem/Inode.cpp b/Kernel/FileSystem/Inode.cpp index b88dd8b490..e7885e9e7b 100644 --- a/Kernel/FileSystem/Inode.cpp +++ b/Kernel/FileSystem/Inode.cpp @@ -39,7 +39,7 @@ namespace Kernel { static SpinLock s_all_inodes_lock; -InlineLinkedList& all_inodes() +static InlineLinkedList& all_inodes() { ASSERT(s_all_inodes_lock.is_locked()); diff --git a/Kernel/FileSystem/ProcFS.cpp b/Kernel/FileSystem/ProcFS.cpp index 4d98a95b3c..d2220d5c36 100644 --- a/Kernel/FileSystem/ProcFS.cpp +++ b/Kernel/FileSystem/ProcFS.cpp @@ -260,7 +260,7 @@ ProcFS::~ProcFS() { } -Optional procfs$pid_fds(InodeIdentifier identifier) +static Optional procfs$pid_fds(InodeIdentifier identifier) { KBufferBuilder builder; JsonArraySerializer array { builder }; @@ -296,7 +296,7 @@ Optional procfs$pid_fds(InodeIdentifier identifier) return builder.build(); } -Optional procfs$pid_fd_entry(InodeIdentifier identifier) +static Optional procfs$pid_fd_entry(InodeIdentifier identifier) { auto process = Process::from_pid(to_pid(identifier)); if (!process) @@ -308,7 +308,7 @@ Optional procfs$pid_fd_entry(InodeIdentifier identifier) return description->absolute_path().to_byte_buffer(); } -Optional procfs$pid_vm(InodeIdentifier identifier) +static Optional procfs$pid_vm(InodeIdentifier identifier) { auto process = Process::from_pid(to_pid(identifier)); if (!process) @@ -357,7 +357,7 @@ Optional procfs$pid_vm(InodeIdentifier identifier) return builder.build(); } -Optional procfs$pci(InodeIdentifier) +static Optional procfs$pci(InodeIdentifier) { KBufferBuilder builder; JsonArraySerializer array { builder }; @@ -379,7 +379,7 @@ Optional procfs$pci(InodeIdentifier) return builder.build(); } -Optional procfs$interrupts(InodeIdentifier) +static Optional procfs$interrupts(InodeIdentifier) { KBufferBuilder builder; JsonArraySerializer array { builder }; @@ -396,7 +396,7 @@ Optional procfs$interrupts(InodeIdentifier) return builder.build(); } -Optional procfs$keymap(InodeIdentifier) +static Optional procfs$keymap(InodeIdentifier) { KBufferBuilder builder; JsonObjectSerializer json { builder }; @@ -405,7 +405,7 @@ Optional procfs$keymap(InodeIdentifier) return builder.build(); } -Optional procfs$devices(InodeIdentifier) +static Optional procfs$devices(InodeIdentifier) { KBufferBuilder builder; JsonArraySerializer array { builder }; @@ -426,14 +426,14 @@ Optional procfs$devices(InodeIdentifier) return builder.build(); } -Optional procfs$uptime(InodeIdentifier) +static Optional procfs$uptime(InodeIdentifier) { KBufferBuilder builder; builder.appendf("%u\n", (g_uptime / 1000)); return builder.build(); } -Optional procfs$cmdline(InodeIdentifier) +static Optional procfs$cmdline(InodeIdentifier) { KBufferBuilder builder; builder.append(kernel_command_line().string()); @@ -441,7 +441,7 @@ Optional procfs$cmdline(InodeIdentifier) return builder.build(); } -Optional procfs$modules(InodeIdentifier) +static Optional procfs$modules(InodeIdentifier) { extern HashMap>* g_modules; KBufferBuilder builder; @@ -461,7 +461,7 @@ Optional procfs$modules(InodeIdentifier) return builder.build(); } -Optional procfs$profile(InodeIdentifier) +static Optional procfs$profile(InodeIdentifier) { InterruptDisabler disabler; KBufferBuilder builder; @@ -493,7 +493,7 @@ Optional procfs$profile(InodeIdentifier) return builder.build(); } -Optional procfs$net_adapters(InodeIdentifier) +static Optional procfs$net_adapters(InodeIdentifier) { KBufferBuilder builder; JsonArraySerializer array { builder }; @@ -519,7 +519,7 @@ Optional procfs$net_adapters(InodeIdentifier) return builder.build(); } -Optional procfs$net_arp(InodeIdentifier) +static Optional procfs$net_arp(InodeIdentifier) { KBufferBuilder builder; JsonArraySerializer array { builder }; @@ -533,7 +533,7 @@ Optional procfs$net_arp(InodeIdentifier) return builder.build(); } -Optional procfs$net_tcp(InodeIdentifier) +static Optional procfs$net_tcp(InodeIdentifier) { KBufferBuilder builder; JsonArraySerializer array { builder }; @@ -555,7 +555,7 @@ Optional procfs$net_tcp(InodeIdentifier) return builder.build(); } -Optional procfs$net_udp(InodeIdentifier) +static Optional procfs$net_udp(InodeIdentifier) { KBufferBuilder builder; JsonArraySerializer array { builder }; @@ -570,7 +570,7 @@ Optional procfs$net_udp(InodeIdentifier) return builder.build(); } -Optional procfs$net_local(InodeIdentifier) +static Optional procfs$net_local(InodeIdentifier) { KBufferBuilder builder; JsonArraySerializer array { builder }; @@ -588,7 +588,7 @@ Optional procfs$net_local(InodeIdentifier) return builder.build(); } -Optional procfs$pid_vmobjects(InodeIdentifier identifier) +static Optional procfs$pid_vmobjects(InodeIdentifier identifier) { auto process = Process::from_pid(to_pid(identifier)); if (!process) @@ -623,7 +623,7 @@ Optional procfs$pid_vmobjects(InodeIdentifier identifier) return builder.build(); } -Optional procfs$pid_unveil(InodeIdentifier identifier) +static Optional procfs$pid_unveil(InodeIdentifier identifier) { auto process = Process::from_pid(to_pid(identifier)); if (!process) @@ -648,7 +648,7 @@ Optional procfs$pid_unveil(InodeIdentifier identifier) return builder.build(); } -Optional procfs$tid_stack(InodeIdentifier identifier) +static Optional procfs$tid_stack(InodeIdentifier identifier) { auto thread = Thread::from_tid(to_tid(identifier)); if (!thread) @@ -659,7 +659,7 @@ Optional procfs$tid_stack(InodeIdentifier identifier) return builder.build(); } -Optional procfs$pid_exe(InodeIdentifier identifier) +static Optional procfs$pid_exe(InodeIdentifier identifier) { auto process = Process::from_pid(to_pid(identifier)); if (!process) @@ -669,7 +669,7 @@ Optional procfs$pid_exe(InodeIdentifier identifier) return custody->absolute_path().to_byte_buffer(); } -Optional procfs$pid_cwd(InodeIdentifier identifier) +static Optional procfs$pid_cwd(InodeIdentifier identifier) { auto process = Process::from_pid(to_pid(identifier)); if (!process) @@ -677,7 +677,7 @@ Optional procfs$pid_cwd(InodeIdentifier identifier) return process->current_directory().absolute_path().to_byte_buffer(); } -Optional procfs$pid_root(InodeIdentifier identifier) +static Optional procfs$pid_root(InodeIdentifier identifier) { auto process = Process::from_pid(to_pid(identifier)); if (!process) @@ -685,7 +685,7 @@ Optional procfs$pid_root(InodeIdentifier identifier) return process->root_directory_relative_to_global_root().absolute_path().to_byte_buffer(); } -Optional procfs$self(InodeIdentifier) +static Optional procfs$self(InodeIdentifier) { char buffer[16]; sprintf(buffer, "%d", Process::current()->pid().value()); @@ -712,7 +712,7 @@ Optional procfs$mm(InodeIdentifier) return builder.build(); } -Optional procfs$dmesg(InodeIdentifier) +static Optional procfs$dmesg(InodeIdentifier) { InterruptDisabler disabler; KBufferBuilder builder; @@ -721,7 +721,7 @@ Optional procfs$dmesg(InodeIdentifier) return builder.build(); } -Optional procfs$mounts(InodeIdentifier) +static Optional procfs$mounts(InodeIdentifier) { // FIXME: This is obviously racy against the VFS mounts changing. KBufferBuilder builder; @@ -740,7 +740,7 @@ Optional procfs$mounts(InodeIdentifier) return builder.build(); } -Optional procfs$df(InodeIdentifier) +static Optional procfs$df(InodeIdentifier) { // FIXME: This is obviously racy against the VFS mounts changing. KBufferBuilder builder; @@ -767,7 +767,7 @@ Optional procfs$df(InodeIdentifier) return builder.build(); } -Optional procfs$cpuinfo(InodeIdentifier) +static Optional procfs$cpuinfo(InodeIdentifier) { KBufferBuilder builder; JsonArraySerializer array { builder }; @@ -815,7 +815,7 @@ Optional procfs$memstat(InodeIdentifier) return builder.build(); } -Optional procfs$all(InodeIdentifier) +static Optional procfs$all(InodeIdentifier) { KBufferBuilder builder; JsonArraySerializer array { builder }; @@ -898,7 +898,7 @@ Optional procfs$all(InodeIdentifier) return builder.build(); } -Optional procfs$inodes(InodeIdentifier) +static Optional procfs$inodes(InodeIdentifier) { extern InlineLinkedList& all_inodes(); KBufferBuilder builder; diff --git a/Kernel/KSyms.cpp b/Kernel/KSyms.cpp index bd1e8e3d1c..5a7d26caac 100644 --- a/Kernel/KSyms.cpp +++ b/Kernel/KSyms.cpp @@ -115,7 +115,7 @@ static void load_kernel_sybols_from_data(const KBuffer& buffer) g_kernel_symbols_available = true; } -NEVER_INLINE void dump_backtrace_impl(FlatPtr base_pointer, bool use_ksyms) +NEVER_INLINE static void dump_backtrace_impl(FlatPtr base_pointer, bool use_ksyms) { SmapDisabler disabler; #if 0 diff --git a/Kernel/Process.cpp b/Kernel/Process.cpp index a6fe422550..d722a4335a 100644 --- a/Kernel/Process.cpp +++ b/Kernel/Process.cpp @@ -397,6 +397,8 @@ void Process::dump_regions() MM.dump_kernel_regions(); } +// Make sure the compiler doesn't "optimize away" this function: +extern void signal_trampoline_dummy(void); void signal_trampoline_dummy(void) { // The trampoline preserves the current eax, pushes the signal code and diff --git a/Kernel/RTC.cpp b/Kernel/RTC.cpp index 501074ea0a..901d13687f 100644 --- a/Kernel/RTC.cpp +++ b/Kernel/RTC.cpp @@ -109,7 +109,7 @@ static unsigned days_in_years_since_epoch(unsigned year) return days; } -u8 bcd_to_binary(u8 bcd) +static u8 bcd_to_binary(u8 bcd) { return (bcd & 0x0F) + ((bcd >> 4) * 10); } diff --git a/Kernel/Syscalls/futex.cpp b/Kernel/Syscalls/futex.cpp index 68bc9e1055..830579934c 100644 --- a/Kernel/Syscalls/futex.cpp +++ b/Kernel/Syscalls/futex.cpp @@ -29,13 +29,13 @@ namespace Kernel { -void compute_relative_timeout_from_absolute(const timeval& absolute_time, timeval& relative_time) +static void compute_relative_timeout_from_absolute(const timeval& absolute_time, timeval& relative_time) { // Convert absolute time to relative time of day. timeval_sub(absolute_time, kgettimeofday(), relative_time); } -void compute_relative_timeout_from_absolute(const timespec& absolute_time, timeval& relative_time) +static void compute_relative_timeout_from_absolute(const timespec& absolute_time, timeval& relative_time) { timeval tv_absolute_time; timespec_to_timeval(absolute_time, tv_absolute_time); diff --git a/Kernel/Thread.cpp b/Kernel/Thread.cpp index ac654db1b2..31b409dd47 100644 --- a/Kernel/Thread.cpp +++ b/Kernel/Thread.cpp @@ -359,7 +359,7 @@ enum class DefaultSignalAction { Continue, }; -DefaultSignalAction default_signal_action(u8 signal) +static DefaultSignalAction default_signal_action(u8 signal) { ASSERT(signal && signal < NSIG); diff --git a/Kernel/kprintf.cpp b/Kernel/kprintf.cpp index dbec2ad2eb..3e2eff5b04 100644 --- a/Kernel/kprintf.cpp +++ b/Kernel/kprintf.cpp @@ -176,7 +176,7 @@ extern "C" int kernelputstr(const char* characters, int length) return 0; } -extern "C" int vdbgprintf(const char* fmt, va_list ap) +static int vdbgprintf(const char* fmt, va_list ap) { ScopedSpinLock lock(s_log_lock); color_on();