From 260234bf9fea2bb03794a6acb21d78883340c2a2 Mon Sep 17 00:00:00 2001 From: Nigel Cunningham Date: Wed, 2 May 2007 09:03:50 +1000 Subject: [PATCH] Make symbol exports GPL. Change EXPORT_SYMBOL lines in suspend_builtin.c to EXPORT_SYMBOL_GPL. Signed-off-by: Nigel Cunningham --- kernel/power/extent.c | 16 ++-- kernel/power/io.c | 4 +- kernel/power/modules.c | 8 +- kernel/power/netlink.c | 6 +- kernel/power/power_off.c | 4 +- kernel/power/prepare_image.c | 2 +- kernel/power/suspend.c | 2 +- kernel/power/suspend_block_io.c | 14 ++-- kernel/power/suspend_builtin.c | 168 ++++++++++++++++++++-------------------- kernel/power/ui.c | 10 +-- 10 files changed, 117 insertions(+), 117 deletions(-) diff --git a/kernel/power/extent.c b/kernel/power/extent.c index 871e214643c..cd0ff0ca598 100644 --- a/kernel/power/extent.c +++ b/kernel/power/extent.c @@ -294,12 +294,12 @@ void suspend_extent_state_restore(struct extent_iterate_state *state, } #ifdef CONFIG_SUSPEND2_EXPORTS -EXPORT_SYMBOL(suspend_add_to_extent_chain); -EXPORT_SYMBOL(suspend_put_extent_chain); -EXPORT_SYMBOL(suspend_load_extent_chain); -EXPORT_SYMBOL(suspend_serialise_extent_chain); -EXPORT_SYMBOL(suspend_extent_state_save); -EXPORT_SYMBOL(suspend_extent_state_restore); -EXPORT_SYMBOL(suspend_extent_state_goto_start); -EXPORT_SYMBOL(suspend_extent_state_next); +EXPORT_SYMBOL_GPL(suspend_add_to_extent_chain); +EXPORT_SYMBOL_GPL(suspend_put_extent_chain); +EXPORT_SYMBOL_GPL(suspend_load_extent_chain); +EXPORT_SYMBOL_GPL(suspend_serialise_extent_chain); +EXPORT_SYMBOL_GPL(suspend_extent_state_save); +EXPORT_SYMBOL_GPL(suspend_extent_state_restore); +EXPORT_SYMBOL_GPL(suspend_extent_state_goto_start); +EXPORT_SYMBOL_GPL(suspend_extent_state_next); #endif diff --git a/kernel/power/io.c b/kernel/power/io.c index d3fb637de51..ad248a1c53f 100644 --- a/kernel/power/io.c +++ b/kernel/power/io.c @@ -1394,7 +1394,7 @@ int image_exists_write(const char *buffer, int count) } #ifdef CONFIG_SUSPEND2_EXPORTS -EXPORT_SYMBOL(suspend_attempt_to_parse_resume_device); -EXPORT_SYMBOL(attempt_to_parse_resume_device2); +EXPORT_SYMBOL_GPL(suspend_attempt_to_parse_resume_device); +EXPORT_SYMBOL_GPL(attempt_to_parse_resume_device2); #endif diff --git a/kernel/power/modules.c b/kernel/power/modules.c index 0d9dec72888..a6b574f760e 100644 --- a/kernel/power/modules.c +++ b/kernel/power/modules.c @@ -408,8 +408,8 @@ void suspend_put_modules(void) } #ifdef CONFIG_SUSPEND2_EXPORTS -EXPORT_SYMBOL(suspend_register_module); -EXPORT_SYMBOL(suspend_unregister_module); -EXPORT_SYMBOL(suspend_get_next_filter); -EXPORT_SYMBOL(suspendActiveAllocator); +EXPORT_SYMBOL_GPL(suspend_register_module); +EXPORT_SYMBOL_GPL(suspend_unregister_module); +EXPORT_SYMBOL_GPL(suspend_get_next_filter); +EXPORT_SYMBOL_GPL(suspendActiveAllocator); #endif diff --git a/kernel/power/netlink.c b/kernel/power/netlink.c index 36f5c0ce69f..bb1d5639b5a 100644 --- a/kernel/power/netlink.c +++ b/kernel/power/netlink.c @@ -382,6 +382,6 @@ int suspend_netlink_setup(struct user_helper_data *uhd) return 0; } -EXPORT_SYMBOL(suspend_netlink_setup); -EXPORT_SYMBOL(suspend_netlink_close); -EXPORT_SYMBOL(suspend_send_netlink_message); +EXPORT_SYMBOL_GPL(suspend_netlink_setup); +EXPORT_SYMBOL_GPL(suspend_netlink_close); +EXPORT_SYMBOL_GPL(suspend_send_netlink_message); diff --git a/kernel/power/power_off.c b/kernel/power/power_off.c index 87b2228da27..6f29d618ecd 100644 --- a/kernel/power/power_off.c +++ b/kernel/power/power_off.c @@ -88,5 +88,5 @@ void suspend_power_down(void) cpu_relax(); } -EXPORT_SYMBOL(suspend_powerdown_method); -EXPORT_SYMBOL(suspend_power_down); +EXPORT_SYMBOL_GPL(suspend_powerdown_method); +EXPORT_SYMBOL_GPL(suspend_power_down); diff --git a/kernel/power/prepare_image.c b/kernel/power/prepare_image.c index e7e09ddad0a..96d2c9c805f 100644 --- a/kernel/power/prepare_image.c +++ b/kernel/power/prepare_image.c @@ -806,5 +806,5 @@ int suspend_prepare_image(void) } #ifdef CONFIG_SUSPEND2_EXPORTS -EXPORT_SYMBOL(real_nr_free_pages); +EXPORT_SYMBOL_GPL(real_nr_free_pages); #endif diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index 33c5e7ab6fa..70c24a7adbf 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -1002,5 +1002,5 @@ late_initcall(core_load); #endif #ifdef CONFIG_SUSPEND2_EXPORTS -EXPORT_SYMBOL(pagedir2); +EXPORT_SYMBOL_GPL(pagedir2); #endif diff --git a/kernel/power/suspend_block_io.c b/kernel/power/suspend_block_io.c index 36cd7d21953..50f8166ab1c 100644 --- a/kernel/power/suspend_block_io.c +++ b/kernel/power/suspend_block_io.c @@ -982,13 +982,13 @@ MODULE_LICENSE("GPL"); MODULE_AUTHOR("Nigel Cunningham"); MODULE_DESCRIPTION("Suspend2 block io functions"); -EXPORT_SYMBOL(suspend_writer_posn); -EXPORT_SYMBOL(suspend_writer_posn_save); -EXPORT_SYMBOL(suspend_bio_ops); -EXPORT_SYMBOL(suspend_writer_buffer); -EXPORT_SYMBOL(suspend_writer_buffer_posn); -EXPORT_SYMBOL(suspend_header_bytes_used); -EXPORT_SYMBOL(suspend_read_fd); +EXPORT_SYMBOL_GPL(suspend_writer_posn); +EXPORT_SYMBOL_GPL(suspend_writer_posn_save); +EXPORT_SYMBOL_GPL(suspend_bio_ops); +EXPORT_SYMBOL_GPL(suspend_writer_buffer); +EXPORT_SYMBOL_GPL(suspend_writer_buffer_posn); +EXPORT_SYMBOL_GPL(suspend_header_bytes_used); +EXPORT_SYMBOL_GPL(suspend_read_fd); #else late_initcall(suspend_block_io_load); #endif diff --git a/kernel/power/suspend_builtin.c b/kernel/power/suspend_builtin.c index c5767dee8a1..3e908f4a17c 100644 --- a/kernel/power/suspend_builtin.c +++ b/kernel/power/suspend_builtin.c @@ -32,114 +32,114 @@ #ifdef CONFIG_SUSPEND2_CORE_EXPORTS #ifdef CONFIG_SOFTWARE_SUSPEND -EXPORT_SYMBOL(resume_file); +EXPORT_SYMBOL_GPL(resume_file); #endif -EXPORT_SYMBOL(max_pfn); -EXPORT_SYMBOL(free_dyn_pageflags); -EXPORT_SYMBOL(clear_dynpageflag); -EXPORT_SYMBOL(test_dynpageflag); -EXPORT_SYMBOL(set_dynpageflag); -EXPORT_SYMBOL(get_next_bit_on); -EXPORT_SYMBOL(allocate_dyn_pageflags); -EXPORT_SYMBOL(clear_dyn_pageflags); +EXPORT_SYMBOL_GPL(max_pfn); +EXPORT_SYMBOL_GPL(free_dyn_pageflags); +EXPORT_SYMBOL_GPL(clear_dynpageflag); +EXPORT_SYMBOL_GPL(test_dynpageflag); +EXPORT_SYMBOL_GPL(set_dynpageflag); +EXPORT_SYMBOL_GPL(get_next_bit_on); +EXPORT_SYMBOL_GPL(allocate_dyn_pageflags); +EXPORT_SYMBOL_GPL(clear_dyn_pageflags); #ifdef CONFIG_X86_64 -EXPORT_SYMBOL(restore_processor_state); -EXPORT_SYMBOL(save_processor_state); +EXPORT_SYMBOL_GPL(restore_processor_state); +EXPORT_SYMBOL_GPL(save_processor_state); #endif -EXPORT_SYMBOL(kernel_shutdown_prepare); -EXPORT_SYMBOL(drop_pagecache); -EXPORT_SYMBOL(pagedir_nosave); -EXPORT_SYMBOL(pm_sem); -EXPORT_SYMBOL(pm_restore_console); -EXPORT_SYMBOL(super_blocks); -EXPORT_SYMBOL(next_zone); - -EXPORT_SYMBOL(freeze_processes); -EXPORT_SYMBOL(thaw_processes); -EXPORT_SYMBOL(thaw_kernel_threads); -EXPORT_SYMBOL(shrink_all_memory); -EXPORT_SYMBOL(shrink_one_zone); -EXPORT_SYMBOL(saveable); -EXPORT_SYMBOL(swsusp_arch_suspend); -EXPORT_SYMBOL(swsusp_arch_resume); -EXPORT_SYMBOL(pm_ops); -EXPORT_SYMBOL(pm_prepare_console); -EXPORT_SYMBOL(follow_page); -EXPORT_SYMBOL(machine_halt); -EXPORT_SYMBOL(block_dump); -EXPORT_SYMBOL(unlink_lru_lists); -EXPORT_SYMBOL(relink_lru_lists); -EXPORT_SYMBOL(power_subsys); -EXPORT_SYMBOL(machine_power_off); -EXPORT_SYMBOL(suspend_enter); -EXPORT_SYMBOL(first_online_pgdat); -EXPORT_SYMBOL(next_online_pgdat); -EXPORT_SYMBOL(machine_restart); -EXPORT_SYMBOL(saved_command_line); -EXPORT_SYMBOL(tasklist_lock); +EXPORT_SYMBOL_GPL(kernel_shutdown_prepare); +EXPORT_SYMBOL_GPL(drop_pagecache); +EXPORT_SYMBOL_GPL(pagedir_nosave); +EXPORT_SYMBOL_GPL(pm_sem); +EXPORT_SYMBOL_GPL(pm_restore_console); +EXPORT_SYMBOL_GPL(super_blocks); +EXPORT_SYMBOL_GPL(next_zone); + +EXPORT_SYMBOL_GPL(freeze_processes); +EXPORT_SYMBOL_GPL(thaw_processes); +EXPORT_SYMBOL_GPL(thaw_kernel_threads); +EXPORT_SYMBOL_GPL(shrink_all_memory); +EXPORT_SYMBOL_GPL(shrink_one_zone); +EXPORT_SYMBOL_GPL(saveable); +EXPORT_SYMBOL_GPL(swsusp_arch_suspend); +EXPORT_SYMBOL_GPL(swsusp_arch_resume); +EXPORT_SYMBOL_GPL(pm_ops); +EXPORT_SYMBOL_GPL(pm_prepare_console); +EXPORT_SYMBOL_GPL(follow_page); +EXPORT_SYMBOL_GPL(machine_halt); +EXPORT_SYMBOL_GPL(block_dump); +EXPORT_SYMBOL_GPL(unlink_lru_lists); +EXPORT_SYMBOL_GPL(relink_lru_lists); +EXPORT_SYMBOL_GPL(power_subsys); +EXPORT_SYMBOL_GPL(machine_power_off); +EXPORT_SYMBOL_GPL(suspend_enter); +EXPORT_SYMBOL_GPL(first_online_pgdat); +EXPORT_SYMBOL_GPL(next_online_pgdat); +EXPORT_SYMBOL_GPL(machine_restart); +EXPORT_SYMBOL_GPL(saved_command_line); +EXPORT_SYMBOL_GPL(tasklist_lock); #ifdef CONFIG_SUSPEND_SMP -EXPORT_SYMBOL(disable_nonboot_cpus); -EXPORT_SYMBOL(enable_nonboot_cpus); +EXPORT_SYMBOL_GPL(disable_nonboot_cpus); +EXPORT_SYMBOL_GPL(enable_nonboot_cpus); #endif #endif #ifdef CONFIG_SUSPEND2_USERUI_EXPORTS -EXPORT_SYMBOL(kmsg_redirect); -EXPORT_SYMBOL(console_printk); +EXPORT_SYMBOL_GPL(kmsg_redirect); +EXPORT_SYMBOL_GPL(console_printk); #ifndef CONFIG_COMPAT -EXPORT_SYMBOL(sys_ioctl); +EXPORT_SYMBOL_GPL(sys_ioctl); #endif #endif #ifdef CONFIG_SUSPEND2_SWAP_EXPORTS /* Suspend swap specific */ -EXPORT_SYMBOL(sys_swapon); -EXPORT_SYMBOL(sys_swapoff); -EXPORT_SYMBOL(si_swapinfo); -EXPORT_SYMBOL(map_swap_page); -EXPORT_SYMBOL(get_swap_page); -EXPORT_SYMBOL(swap_free); -EXPORT_SYMBOL(get_swap_info_struct); +EXPORT_SYMBOL_GPL(sys_swapon); +EXPORT_SYMBOL_GPL(sys_swapoff); +EXPORT_SYMBOL_GPL(si_swapinfo); +EXPORT_SYMBOL_GPL(map_swap_page); +EXPORT_SYMBOL_GPL(get_swap_page); +EXPORT_SYMBOL_GPL(swap_free); +EXPORT_SYMBOL_GPL(get_swap_info_struct); #endif #ifdef CONFIG_SUSPEND2_FILE_EXPORTS /* Suspend_file specific */ extern char * __initdata root_device_name; -EXPORT_SYMBOL(ROOT_DEV); -EXPORT_SYMBOL(root_device_name); -EXPORT_SYMBOL(sys_unlink); -EXPORT_SYMBOL(sys_mknod); +EXPORT_SYMBOL_GPL(ROOT_DEV); +EXPORT_SYMBOL_GPL(root_device_name); +EXPORT_SYMBOL_GPL(sys_unlink); +EXPORT_SYMBOL_GPL(sys_mknod); #endif /* Swap or file */ #if defined(CONFIG_SUSPEND2_FILE_EXPORTS) || defined(CONFIG_SUSPEND2_SWAP_EXPORTS) -EXPORT_SYMBOL(bio_set_pages_dirty); -EXPORT_SYMBOL(name_to_dev_t); +EXPORT_SYMBOL_GPL(bio_set_pages_dirty); +EXPORT_SYMBOL_GPL(name_to_dev_t); #endif #if defined(CONFIG_SUSPEND2_EXPORTS) || defined(CONFIG_SUSPEND2_CORE_EXPORTS) -EXPORT_SYMBOL(snprintf_used); +EXPORT_SYMBOL_GPL(snprintf_used); #endif struct suspend2_core_fns *s2_core_fns; -EXPORT_SYMBOL(s2_core_fns); +EXPORT_SYMBOL_GPL(s2_core_fns); dyn_pageflags_t pageset1_map; dyn_pageflags_t pageset1_copy_map; -EXPORT_SYMBOL(pageset1_map); -EXPORT_SYMBOL(pageset1_copy_map); +EXPORT_SYMBOL_GPL(pageset1_map); +EXPORT_SYMBOL_GPL(pageset1_copy_map); unsigned long suspend_result = 0; unsigned long suspend_debug_state = 0; int suspend_io_time[2][2]; struct pagedir pagedir1 = {1}; -EXPORT_SYMBOL(suspend_io_time); -EXPORT_SYMBOL(suspend_debug_state); -EXPORT_SYMBOL(suspend_result); -EXPORT_SYMBOL(pagedir1); +EXPORT_SYMBOL_GPL(suspend_io_time); +EXPORT_SYMBOL_GPL(suspend_debug_state); +EXPORT_SYMBOL_GPL(suspend_result); +EXPORT_SYMBOL_GPL(pagedir1); unsigned long suspend_get_nonconflicting_page(void) { @@ -178,37 +178,37 @@ int suspend2_lowlevel_builtin(void) return error; } -EXPORT_SYMBOL(suspend2_lowlevel_builtin); +EXPORT_SYMBOL_GPL(suspend2_lowlevel_builtin); unsigned long suspend_compress_bytes_in, suspend_compress_bytes_out; -EXPORT_SYMBOL(suspend_compress_bytes_in); -EXPORT_SYMBOL(suspend_compress_bytes_out); +EXPORT_SYMBOL_GPL(suspend_compress_bytes_in); +EXPORT_SYMBOL_GPL(suspend_compress_bytes_out); #ifdef CONFIG_SUSPEND2_REPLACE_SWSUSP unsigned long suspend_action = (1 << SUSPEND_REPLACE_SWSUSP) | (1 << SUSPEND_PAGESET2_FULL); #else unsigned long suspend_action = 1 << SUSPEND_PAGESET2_FULL; #endif -EXPORT_SYMBOL(suspend_action); +EXPORT_SYMBOL_GPL(suspend_action); unsigned long suspend_state = ((1 << SUSPEND_BOOT_TIME) | (1 << SUSPEND_RESUME_NOT_DONE) | (1 << SUSPEND_IGNORE_LOGLEVEL) | (1 << SUSPEND_IO_STOPPED)); -EXPORT_SYMBOL(suspend_state); +EXPORT_SYMBOL_GPL(suspend_state); /* The number of suspends we have started (some may have been cancelled) */ unsigned int nr_suspends; -EXPORT_SYMBOL(nr_suspends); +EXPORT_SYMBOL_GPL(nr_suspends); char resume2_file[256] = CONFIG_SUSPEND2_DEFAULT_RESUME2; -EXPORT_SYMBOL(resume2_file); +EXPORT_SYMBOL_GPL(resume2_file); int suspend2_running = 0; -EXPORT_SYMBOL(suspend2_running); +EXPORT_SYMBOL_GPL(suspend2_running); int suspend2_in_suspend __nosavedata; -EXPORT_SYMBOL(suspend2_in_suspend); +EXPORT_SYMBOL_GPL(suspend2_in_suspend); unsigned long suspend2_nosave_state1 __nosavedata = 0; unsigned long suspend2_nosave_state2 __nosavedata = 0; @@ -220,15 +220,15 @@ __nosavedata struct pbe *restore_highmem_pblist; #ifdef CONFIG_SUSPEND2_CORE_EXPORTS #ifdef CONFIG_HIGHMEM -EXPORT_SYMBOL(nr_free_highpages); -EXPORT_SYMBOL(restore_highmem_pblist); +EXPORT_SYMBOL_GPL(nr_free_highpages); +EXPORT_SYMBOL_GPL(restore_highmem_pblist); #endif -EXPORT_SYMBOL(suspend2_nosave_state1); -EXPORT_SYMBOL(suspend2_nosave_state2); -EXPORT_SYMBOL(suspend2_nosave_state3); -EXPORT_SYMBOL(suspend2_nosave_io_speed); -EXPORT_SYMBOL(suspend2_nosave_commandline); +EXPORT_SYMBOL_GPL(suspend2_nosave_state1); +EXPORT_SYMBOL_GPL(suspend2_nosave_state2); +EXPORT_SYMBOL_GPL(suspend2_nosave_state3); +EXPORT_SYMBOL_GPL(suspend2_nosave_io_speed); +EXPORT_SYMBOL_GPL(suspend2_nosave_commandline); #endif /* -- Commandline Parameter Handling --- diff --git a/kernel/power/ui.c b/kernel/power/ui.c index 743f98d4690..5b6789f1bd2 100644 --- a/kernel/power/ui.c +++ b/kernel/power/ui.c @@ -227,9 +227,9 @@ void s2_ui_exit(void) } #ifdef CONFIG_SUSPEND2_EXPORTS -EXPORT_SYMBOL(s2_current_ui); -EXPORT_SYMBOL(suspend_early_boot_message); -EXPORT_SYMBOL(s2_register_ui_ops); -EXPORT_SYMBOL(s2_remove_ui_ops); -EXPORT_SYMBOL(suspend_default_console_level); +EXPORT_SYMBOL_GPL(s2_current_ui); +EXPORT_SYMBOL_GPL(suspend_early_boot_message); +EXPORT_SYMBOL_GPL(s2_register_ui_ops); +EXPORT_SYMBOL_GPL(s2_remove_ui_ops); +EXPORT_SYMBOL_GPL(suspend_default_console_level); #endif -- 2.11.4.GIT